tox: Separate transports for handshakes and crypto-packets.

1 files changed, 22 insertions, 5 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index ce9939a9..6df239b5 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -240,6 +240,7 @@ data Tox = Tox
     , toxOnion          :: Onion.Client RouteId
     , toxToRoute        :: Transport String Onion.AnnouncedRendezvous (PublicKey,Onion.OnionData)
     , toxCrypto         :: Transport String SockAddr NetCrypto
+    , toxHandshakes     :: Transport String SockAddr NetCrypto
     , toxCryptoSessions :: NetCryptoSessions
     , toxCryptoKeys     :: TransportCrypto
     , toxRouting        :: DHT.Routing
@@ -439,8 +440,22 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
     mkrouting <- DHT.newRouting addr crypto updateIP updateIP
     let ignoreErrors _ = return () -- Set this to (hPutStrLn stderr) to debug onion route building.
     orouter <- newOnionRouter ignoreErrors
-    (dhtcrypt,onioncrypt,dtacrypt,cryptonet) <- toxTransport crypto orouter lookupClose udp
-    let sessionsState = sessionsState0 { sessionTransport = cryptonet
+    (cryptonet,dhtcrypt,onioncrypt,dtacrypt,handshakes) <- toxTransport crypto orouter lookupClose udp
+
+    -- TODO: Avoid adapting these transports here.
+    let nc_cryptonet  = layerTransport (\x addr -> Right (NetCrypto x,addr))
+                                       (\(NetCrypto x) addr -> (x,addr))
+                                       cryptonet
+        nc_handshakes = layerTransport (\x addr -> Right (NetHandshake x,addr))
+                                       (\(NetHandshake x) addr -> (x,addr))
+                                       handshakes
+        nc_combo = nc_handshakes
+                    { sendMessage = \addr -> \case
+                        NetCrypto    x -> sendMessage cryptonet  addr x
+                        NetHandshake x -> sendMessage handshakes addr x
+                    }
+
+    let sessionsState = sessionsState0 { sessionTransport = nc_combo
                                        , transportCrypto = crypto }
     let dhtnet0 = layerTransportM (DHT.decrypt crypto) (DHT.encrypt crypto) dhtcrypt
         tbl4 = DHT.routing4 $ mkrouting (error "missing client")
@@ -465,7 +480,8 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
         { toxDHT            = dhtclient
         , toxOnion          = onionclient
         , toxToRoute        = onInbound (updateContactInfo roster) dtacrypt
-        , toxCrypto         = addHandler (hPutStrLn stderr) (cryptoNetHandler sessionsState) cryptonet
+        , toxCrypto         = addHandler (hPutStrLn stderr) (cryptoNetHandler sessionsState) nc_cryptonet
+        , toxHandshakes     = addHandler (hPutStrLn stderr) (cryptoNetHandler sessionsState) nc_handshakes
         , toxCryptoSessions = sessionsState
         , toxCryptoKeys     = crypto
         , toxRouting        = mkrouting dhtclient
@@ -481,10 +497,11 @@ onionTimeout Tox { toxOnionRoutes = or } (DHT.TransactionId n8 _) od = lookupTim
 
 forkTox :: Tox -> IO (IO (), [NodeInfo] -> [NodeInfo] -> IO (), [NodeInfo] -> [NodeInfo] -> IO ())
 forkTox tox = do
-    _ <- forkListener "toxCrypto" (toxCrypto tox)
+    _ <- forkListener "toxHandshakes" (toxHandshakes tox)
     _ <- forkListener "toxToRoute" (toxToRoute tox)
     _ <- forkListener "toxOnion" (clientNet $ toxOnion tox)
-    quit <- forkListener "toxDHT" (clientNet $ toxDHT tox)
+    _ <- forkListener "toxDHT" (clientNet $ toxDHT tox)
+    quit <- forkListener "toxCrypto" (toxCrypto tox)
     forkPollForRefresh (DHT.refresher4 $ toxRouting tox)
     forkPollForRefresh (DHT.refresher6 $ toxRouting tox)
     return ( quit