1 files changed, 6 insertions, 6 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index bd2df9db..1e2c1467 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -45,7 +45,7 @@ import Control.Concurrent.Lifted
 import GHC.Conc                  (labelThread)
 #endif
 
-import Crypto.Tox (zeros32,SecretKey,PublicKey, generateSecretKey, toPublic, encodeSecret, decodeSecret)
+import Crypto.Tox (zeros32,SecretKey,PublicKey, generateSecretKey, toPublic, encodeSecret, decodeSecret, userKeys)
 import Network.UPNP as UPNP
 import Network.Address hiding (NodeId, NodeInfo(..))
 import Network.Kademlia.Search
@@ -669,8 +669,9 @@ main = do
 
     keysdb <- Tox.newKeysDatabase
 
-    (quitTox,toxdhts,toxips,taddrs) <- case porttox opts of
-        "" -> return (return (), Map.empty, return [],[])
+    (toxids,quitTox,toxdhts,toxips,taddrs) <- case porttox opts of
+        "" -> do keys <- atomically $ newTVar []
+                 return (keys,return (), Map.empty, return [],[])
         toxport -> do
             addrTox <- getBindAddress toxport (ip6tox opts)
             tox <- Tox.newTox keysdb addrTox
@@ -732,7 +733,7 @@ main = do
                 ips :: IO [SockAddr]
                 ips = readExternals Tox.nodeAddr [ Tox.routing4 $ Tox.toxRouting tox
                                                  , Tox.routing6 $ Tox.toxRouting tox ]
-            return (quitTox, dhts, ips, [addrTox])
+            return (userKeys (Tox.toxCryptoKeys tox), quitTox, dhts, ips, [addrTox])
 
     _ <- UPNP.requestPorts "dht-client" $ map (Datagram,) $ baddrs ++ taddrs
 
@@ -740,14 +741,13 @@ main = do
 
     waitForSignal <- do
         signalQuit <- newEmptyMVar
-        userkeys0 <- atomically (newTVar [])
         let session = clientSession $ Session
                 { netname           = concat $ take 1 $ Map.keys dhts -- initial default DHT
                 , dhts              = dhts  -- all DHTs
                 , signalQuit        = signalQuit
                 , swarms            = swarms
                 , toxkeys           = keysdb
-                , userkeys          = userkeys0
+                , userkeys          = toxids
                 , externalAddresses = liftM2 (++) btips toxips
                 }
         srv <- streamServer (withSession session) (SockAddrUnix "dht.sock")