2 files changed, 13 insertions, 5 deletions

diff --git a/src/Network/BitTorrent/MainlineDHT.hs b/src/Network/BitTorrent/MainlineDHT.hs
index 3e7a0eda..47d5b3e1 100644
--- a/src/Network/BitTorrent/MainlineDHT.hs
+++ b/src/Network/BitTorrent/MainlineDHT.hs
@@ -538,7 +538,12 @@ mkNodeInfo nid addr = NodeInfo
     , nodePort = fromMaybe 0 $ sockAddrPort addr
     }
 
-newClient :: SwarmsDatabase -> SockAddr -> IO (MainlineClient, Routing)
+newClient :: SwarmsDatabase -> SockAddr
+    -> IO ( MainlineClient
+          , Routing
+          , [NodeInfo] -> [NodeInfo] -> IO ()
+          , [NodeInfo] -> [NodeInfo] -> IO ()
+          )
 newClient swarms addr = do
     udp <- udpTransport addr
     nid <- NodeId <$> getRandomBytes 20
@@ -651,7 +656,7 @@ newClient swarms addr = do
     refresh_thread4 <- forkPollForRefresh $ refresher4 routing
     refresh_thread6 <- forkPollForRefresh $ refresher6 routing
 
-    return (client, routing)
+    return (client, routing, bootstrap (refresher4 routing), bootstrap (refresher6 routing))
 
 -- | Modifies a purely random 'NodeId' to one that is related to a given
 -- routable address in accordance with BEP 42.
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 5f691ef3..37802e3c 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -88,7 +88,7 @@ import GHC.TypeLits
 import Crypto.Tox
 import Data.Word64Map                        (fitsInInt)
 import qualified Data.Word64Map              (empty)
-import Network.Kademlia.Bootstrap            (forkPollForRefresh)
+import Network.Kademlia.Bootstrap            (forkPollForRefresh, bootstrap)
 import Network.Tox.Crypto.Transport          (NetCrypto)
 import Network.Tox.Crypto.Handlers           (cryptoNetHandler, newSessionsState, defaultUnRecHook, defaultCryptoDataHooks, NetCryptoSessions(..))
 import qualified Network.Tox.DHT.Handlers    as DHT
@@ -354,7 +354,7 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
 onionTimeout :: Tox -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)
 onionTimeout Tox { toxOnionRoutes = or } (DHT.TransactionId n8 _) od = lookupTimeout or n8 od
 
-forkTox :: Tox -> IO (IO ())
+forkTox :: Tox -> IO (IO (), [NodeInfo] -> [NodeInfo] -> IO (), [NodeInfo] -> [NodeInfo] -> IO ())
 forkTox tox = do
     _ <- forkListener "toxCrypto" (toxCrypto tox)
     _ <- forkListener "toxToRoute" (toxToRoute tox)
@@ -362,5 +362,8 @@ forkTox tox = do
     quit <- forkListener "toxDHT" (clientNet $ toxDHT tox)
     forkPollForRefresh (DHT.refresher4 $ toxRouting tox)
     forkPollForRefresh (DHT.refresher6 $ toxRouting tox)
-    return quit
+    return ( quit
+           , bootstrap (DHT.refresher4 $ toxRouting tox)
+           , bootstrap (DHT.refresher6 $ toxRouting tox)
+           )