From d4c209fb9543019461bcf612da67708aeabcdce2 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Sat, 25 Jan 2020 01:02:33 -0500 Subject: Ported dhtd to reworked QueryResponse design. --- dht/src/Network/Tox/Onion/Routes.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dht/src/Network/Tox/Onion/Routes.hs') diff --git a/dht/src/Network/Tox/Onion/Routes.hs b/dht/src/Network/Tox/Onion/Routes.hs index 46ded48d..93e9bfcd 100644 --- a/dht/src/Network/Tox/Onion/Routes.hs +++ b/dht/src/Network/Tox/Onion/Routes.hs @@ -539,16 +539,16 @@ handleEvent getnodes or e@(BuildRoute (RouteId rid)) = do Nothing -> routeLogger or $ "ONION Failed RouteId " ++ show rid -lookupSender :: OnionRouter -> SockAddr -> Nonce8 -> IO (Maybe (OnionDestination RouteId)) -lookupSender or = lookupSender' (pendingQueries or) (routeLog or) +lookupSender :: OnionRouter -> SockAddr -> Nonce8 -> STM (Maybe (OnionDestination RouteId)) +lookupSender or saddr n8 = lookupSender' (pendingQueries or) (routeLog or) saddr n8 lookupSender' :: TVar (Word64Map PendingQuery) -> TChan String -> SockAddr -> Nonce8 - -> IO (Maybe (OnionDestination RouteId)) + -> STM (Maybe (OnionDestination RouteId)) lookupSender' pending log saddr (Nonce8 w8) = do - result <- atomically $ do + result <- do ks <- readTVar pending let r = W64.lookup w8 ks writeTChan log $ "ONION lookupSender " ++ unwords [show w8, "->", show r] -- cgit v1.2.3