TCP Relay: use same crypto keys as Tox UDP node.

1 files changed, 5 insertions, 3 deletions

diff --git a/dht/examples/dhtd.hs b/dht/examples/dhtd.hs
index 68c847c5..5f0eead8 100644
--- a/dht/examples/dhtd.hs
+++ b/dht/examples/dhtd.hs
@@ -698,7 +698,7 @@ clientSession s@Session{..} sock cnum h = do
                     tcnt <- readTVar $ setCount t
                     icnt <- HashMap.size <$> readTVar (setIDs t)
                     return (ts,tcnt,icnt)
-            (ts,tcnt,icnt) <- trampstate (trampolinesUDP onionRouter)
+            (uts,tcnt,icnt) <- trampstate (trampolinesUDP onionRouter)
             (tts,ttcnt,ticnt) <- trampstate (trampolinesTCP onionRouter)
             rs <- getAssocs (pendingRoutes onionRouter)
             pqs <- readTVar (pendingQueries onionRouter)
@@ -718,9 +718,10 @@ clientSession s@Session{..} sock cnum h = do
                                      then show routeVersion
                                      else show routeVersion ++ "(pending)" ]
                     | otherwise = [show n, "error!","","",""]
+                    -- otherwise = [show n, "error!",show (IntMap.lookup n rm),show (IntMap.null rm),""]
                 r = map (uncurry showRecord) rs
             return $ do
-                hPutClientChunk h $ unlines [ "trampolines(UDP): " ++ show (IntMap.size ts,tcnt,icnt)
+                hPutClientChunk h $ unlines [ "trampolines(UDP): " ++ show (IntMap.size uts,tcnt,icnt)
                                                                    ++ if tcpmode then "" else " *"
                                             , "trampolines(TCP): " ++ show (IntMap.size tts,ttcnt,ticnt)
                                                                    ++ if tcpmode then " *" else ""
@@ -1377,12 +1378,13 @@ initTox opts ssvar keysdb mbxmpp invc = case porttox opts of
         [""] -> return (Nothing,return (), Map.empty, return [],[])
         toxport -> do
             dput XMisc $ "Supplied key: " ++ show (fmap (Tox.key2id . toPublic) (dhtkey opts))
+            crypto <- Tox.newToxCrypto (dhtkey opts)
             tox <- Tox.newTox keysdb
                               toxport
                               (case mbxmpp of
                                 Nothing   -> \_ _ _ -> return ()
                                 Just xmpp -> onNewToxSession xmpp ssvar invc)
-                              (dhtkey opts)
+                              crypto
                               (\_ _ -> return ()) -- TODO: TCP relay send
             -- addrTox <- getBindAddress toxport (ip6tox opts)
             (quitTox, toxStrap4, toxStrap6) <- Tox.forkTox tox (advertiseOnAvahi opts)