3 files changed, 17 insertions, 6 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)
diff --git a/dht/examples/testTox.hs b/dht/examples/testTox.hs
index 67c4daef..57601422 100644
--- a/dht/examples/testTox.hs
+++ b/dht/examples/testTox.hs
@@ -42,10 +42,11 @@ makeToxNode :: UDPTransport -> Maybe SecretKey
         -> IO (Tox extra)
 makeToxNode udp sec onSessionF = do
     keysdb <- newKeysDatabase
+    crypto <- newToxCrypto sec
     newToxOverTransport keysdb
                         (SockAddrInet 0 0)
                         onSessionF
-                        sec
+                        crypto
                         udp
                         (\_ _ -> return ())
 
diff --git a/dht/examples/toxrelay.hs b/dht/examples/toxrelay.hs
index af08e8d7..d6b0da17 100644
--- a/dht/examples/toxrelay.hs
+++ b/dht/examples/toxrelay.hs
@@ -1,15 +1,23 @@
-import Network.Address (getBindAddress)
+import Network.Address (getBindAddress,sockAddrPort)
 import Network.SocketLike
 import Network.StreamServer
 import Network.Tox.Onion.Transport hiding (encrypt,decrypt)
 import Network.Tox.Relay
+import Crypto.Tox
+
+import DPut
+import DebugTag
+
+socketPort s = sockAddrPort <$> getSocketName s
 
 main :: IO ()
 main = do
     udp_addr <- getBindAddress "33445" True
     let sendOnion :: SockAddr -> OnionRequest N1 -> IO ()
         sendOnion _ _ = return ()
-    (h,sendTCP) <- tcpRelay udp_addr sendOnion
+    setVerbose XNetCrypto
+    crypto <- newCrypto
+    (h,sendTCP) <- tcpRelay crypto udp_addr sendOnion
     boundPort <- socketPort $ listenSocket h
     putStrLn $ "Listening on port: " ++ show boundPort