1 files changed, 19 insertions, 22 deletions

diff --git a/dht/src/Network/Tox.hs b/dht/src/Network/Tox.hs
index a7e5d2c2..f136ab96 100644
--- a/dht/src/Network/Tox.hs
+++ b/dht/src/Network/Tox.hs
@@ -315,9 +315,8 @@ newToxOverTransport keydb addr onNewSession (crypto,roster) udp tcp = do
     let lookupClose _ = return Nothing
 
     mkrouting <- DHT.newRouting addr crypto updateIP updateIP
-    (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)
+    (orouter,relaynet,onioncryptTCP) <- newOnionRouter crypto (dput XRoutes) (maybe False (const True) tcp)
+    (cryptonet,dhtcrypt,onioncryptUDP,handshakes)
         <- toxTransport crypto orouter lookupClose addr udp relaynet
                 (\dst x -> sendMessage (clientNet $ tcpClient $ tcpKademliaClient orouter) dst (True,x))
                 (fromMaybe (\_ _ -> return ()) tcp)
@@ -356,31 +355,29 @@ newToxOverTransport keydb addr onNewSession (crypto,roster) udp tcp = do
         nil <- nullSessionTokens
         atomically $ newTVar nil { maxInterval = 20 } -- 20 second timeout on announce ping-ids.
 
-    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)
-                        (\msg od -> do
-                            (msg', od') <- Onion.encrypt crypto msg od
+    onioncrypt <-
+        layerTransportM (\msg addr -> return $ Right (msg,Multi.untagOnion addr))
+                        (\msg addr -> do
                             -- TODO: lookupRoute is unnecessarily done twice
                             -- because that was convenient for me.  The other
-                            -- call was done when building the transport.
+                            -- call was done when building the onioncryptUDP
+                            -- transport.
                             -- Consider simplifying this.
-                            mtcp <- case od' of
+                            mtcp <- case addr of
                                Onion.OnionDestination _ ni (Just rid)
                                     -> (>>= Onion.routeRelayPort) <$> lookupRoute orouter' ni rid
                                _    -> 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
+                            return (msg, maybe (Multi.OnionUDP ==> addr) (const $ Multi.OnionTCP ==> addr) mtcp))
+            <$> mergeTransports (DMap.fromList
+                [ Multi.OnionUDP :=> ByAddress onioncryptUDP
+                , Multi.OnionTCP :=> ByAddress {- $ onInbound updateOnTCP -} onioncryptTCP ])
+
+    -- dtacrypt :: Transport String AnnouncedRendezvous (PublicKey,OnionData)
+    (dtacrypt,onioncrypt) <- partitionTransportM (Onion.parseDataToRoute crypto) (Onion.encodeDataToRoute crypto) onioncrypt
+    oniondrg <- drgNew
+    let onionnet = layerTransportM (\msg od -> Onion.decrypt crypto msg od)
+                                   (\msg od -> Onion.encrypt crypto msg od)
+                                   onioncrypt
     onionclient <- newClient oniondrg onionnet (const Onion.classify)
                     (getOnionAlias crypto $ R.thisNode <$> readTVar (DHT.routing4 $ mkrouting dhtclient))
                     (const $ Onion.handlers onionnet (mkrouting dhtclient) toks keydb)