Support for async queries.

2 files changed, 4 insertions, 4 deletions

diff --git a/dht/src/Network/Tox/Onion/Routes.hs b/dht/src/Network/Tox/Onion/Routes.hs
index 7c11227a..9ce4e316 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
-                                    (. (Success . (,) False))
+                                    (\x -> \qid -> x qid . Success . (,) False)
                                     (lookupSender' pq rlog)
                                     (\_ (RouteId rid) -> atomically $ fmap storedRoute <$> readArray rm rid)
 
diff --git a/dht/src/Network/Tox/TCP.hs b/dht/src/Network/Tox/TCP.hs
index 0850ce51..385da35b 100644
--- a/dht/src/Network/Tox/TCP.hs
+++ b/dht/src/Network/Tox/TCP.hs
@@ -319,8 +319,8 @@ type RelayCache = TCPCache (SessionProtocol (SessionData,RelayPacket) RelayPacke
 -- defaults are 'id' and 'tryPutMVar'.  The resulting customized table state
 -- will be returned to the caller along with the new client.
 newClient :: TransportCrypto
-               -> ((QR.Result (Bool,RelayPacket) -> IO ()) -> a)                -- ^ store mvar for relay query
-               -> (a -> RelayPacket -> IO void)                                 -- ^ load mvar for relay query
+               -> ((Nonce8 -> QR.Result (Bool,RelayPacket) -> IO ()) -> a)      -- ^ store mvar for relay query
+               -> (a -> Nonce8 -> RelayPacket -> IO void)                       -- ^ load mvar for relay query
                -> (SockAddr -> Nonce8 -> IO (Maybe (OnionDestination RouteId))) -- ^ lookup sender of onion query
                -> (UDP.NodeInfo -> RouteId -> IO (Maybe OnionRoute))            -- ^ lookup OnionRoute by id
                -> IO ( ( TVar (ChaChaDRG, Data.Word64Map.Word64Map a)
@@ -361,7 +361,7 @@ newClient crypto store load lookupSender getRoute = do
                             }
             , tableMethods = transactionMethods'
                                 store
-                                (\x -> mapM_ (load x . snd))
+                                (\qid x -> mapM_ (load qid x . snd))
                                 (contramap (\(Nonce8 w64) -> w64) w64MapMethods)
                                 $ first (either error Nonce8 . decode) . randomBytesGenerate 8
             }