1 files changed, 13 insertions, 21 deletions

diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index d1fa36e5..e067ab52 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -49,7 +49,6 @@ module Network.BitTorrent.DHT.Query
        , (<@>)
        ) where
 
-import Control.Applicative
 import Control.Concurrent.Lifted hiding (yield)
 import Control.Exception.Lifted hiding (Handler)
 import Control.Monad.Reader
@@ -168,7 +167,7 @@ announceQ ih p NodeInfo {..} = do
     Left  ns
       | False     -> undefined -- TODO check if we can announce
       | otherwise -> return (Left ns)
-    Right ps -> do -- TODO *probably* add to peer cache
+    Right _ -> do -- TODO *probably* add to peer cache
       Announced <- Announce False ih p grantedToken <@> nodeAddr
       return (Right [nodeAddr])
 
@@ -179,7 +178,7 @@ announceQ ih p NodeInfo {..} = do
 type Search    ip o = Conduit [NodeInfo ip] (DHT ip) [o ip]
 
 -- TODO: use reorder and filter (Traversal option) leftovers
-search :: TableKey k => Address ip => k -> Iteration ip o -> Search ip o
+search :: k -> Iteration ip o -> Search ip o
 search _ action = do
   awaitForever $ \ batch -> unless (L.null batch) $ do
     $(logWarnS) "search" "start query"
@@ -196,11 +195,6 @@ publish ih p = do
   _ <- sourceList [nodes] $= search ih (announceQ ih p) $$ C.take r
   return ()
 
-republish :: DHT ip ThreadId
-republish = fork $ do
-  i <- asks (optReannounce . options)
-  error "DHT.republish: not implemented"
-
 getTimestamp :: DHT ip Timestamp
 getTimestamp = do
   utcTime <- liftIO $ getCurrentTime
@@ -229,7 +223,7 @@ refreshNodes nid = do
     -- nss <- sourceList [[addr]] $= search nid (findNodeQ nid) $$ C.consume
     nss <- sourceList [nodes] $= search nid (findNodeQ nid) $$ C.consume
     $(logWarnS) "refreshNodes" $ "received " <> T.pack (show (L.length (L.concat nss))) <> " nodes."
-    queryParallel $ flip L.map (L.concat nss) $ \n -> do
+    _ <- queryParallel $ flip L.map (L.concat nss) $ \n -> do
         $(logWarnS) "refreshNodes" $ "received node: " <> T.pack (show (pPrint n))
         pingQ (nodeAddr n)
         -- pingQ takes care of inserting the node.
@@ -239,15 +233,14 @@ refreshNodes nid = do
 -- | This operation do not block but acquire exclusive access to
 --   routing table.
 insertNode :: Address ip => NodeInfo ip -> Maybe ReflectedIP -> DHT ip ThreadId
-insertNode info witnessed_ip = fork $ do
+insertNode info witnessed_ip0 = fork $ do
   var <- asks routingInfo
   tm <- getTimestamp
   let showTable = do
           t <- getTable
           let logMsg = "Routing table: " <> pPrint t
           $(logDebugS) "insertNode" (T.pack (render logMsg))
-  t <- liftIO $ atomically $ readTVar var
-  let arrival  = TryInsert info
+  let arrival0 = TryInsert info
       arrival4 = TryInsert (fmap fromAddr info) :: Event (Maybe IPv4)
   $(logDebugS) "insertNode" $ T.pack (show arrival4)
   maxbuckets <- asks (optBucketCount . options)
@@ -259,13 +252,13 @@ insertNode info witnessed_ip = fork $ do
                             $ rank id (nodeId $ foreignNode arrival)
                             $ bep42s ip fallbackid
           case minfo of
-            Just info -> do
-              (ps,t') <- R.insert tm arrival $ myBuckets info
-              writeTVar var $ Just $ info { myBuckets = t' }
+            Just inf -> do
+              (ps,t') <- R.insert tm arrival $ myBuckets inf
+              writeTVar var $ Just $ inf { myBuckets = t' }
               return $ do
                 case witnessed_ip of
                     Just (ReflectedIP ip0)
-                      | fromSockAddr ip0 /= Just (myAddress info)
+                      | fromSockAddr ip0 /= Just (myAddress inf)
                         -> $(logInfo) ( T.pack $ L.unwords
                               $ [ "Possible NAT?"
                                 , show (toSockAddr $ nodeAddr $ foreignNode arrival)
@@ -298,15 +291,14 @@ insertNode info witnessed_ip = fork $ do
                                     <> ")"
                                 ] )
                            return ps
-  ps <- join $ liftIO $ atomically $ atomicInsert arrival witnessed_ip
+  ps <- join $ liftIO $ atomically $ atomicInsert arrival0 witnessed_ip0
   showTable
-  fork $ forM_ ps $ \(CheckPing ns)-> do
+  _ <- fork $ forM_ ps $ \(CheckPing ns)-> do
     forM_ ns $ \n -> do
         (b,mip) <- probeNode (nodeAddr n)
         let alive = PingResult n b
         $(logDebugS) "insertNode" $ T.pack ("PingResult "++show (nodeId n,b))
-        tm <- getTimestamp
-        join $ liftIO $ atomically $ atomicInsert alive mip
+        _ <- join $ liftIO $ atomically $ atomicInsert alive mip
         showTable
   return ()
 
@@ -323,7 +315,7 @@ queryNode' addr q = do
   (Response remoteId r, witnessed_ip) <- query' (toSockAddr addr) (Query nid read_only q)
   -- $(logDebugS) "queryNode" $ "Witnessed address: " <> T.pack (show witnessed_ip)
   --                             <> " by " <> T.pack (show (toSockAddr addr))
-  insertNode (NodeInfo remoteId addr) witnessed_ip
+  _ <- insertNode (NodeInfo remoteId addr) witnessed_ip
   return (remoteId, r, witnessed_ip)
 
 -- | Infix version of 'queryNode' function.