QueryResponse: Use three-way sum to distinguish Canceled and Timedout.

2 files changed, 2 insertions, 2 deletions

diff --git a/dht/src/Network/Tox/Onion/Handlers.hs b/dht/src/Network/Tox/Onion/Handlers.hs
index 65ec846c..fa7bc83c 100644
--- a/dht/src/Network/Tox/Onion/Handlers.hs
+++ b/dht/src/Network/Tox/Onion/Handlers.hs
@@ -285,7 +285,7 @@ sendOnion getTimeout client req oaddr unwrap =
     forM_ mb $ \r -> dput XAnnounce $ show (onionNodeInfo oaddr) ++ " sent response: " ++ show r
     maybe (if n>0 then loop $! n - 1 else return Nothing)
           (return . Just . unwrap (onionNodeInfo oaddr))
-          $ join mb
+          $ join $ resultToMaybe mb
 
 
 -- | Lookup the secret counterpart for a given alias key.
diff --git a/dht/src/Network/Tox/Onion/Routes.hs b/dht/src/Network/Tox/Onion/Routes.hs
index b20ad7dd..7c11227a 100644
--- a/dht/src/Network/Tox/Onion/Routes.hs
+++ b/dht/src/Network/Tox/Onion/Routes.hs
@@ -171,7 +171,7 @@ newOnionRouter crypto perror tcp_enabled = do
     ((tbl,(tcptbl,tcpcons,relaynet,onionnet)),tcp) <- do
         (tcptbl, client) <- TCP.newClient crypto
                                     id
-                                    (. (Just . (,) False))
+                                    (. (Success . (,) False))
                                     (lookupSender' pq rlog)
                                     (\_ (RouteId rid) -> atomically $ fmap storedRoute <$> readArray rm rid)