Made node refresh into full iterative search.

1 files changed, 1 insertions, 63 deletions

diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index ffce47de..2bb3ce85 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -30,6 +30,7 @@ module Network.BitTorrent.DHT.Session
        , Node
        , options
        , thisNodeId
+       , routingTable
 
          -- ** Initialization
        , LogFun
@@ -50,7 +51,6 @@ module Network.BitTorrent.DHT.Session
          -- ** Routing table
        , getTable
        , getClosest
-       , insertNode
 
          -- ** Peer storage
        , insertPeer
@@ -59,9 +59,7 @@ module Network.BitTorrent.DHT.Session
        , deleteTopic
 
          -- ** Messaging
-       , queryNode
        , queryParallel
-       , (<@>)
        ) where
 
 import Prelude hiding (ioError)
@@ -347,35 +345,9 @@ runDHT node action = runReaderT (unDHT action) node
 --  Routing
 -----------------------------------------------------------------------}
 
-routing :: Address ip => Routing ip a -> DHT ip (Maybe a)
-routing = runRouting probeNode refreshNodes getTimestamp
-
-probeNode :: Address ip => NodeAddr ip -> DHT ip Bool
-probeNode addr = do
-  $(logDebugS) "routing.questionable_node" (T.pack (render (pPrint addr)))
-  result <- try $ Ping <@> addr
-  let _ = result :: Either SomeException Ping
-  return $ either (const False) (const True) result
-
 -- /pick a random ID/ in the range of the bucket and perform a
 -- find_nodes search on it.
 
--- FIXME do not use getClosest sinse we should /refresh/ them
-refreshNodes :: Address ip => NodeId -> DHT ip [NodeInfo ip]
-refreshNodes nid = do
-  $(logDebugS) "routing.refresh_bucket" (T.pack (render (pPrint nid)))
-  nodes <- getClosest nid
-  nss <- forM (nodeAddr <$> nodes) $ \ addr -> do
-    NodeFound ns <- FindNode nid <@> addr
-    return ns
-  return $ L.concat nss
-
-getTimestamp :: DHT ip Timestamp
-getTimestamp = do
-  utcTime <- liftIO $ getCurrentTime
-  $(logDebugS) "routing.make_timestamp" (T.pack (render (pPrint utcTime)))
-  return $ utcTimeToPOSIXSeconds utcTime
-
 {-----------------------------------------------------------------------
 -- Tokens
 -----------------------------------------------------------------------}
@@ -421,24 +393,6 @@ getClosest node = do
   k <- asks (optK . options)
   kclosest k node <$> getTable
 
--- | This operation do not block but acquire exclusive access to
---   routing table.
-insertNode :: Address ip => NodeInfo ip -> DHT ip ThreadId
-insertNode info = fork $ do
-  var <- asks routingTable
-  modifyMVar_ var $ \ t -> do
-    result <- routing (R.insert info t)
-    case result of
-      Nothing -> do
-        $(logDebugS) "insertNode" $ "Routing table is full: "
-                   <> T.pack (show (pPrint t))
-        return t
-      Just t' -> do
-        let logMsg = "Routing table updated: "
-                  <> pPrint t <> " -> " <> pPrint t'
-        $(logDebugS) "insertNode" (T.pack (render logMsg))
-        return t'
-
 {-----------------------------------------------------------------------
 -- Peer storage
 -----------------------------------------------------------------------}
@@ -487,22 +441,6 @@ deleteTopic ih p = do
 -- Messaging
 -----------------------------------------------------------------------}
 
--- | Throws exception if node is not responding.
-queryNode :: forall a b ip. Address ip => KRPC (Query a) (Response b)
-          => NodeAddr ip -> a -> DHT ip (NodeId, b)
-queryNode addr q = do
-  nid <- asks thisNodeId
-  let read_only = False -- TODO: check for NAT issues. (BEP 43)
-  Response remoteId r <- query (toSockAddr addr) (Query nid read_only q)
-  insertNode (NodeInfo remoteId addr)
-  return (remoteId, r)
-
--- | Infix version of 'queryNode' function.
-(<@>) :: Address ip => KRPC (Query a) (Response b)
-      => a -> NodeAddr ip -> DHT ip b
-q <@> addr = snd <$> queryNode addr q
-{-# INLINE (<@>) #-}
-
 -- TODO: use alpha
 -- | Failed queries are ignored.
 queryParallel :: [DHT ip a] -> DHT ip [a]