1 files changed, 8 insertions, 5 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 3f7a7261..c06b69d1 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -801,7 +801,7 @@ clientSession s@Session{..} sock cnum h = do
                                                             (qresultAddr dta)
                                                             announceInterval)
                                             dta
-                                    hPutClient h "ok."
+                                    hPutClient h $ "Announcing at " ++ show (qresultAddr dta) ++ "."
                         let aerror = unlines
                                 [ "announce error."
                                 , "method = " ++ method
@@ -955,6 +955,7 @@ data Options = Options
     , porttox :: String
     , ip6bt   :: Bool
     , ip6tox  :: Bool
+    , dhtkey  :: Maybe SecretKey
     }
  deriving (Eq,Show)
 
@@ -964,16 +965,18 @@ sensibleDefaults = Options
     , porttox = "33445"
     , ip6bt   = True
     , ip6tox  = True
+    , dhtkey  = Nothing
     }
 
 -- bt=<port>,tox=<port>
 -- -4
 parseArgs :: [String] -> Options -> Options
-parseArgs []          opts = opts
-parseArgs ("-4":args) opts = parseArgs args opts
+parseArgs []          opts         = opts
+parseArgs ("--dhtkey":k:args) opts = opts { dhtkey       = decodeSecret $ B.pack k }
+parseArgs ("-4":args) opts         = parseArgs args opts
     { ip6bt  = False
     , ip6tox = False }
-parseArgs (arg:args) opts        = parseArgs args opts
+parseArgs (arg:args) opts          = parseArgs args opts
     { portbt  = fromMaybe (portbt opts)  $ Prelude.lookup "bt"  ports
     , porttox = fromMaybe (porttox opts) $ Prelude.lookup "tox" ports }
  where
@@ -1096,7 +1099,7 @@ main = do
         "" -> return (Nothing,return (), Map.empty, return [],[])
         toxport -> do
             addrTox <- getBindAddress toxport (ip6tox opts)
-            tox <- Tox.newTox keysdb addrTox (Just netCryptoSessionsState)
+            tox <- Tox.newTox keysdb addrTox (Just netCryptoSessionsState) (dhtkey opts)
             quitTox <- Tox.forkTox tox
 
             toxSearches <- atomically $ newTVar Map.empty