Implemented "nid" command to convert hex toxid.

4 files changed, 19 insertions, 3 deletions

diff --git a/Announcer.hs b/Announcer.hs
index da1adcee..2b96c421 100644
--- a/Announcer.hs
+++ b/Announcer.hs
@@ -122,6 +122,7 @@ data AnnounceMethod r = forall nid ni sr addr tok a.
                 --  Kademlia.
     , aBuckets  :: TVar (R.BucketList ni)
                 -- ^ Set this to the current Kademlia routing table buckets.
+                -- TODO: List of TVars to have separate routing tables for IPv6 and IPv4?
     , aTarget   :: nid
                 -- ^ This is the Kademlia node-id of the item being announced.
     , aInterval :: POSIXTime
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index b3c60015..918df327 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -449,12 +449,16 @@ clientSession s@Session{..} sock cnum h = do
         mkrow _ = error (concat ["Assertion fail in 'mkrow' function at ", __FILE__, ":", show __LINE__])
         sessionCommands :: [[String]]
         sessionCommands =
-            [ ["stop"]
+            [ ["ping"]   -- pinglike
+            , ["cookie"] -- pinglike
+            , ["stop"]
+            , ["throw"]
             , ["quit"]
             , ["pid"]
             , ["external-ip"]
             , ["threads"]
             , ["mem"]
+            , ["nid"]
             , ["ls"]
             , ["k"]
             , ["roster"]
@@ -471,7 +475,6 @@ clientSession s@Session{..} sock cnum h = do
             , ["toxids"]
             , ["c"]
             , ["help"]
-            , ["throw"]
             ]
     case (map toLower c,args) of
         (n, _) | n `elem` Map.keys dhts -> switchNetwork n
@@ -550,6 +553,16 @@ clientSession s@Session{..} sock cnum h = do
                             else hPutClient h "Run with +RTS -T to obtain live memory-usage information."
                         _ -> hPutClient h "error."
 
+        ("nid", s) | Just DHT{dhtParseId} <- Map.lookup netname dhts
+                    -> cmd0 $ do
+                        hPutClient h $ case dhtParseId s of
+                            Left e    ->
+                                -- HACK: split nospam from hex toxid
+                                case dhtParseId (take 64 s) of
+                                    Left e -> "Error: " ++ e
+                                    Right nid -> show nid ++ " nospam:" ++ drop 64 s
+                            Right nid -> show nid
+
         ("ls", _) | Just DHT{dhtBuckets} <- Map.lookup netname dhts
                     -> cmd0 $ do
                         bkts <- atomically $ readTVar dhtBuckets
diff --git a/gi b/gi
index 84dc9696..907baf11 100755
--- a/gi
+++ b/gi
@@ -17,7 +17,6 @@ ghci -fobject-code                   \
     -iPresence                       \
     -iArchive                        \
     -isrc                            \
-    -icryptonite-backport            \
     build/b/Presence/monitortty.o    \
     build/b/cbits/cryptonite_salsa.o \
     build/b/cbits/cryptonite_xsalsa.o\
diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index fbf6702a..b12487a4 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -146,6 +146,9 @@ nmtoken64 _     c   = c
 
 instance Read NodeId where
     readsPrec _ str
+        | (bs,_) <- Base16.decode (C8.pack $ take 64 str)
+        , CryptoPassed pub <- publicKey bs -- B.length bs == 32
+                    = [ (key2id pub, drop (2 * B.length bs) str) ]
         | Right bs <- fmap (BA.drop 1) $ Base64.decode $ C8.pack $ 'A':map (nmtoken64 False) (take 43 str)
         , CryptoPassed pub <- publicKey bs -- B.length bs == 32
                     = [ (key2id pub, drop 43 str) ]