tcp: this seems to work.

1 files changed, 3 insertions, 3 deletions

diff --git a/OnionRouter.hs b/OnionRouter.hs
index 018a6314..0bbcd20d 100644
--- a/OnionRouter.hs
+++ b/OnionRouter.hs
@@ -79,7 +79,7 @@ data OnionRouter = OnionRouter
       -- discarded and replaced with a fresh one.
     , pendingRoutes   :: TArray Int Int
       -- | Parameters used to implement Kademlia for TCP relays.
-    , tcpKademliaClient :: TCP.TCPClient String () Nonce8
+    , tcpKademliaClient :: TCP.TCPClient String Nonce8
       -- | This thread maintains the TCP relay table.
     , tcpKademliaThread :: ThreadId
     , tcpProber :: TCP.TCPProber
@@ -275,7 +275,7 @@ updateTCP or addr x =
 selectGateway :: TVar (R.BucketList TCP.NodeInfo) -> NodeInfo -> STM (Maybe TCP.NodeInfo)
 selectGateway tbl ni = do
     ns <- kclosest TCP.tcpSpace 2 (nodeId ni) <$> readTVar tbl
-    return $ listToMaybe $ dropWhile (\n -> TCP.nodeId n == nodeId ni) ns
+    return $ listToMaybe ns -- $ dropWhile (\n -> TCP.nodeId n == nodeId ni) ns
 
 quitRouteBuilder :: OnionRouter -> IO ()
 quitRouteBuilder or = do
@@ -473,7 +473,7 @@ handleEvent getnodes or e@(BuildRoute (RouteId rid)) = do
                         forkIO $ sendq csel cq 2 >>= atomically . writeTVar cv . Just
                         -- This timeout should be unnecessary... But I'm paranoid.
                         -- Note: 10 seconds should be sufficient for typical get-nodes queries.
-                        tm <- timeout 20000000 $ atomically $ do -- Wait for all 3 results.
+                        tm <- timeout 30000000 $ atomically $ do -- Wait for all 3 results.
                             rs <- catMaybes <$> sequence [readTVar av,readTVar bv,readTVar cv]
                             case rs of [_,_,_] -> do
                                                     return $ catMaybes $ rs