1 files changed, 11 insertions, 8 deletions

diff --git a/dht/src/Network/Tox/Onion/Handlers.hs b/dht/src/Network/Tox/Onion/Handlers.hs
index fa7bc83c..015c758c 100644
--- a/dht/src/Network/Tox/Onion/Handlers.hs
+++ b/dht/src/Network/Tox/Onion/Handlers.hs
@@ -277,15 +277,17 @@ sendOnion :: (OnionDestination r -> STM (OnionDestination r, Int))
             -> AnnounceRequest
             -> OnionDestination r
             -> (NodeInfo -> AnnounceResponse -> t)
-            -> IO (Maybe t)
+            -> IO (QR.Result t)
 sendOnion getTimeout client req oaddr unwrap =
     -- Four tries and then we tap out.
     flip fix 4 $ \loop n -> do
-    mb <- QR.sendQuery client (announceSerializer getTimeout) req oaddr
-    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 $ resultToMaybe mb
+        mb <- QR.sendQuery client (announceSerializer getTimeout) req oaddr
+        forM_ mb $ \r -> dput XAnnounce $ show (onionNodeInfo oaddr) ++ " sent response: " ++ show r
+        let re = if n>0 then loop $! n - 1 else return Canceled
+        case mb of
+            Success x -> maybe re (return . Success . unwrap (onionNodeInfo oaddr)) x
+            Canceled  -> return Canceled
+            TimedOut  -> re
 
 
 -- | Lookup the secret counterpart for a given alias key.
@@ -294,7 +296,7 @@ getRendezvous :: (OnionDestination r -> STM (OnionDestination r, Int))
             -> Client r
             -> NodeId
             -> NodeInfo
-            -> IO (Maybe ([NodeInfo],[Rendezvous],Maybe Nonce32))
+            -> IO (Result ([NodeInfo],[Rendezvous],Maybe Nonce32))
 getRendezvous getTimeout crypto client nid ni = do
     asel <- atomically $ selectAlias crypto nid
     let oaddr = OnionDestination asel ni Nothing
@@ -319,5 +321,6 @@ putRendezvous getTimeout crypto client pubkey nonce32 ni = do
         rendezvousKey = key2id rkey
     asel <- atomically $ selectAlias crypto longTermKey
     let oaddr = OnionDestination asel ni Nothing
-    sendOnion getTimeout client (AnnounceRequest nonce32 longTermKey rendezvousKey) oaddr
+    fmap resultToMaybe
+        $ sendOnion getTimeout client (AnnounceRequest nonce32 longTermKey rendezvousKey) oaddr
         $ \ni resp -> (Rendezvous rkey ni, resp)