First successful TCP relay mediated chat link!

1 files changed, 10 insertions, 2 deletions

diff --git a/dht/src/Network/Tox.hs b/dht/src/Network/Tox.hs
index 270a9036..1a3bee79 100644
--- a/dht/src/Network/Tox.hs
+++ b/dht/src/Network/Tox.hs
@@ -315,8 +315,9 @@ newToxOverTransport keydb addr onNewSession (crypto,roster) udp tcp = do
     let lookupClose _ = return Nothing
 
     mkrouting <- DHT.newRouting addr crypto updateIP updateIP
-    (orouter,relaynet,onioncryptTCP) <- newOnionRouter crypto (dput XRoutes) (maybe False (const True) tcp)
-    (cryptonet,dhtcrypt,onioncryptUDP,dtacrypt,handshakes)
+    (orouter,relaynet,onioncryptTCP0) <- newOnionRouter crypto (dput XRoutes) (maybe False (const True) tcp)
+    (dtacryptTCP,onioncryptTCP) <- partitionTransportM (Onion.parseDataToRoute crypto) (Onion.encodeDataToRoute crypto) onioncryptTCP0
+    (cryptonet,dhtcrypt,onioncryptUDP,dtacryptUDP,handshakes)
         <- toxTransport crypto orouter lookupClose addr udp relaynet
                 (\dst x -> sendMessage (clientNet $ tcpClient $ tcpKademliaClient orouter) dst (True,x))
                 (fromMaybe (\_ _ -> return ()) tcp)
@@ -358,6 +359,10 @@ newToxOverTransport keydb addr onNewSession (crypto,roster) udp tcp = do
     onioncrypt <- mergeTransports $ DMap.fromList
         [ Multi.OnionUDP :=> ByAddress onioncryptUDP
         , Multi.OnionTCP :=> ByAddress {- $ onInbound updateOnTCP -} onioncryptTCP ]
+    dtacrypt0 <- mergeTransports $ DMap.fromList
+        [ Multi.RendezvousUDP :=> ByAddress dtacryptUDP
+        , Multi.RendezvousTCP :=> ByAddress dtacryptTCP
+        ]
     oniondrg <- drgNew
     let onionnet = layerTransportM
                         (\msg od -> Onion.decrypt crypto msg $ Multi.untagOnion od)
@@ -373,6 +378,9 @@ newToxOverTransport keydb addr onNewSession (crypto,roster) udp tcp = do
                                _    -> return Nothing
                             return (msg', maybe (Multi.OnionUDP ==> od') (const $ Multi.OnionTCP ==> od') mtcp))
                         onioncrypt
+        dtacrypt = layerTransport (\msg addr -> Right (msg,Multi.untagRendezvous addr))
+                                  (\msg addr -> (msg, Multi.RendezvousUDP ==> addr))
+                                  dtacrypt0
     onionclient <- newClient oniondrg onionnet (const Onion.classify)
                     (getOnionAlias crypto $ R.thisNode <$> readTVar (DHT.routing4 $ mkrouting dhtclient))
                     (const $ Onion.handlers onionnet (mkrouting dhtclient) toks keydb)