Multi Transports: TCP for DHT/Cookies/Handshakes.

1 files changed, 4 insertions, 3 deletions

diff --git a/dht/src/Network/Tox/Onion/Routes.hs b/dht/src/Network/Tox/Onion/Routes.hs
index d61c721e..baca693b 100644
--- a/dht/src/Network/Tox/Onion/Routes.hs
+++ b/dht/src/Network/Tox/Onion/Routes.hs
@@ -84,7 +84,7 @@ data OnionRouter = OnionRouter
     , tcpKademliaClient :: TCP.TCPClient String Nonce8
       -- | This thread maintains the TCP relay table.
     , tcpKademliaThread :: ThreadId
-    , tcpProberState :: TCPCache (SessionProtocol TCP.RelayPacket TCP.RelayPacket)
+    , tcpProberState :: TCP.RelayCache
     , tcpProber :: TCP.TCPProber
     , tcpProberThread :: ThreadId
       -- | Kademlia table of TCP relays.
@@ -158,6 +158,7 @@ newOnionRouter :: TransportCrypto
                     -> (String -> IO ())
                     -> Bool -- is tcp enabled?
                     -> IO ( OnionRouter
+                          , Transport String TCP.ViaRelay B.ByteString
                           , TVar ( ChaChaDRG
                                  , Word64Map (Either (Maybe (Bool,TCP.RelayPacket) -> IO ())
                                                      (Maybe (OnionMessage Identity) -> IO ()))))
@@ -168,7 +169,7 @@ newOnionRouter crypto perror tcp_enabled = do
         pq <- newTVar W64.empty
         rm <- newArray (0,11) Nothing
         return (rlog,pq,rm)
-    ((tbl,(tcptbl,tcpcons)),tcp) <- do
+    ((tbl,(tcptbl,tcpcons,relaynet)),tcp) <- do
         (tcptbl, client) <- TCP.newClient crypto Left $ \case
             Left v  -> void . v . Just . (,) False
             Right v -> \case
@@ -268,7 +269,7 @@ newOnionRouter crypto perror tcp_enabled = do
                                             $ clientNet c }
                     }
                  }
-    return (or,tcptbl)
+    return (or,relaynet,tcptbl)
 
 updateTCP :: OnionRouter -> TCP.NodeInfo -> p -> IO ()
 updateTCP or addr x = do