2 files changed, 9 insertions, 12 deletions

diff --git a/src/Network/Kademlia.hs b/src/Network/Kademlia.hs
index 488a53ac..e61afe9b 100644
--- a/src/Network/Kademlia.hs
+++ b/src/Network/Kademlia.hs
@@ -101,9 +101,10 @@ vanillaIO var ping = TableStateIO
 
 -- | Everything necessary to maintain a routing table of /ni/ (node
 -- information) entries.
-data Kademlia nid ni = Kademlia (InsertionReporter ni)
-                                (KademliaSpace nid ni)
-                                (TableStateIO ni)
+data Kademlia nid ni = Kademlia { kademInsertionReporter :: InsertionReporter ni
+                                , kademSpace             :: KademliaSpace nid ni
+                                , kademIO                :: TableStateIO ni
+                                }
 
 
 -- Helper to 'insertNode'.
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index d42f447d..ef74b9c6 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -294,7 +294,7 @@ newToxOverTransport keydb addr onNewSession suppliedDHTKey udp tcp = do
     let dhtnet0 = layerTransportM (DHT.decrypt crypto) (DHT.encrypt crypto) dhtcrypt
         tbl4 = DHT.routing4 $ mkrouting (error "missing client")
         tbl6 = DHT.routing6 $ mkrouting (error "missing client")
-        updateOnion bkts tr = hookBucketList DHT.toxSpace bkts orouter tr
+        updateOnion bkts tr = hookBucketList DHT.toxSpace bkts orouter (trampolinesUDP orouter) tr
     dhtclient <- newClient drg dhtnet0 DHT.classify (myAddr tbl4 tbl6) (DHT.handlers crypto . mkrouting) id
                     $ \client net -> onInbound (DHT.updateRouting client (mkrouting client) updateOnion) net
 
@@ -306,6 +306,8 @@ newToxOverTransport keydb addr onNewSession suppliedDHTKey udp tcp = do
             , spOnNewSession     = onNewSession roster addr
             }
 
+    -- TODO: Refactor so that these threads are forked when 'forkTox' is invoked.
+    --       This function should only initialize state.
     orouter' <- forkRouteBuilder orouter
         $ \nid ni -> fmap (\(_,ns,_)->ns)
                      <$> DHT.getNodes dhtclient (DHT.nodesOfInterest $ mkrouting dhtclient) nid ni
@@ -332,7 +334,7 @@ newToxOverTransport keydb addr onNewSession suppliedDHTKey udp tcp = do
         , toxRouting        = mkrouting dhtclient
         , toxTokens         = toks
         , toxAnnouncedKeys  = keydb
-        , toxOnionRoutes    = orouter
+        , toxOnionRoutes    = orouter' -- TODO: see above
         , toxContactInfo    = roster
         , toxAnnounceToLan  = return ()
         , toxBindAddress    = addr
@@ -375,11 +377,6 @@ forkTox tox with_avahi = do
     quitDHT     <- forkListener "toxDHT" (clientNet $ toxDHT tox)
     quitNC      <- forkListener "toxCrypto" (toxCrypto tox)
     quitTCP     <- forkListener "relay-client" (clientNet $ tcpClient $ tcpKademliaClient $ toxOnionRoutes tox)
-    tcpKademlia <- forkPollForRefresh (tcpBucketRefresher $ toxOnionRoutes tox)
-    tcpprobe <- forkIO $ runProbeQueue (tcpProber $ toxOnionRoutes tox)
-                                       (tcpClient $ tcpKademliaClient $ toxOnionRoutes tox)
-                                       12
-    labelThread tcpprobe "tcp-probe"
     quitAvahi <- if with_avahi then do
                     forkPollForRefresh (DHT.refresher4 $ toxRouting tox)
                     forkPollForRefresh (DHT.refresher6 $ toxRouting tox)
@@ -396,8 +393,7 @@ forkTox tox with_avahi = do
                 quitDHT
                 quitOnion
                 quitTCP
-                killThread tcpKademlia
-                killThread tcpprobe
+                quitRouteBuilder (toxOnionRoutes tox)
                 quitToRoute
                 quitHs
            , bootstrap (DHT.refresher4 $ toxRouting tox)