1 files changed, 15 insertions, 11 deletions

diff --git a/OnionRouter.hs b/OnionRouter.hs
index 5f66dc68..ddccb531 100644
--- a/OnionRouter.hs
+++ b/OnionRouter.hs
@@ -443,12 +443,16 @@ handleEvent getnodes or e@(BuildRoute (RouteId rid)) = do
                 let asel = sel .&. 0x3
                     bsel = shiftR sel 2 .&. 0x3
                     csel = shiftR sel 4 .&. 0x3
-                    sendq s q ni = fmap (listToMaybe . drop (fromIntegral s)) <$> getnodes q ni
+                    sendq s q ni
+                        | Right ts <- mts = fmap (listToMaybe . drop (fromIntegral s)) <$> getnodes q (ts !! ni)
+                        | Left  ts <- mts = case ni of
+                            0 -> return $ Just $ Just $ TCP.udpNodeInfo (ts !! 0)
+                            n -> fmap (listToMaybe . drop (fromIntegral s) . (\(ns,_,_)->ns))
+                                   <$> TCP.getUDPNodes (tcpKademliaClient or) q (TCP.udpNodeInfo $ ts !! n)
                     sendqs = do
-                        let Right ts = mts
-                        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
+                        forkIO $ sendq asel aq 0 >>= atomically . writeTVar av . Just
+                        forkIO $ sendq bsel bq 1 >>= atomically . writeTVar bv . Just
+                        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.
@@ -463,14 +467,14 @@ handleEvent getnodes or e@(BuildRoute (RouteId rid)) = do
                               tm
                 return $ do
                     myThreadId >>= flip labelThread ("OnionRouter.sendqs")
-                    let Right ts = mts
-                        mtcpport = Nothing -- TODO
-                    nodes <- case ts of
-                        [_,_,_] -> sendqs
-                        _       -> return []
+                    let mtcpport = either (Just . TCP.tcpPort . head) (const Nothing) mts
+                    nodes <- case mts of
+                        Right [_,_,_] -> sendqs
+                        Left  [_,_,_] -> sendqs
+                        _             -> return []
                     myThreadId >>= flip labelThread ("OnionRouter")
                     routeLogger or $ unlines
-                        [ "ONION trampolines:   " ++ show ts
+                        [ "ONION trampolines:   " ++ show mts
                         , "ONION query results: " ++ show nodes ]
                     case nodes of
                         [a,b,c] | distinct3by nodeClass a b c -> do