1 files changed, 7 insertions, 3 deletions

diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index 39ef9604..5345f8b1 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -209,13 +209,17 @@ ioFindNode ih = do
 isearch :: (Ord r, Ord ip) =>
             (InfoHash -> DHT ip (NodeInfo ip -> IO ([NodeInfo ip], [r])))
             -> InfoHash
-            -> DHT ip (Set r)
+            -> DHT ip (ThreadId, Search.IterativeSearch ip r)
 isearch f ih = do
     qry <- f ih
     ns <- kclosest 8 ih <$> getTable
     liftIO $ do s <- Search.newSearch qry (toNodeId ih) ns
-                Search.search s
-                atomically $ readTVar (Search.searchResults s)
+                a <- fork $ do
+                    tid <- myThreadId
+                    labelThread tid ("search."++show ih)
+                    Search.search s
+                    -- atomically $ readTVar (Search.searchResults s)
+                return (a, s)
 
 
 type Search    ip o = Conduit [NodeInfo ip] (DHT ip) [o ip]