1 files changed, 5 insertions, 2 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 51ee0a4d..56c4b8e6 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -85,7 +85,7 @@ import Control.TriadCommittee
 import Network.BitTorrent.DHT.Token           as Token
 import GHC.TypeLits
 
-import Crypto.Tox hiding (Assym)
+import Crypto.Tox
 import Network.Tox.Transport
 import Network.Tox.NodeId
 import qualified Network.Tox.DHT.Transport as DHT
@@ -202,6 +202,7 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
 data Tox = Tox
     { toxDHT :: DHT.Client
     , toxOnion :: Onion.Client RouteId
+    , toxToRoute :: Transport String Onion.Rendezvous (Assym (Encrypted Onion.DataToRoute))
     , toxCrypto :: Transport String SockAddr NetCrypto
     , toxRouting :: DHT.Routing
     , toxTokens :: TVar SessionTokens
@@ -249,7 +250,7 @@ newTox keydb addr = do
 
     routing <- DHT.newRouting addr crypto updateIP updateIP
     orouter <- newOnionRouter
-    (dhtcrypt,onioncrypt,cryptonet) <- toxTransport crypto orouter lookupClose udp
+    (dhtcrypt,onioncrypt,dtacrypt,cryptonet) <- toxTransport crypto orouter lookupClose udp
     let dhtnet0 = layerTransport (DHT.decrypt crypto) (DHT.encrypt crypto) dhtcrypt
     dhtclient <- newClient drg dhtnet0 DHT.classify (myAddr routing) (DHT.handlers routing) id
                     $ \client net -> onInbound (DHT.updateRouting client routing orouter) net
@@ -270,6 +271,7 @@ newTox keydb addr = do
     return Tox
         { toxDHT = dhtclient
         , toxOnion = onionclient
+        , toxToRoute = dtacrypt
         , toxCrypto = cryptonet
         , toxRouting = routing
         , toxTokens = toks
@@ -283,6 +285,7 @@ onionTimeout Tox { toxOnionRoutes = or } (DHT.TransactionId n8 _) od = lookupTim
 forkTox :: Tox -> IO (IO ())
 forkTox tox = do
     _ <- forkListener "toxCrypto" (toxCrypto tox)
+    _ <- forkListener "toxToRoute" (toxToRoute tox)
     _ <- forkListener "toxOnion" (clientNet $ toxOnion tox)
     forkListener "toxDHT" (clientNet $ toxDHT tox)