1 files changed, 46 insertions, 4 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index ede203bf..623b03c5 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -375,7 +375,36 @@ clientSession s@Session{..} sock cnum h = do
     let mkrow :: (SecretKey, PublicKey) -> (String,String)
         mkrow (a,b) | Just x <- encodeSecret a= (B.unpack x, show (Tox.key2id b))
         mkrow _ = error (concat ["Assertion fail in 'mkrow' function at ", __FILE__, ":", show __LINE__])
+        sessionCommands :: [[String]]
+        sessionCommands =
+            [ ["stop"]
+            , ["quit"]
+            , ["pid"]
+            , ["external-ip"]
+            , ["threads"]
+            , ["mem"]
+            , ["ls"]
+            , ["k"]
+            , ["roster"]
+            , ["g"]
+            , ["p"]
+            , ["a"]
+            , ["s"]
+            , ["x"]
+            , ["save"]
+            , ["load"]
+            , ["swarms"]
+            , ["peers"]
+            , ["toxids"]
+            , ["c"]
+            , ["help"]
+            ]
     case (map toLower c,args) of
+        (n, _) | n `elem` Map.keys dhts -> switchNetwork n
+        (x,_) | not (null (strp x))
+              , x `notElem` map head sessionCommands -> cmd0 $ do
+                hPutClient h $ "error."
+
         ("stop", _) -> do hPutClient h "Terminating DHT Daemon."
                           hClose h
                           putMVar signalQuit ()
@@ -690,9 +719,9 @@ clientSession s@Session{..} sock cnum h = do
                                 -> case (Map.lookup (head ws) combinedLinkMap) of
                                     Nothing -> return . Left $ "I don't know a '" ++ head ws ++ "' link type."
                                     Just l@(DHTLink
-                                              { linkInit        {- :: params -> IO (Either String status) -}
-                                              , linkParamParser {- :: [String] -> Either String params    -}
-                                              , showLinkStatus  {- :: status -> String                    -}
+                                              { linkInit        {- :: params   -> IO (Either String status) -}
+                                              , linkParamParser {- :: [String] -> Either String params      -}
+                                              , showLinkStatus  {- :: status   -> String                    -}
                                               }) -> case linkParamParser rest of
                                                         Left er -> return $ Left er
                                                         Right params -> fmap showLinkStatus <$> linkInit params
@@ -700,7 +729,20 @@ clientSession s@Session{..} sock cnum h = do
                         case result of
                             Left er -> hPutClient h er
                             Right statusstr -> hPutClient h statusstr
-        (n, _) | n `elem` Map.keys dhts -> switchNetwork n
+
+        ("help", s) | Just DHT{..} <- Map.lookup netname dhts
+                    -> cmd0 $ do
+            let tolist :: a -> [a]
+                tolist = (:[])
+
+                dhtkeys, announcables, links, ks, allcommands :: [[String]]
+                dhtkeys = map tolist $ Map.keys dhts
+                announcables = map (tolist . ("s "++)) $ Map.keys dhtAnnouncables
+                links = map (tolist . ("c "++)) $ Map.keys dhtLinks
+                ks = [["k gen"],["k public"],["k secret"]]
+                allcommands = sortBy (comparing head) $ concat [sessionCommands, dhtkeys, announcables, links, ks]
+
+            hPutClient h ("Available commands:\n" ++ showColumns allcommands)
 
         _    -> cmd0 $ hPutClient h "error."