Improved search parameters for tox onion routed queries.

1 files changed, 7 insertions, 1 deletions

diff --git a/OnionRouter.hs b/OnionRouter.hs
index eb79b70b..757214cd 100644
--- a/OnionRouter.hs
+++ b/OnionRouter.hs
@@ -32,6 +32,7 @@ import qualified Data.Word64Map      as W64
 import Network.Socket
 import System.Endian
 import System.IO
+import System.Timeout
 
 -- Toxcore saves a maximum of 12 paths: 6 paths are reserved for announcing
 -- ourselves and 6 others are used to search for friends.
@@ -269,13 +270,18 @@ handleEvent getnodes or e@(BuildRoute (RouteId rid)) = do
                         forkIO $ sendq asel aq (ts !! 0) >>= atomically . writeTVar av . Just
                         forkIO $ sendq bsel bq (ts !! 1) >>= atomically . writeTVar bv . Just
                         forkIO $ sendq csel cq (ts !! 2) >>= atomically . writeTVar cv . Just
-                        atomically $ do -- Wait for all 3 results.
+                        -- 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.
                             rs <- catMaybes <$> sequence [readTVar av,readTVar bv,readTVar cv]
                             case rs of [_,_,_] -> do
                                                     return $ catMaybes $ catMaybes rs
                                                     -- self <- IntMap.lookup (-1) <$> readTVar (trampolineNodes or)
                                                     -- return $ maybe (catMaybes rs) (\x -> [x,x,x]) self
                                        _       -> retry
+                        maybe (hPutStrLn stderr "ONION: Unexpected sendq timeout!" >> return [])
+                              return
+                              tm
                 return $ do
                     myThreadId >>= flip labelThread ("OnionRouter.sendqs")
                     nodes <- case ts of