3 files changed, 16 insertions, 1 deletions

diff --git a/src/Network/BitTorrent/DHT.hs b/src/Network/BitTorrent/DHT.hs
index a098d339..38de1f91 100644
--- a/src/Network/BitTorrent/DHT.hs
+++ b/src/Network/BitTorrent/DHT.hs
@@ -41,6 +41,7 @@ import Text.PrettyPrint.Class
 import Data.Torrent.InfoHash
 import Network.BitTorrent.Core
 import Network.BitTorrent.DHT.Message
+import Network.BitTorrent.DHT.Routing
 import Network.BitTorrent.DHT.Session
 import Network.KRPC
 
@@ -103,6 +104,8 @@ bootstrap startNodes = do
     $(logInfoS) "bootstrap" "Node bootstrapping finished"
   where
     insertClosest addr = do
+     t <- getTable
+     unless (full t) $ do
       nid <- getNodeId
       result <- try $ FindNode nid <@> addr
       case result of
diff --git a/src/Network/BitTorrent/DHT/Routing.hs b/src/Network/BitTorrent/DHT/Routing.hs
index f6926cb1..22076a39 100644
--- a/src/Network/BitTorrent/DHT/Routing.hs
+++ b/src/Network/BitTorrent/DHT/Routing.hs
@@ -29,6 +29,8 @@ module Network.BitTorrent.DHT.Routing
        , NodeCount
 
          -- * Query
+       , Network.BitTorrent.DHT.Routing.null
+       , Network.BitTorrent.DHT.Routing.full
        , thisId
        , shape
        , Network.BitTorrent.DHT.Routing.size
@@ -328,7 +330,16 @@ instance Pretty (Table ip) where
 nullTable :: Eq ip => NodeId -> BucketCount -> Table ip
 nullTable nid n = Tip nid (bucketCount (pred n)) PSQ.empty
   where
-    bucketCount x = max 0 (min 160 x)
+    bucketCount x = max 0 (min 159 x)
+
+null :: Table ip -> Bool
+null (Tip _ _ b) = PSQ.null b
+null  _          = False
+
+full :: Table ip -> Bool
+full (Tip  _ n _) = n == 0
+full (Zero   t b) = PSQ.size b == defaultBucketSize && full t
+full (One    b t) = PSQ.size b == defaultBucketSize && full t
 
 -- | Get the /spine/ node id.
 thisId :: Table ip -> NodeId
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index c47f7491..d3315a42 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -23,6 +23,7 @@ module Network.BitTorrent.DHT.Session
        , checkToken
 
          -- * Routing table
+       , getTable
        , getNodeId
        , getClosest
        , getClosestHash