1 files changed, 15 insertions, 2 deletions

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