1 files changed, 7 insertions, 7 deletions

diff --git a/OnionRouter.hs b/OnionRouter.hs
index 55a08d48..57c8ba35 100644
--- a/OnionRouter.hs
+++ b/OnionRouter.hs
@@ -155,8 +155,8 @@ newOnionRouter :: TransportCrypto
                     -> (String -> IO ())
                     -> IO ( OnionRouter
                           , TVar ( ChaChaDRG
-                                 , Word64Map (Either (MVar (Bool,TCP.RelayPacket))
-                                                     (MVar (OnionMessage Identity)))))
+                                 , Word64Map (Either (Maybe (Bool,TCP.RelayPacket) -> IO ())
+                                                     (Maybe (OnionMessage Identity) -> IO ()))))
 newOnionRouter crypto perror = do
     drg0 <- drgNew
     (rlog,pq,rm) <- atomically $ do
@@ -166,7 +166,7 @@ newOnionRouter crypto perror = do
         return (rlog,pq,rm)
     ((tbl,(tcptbl,tcpcons)),tcp) <- do
         (tcptbl, client) <- TCP.newClient crypto Left $ \case
-            Left v  -> void . tryPutMVar v . (,) False
+            Left v  -> void . v . Just . (,) False
             Right v -> \case
                 TCP.OnionPacketResponse x@(OnionAnnounceResponse n8 n24 _) -> do
                     mod <- lookupSender' pq rlog localhost4 n8
@@ -181,7 +181,7 @@ newOnionRouter crypto perror = do
                                               atomically $ do
                                                 modifyTVar' pq (W64.delete w8)
                                                 modifyArray rm (fmap gotResponse) rid
-                                              void $ tryPutMVar v y
+                                              void $ v $ Just y
                             _           -> return ()
                 x -> perror $ "Unexpected TCP query result: " ++ show x
 
@@ -578,7 +578,7 @@ hookQueries :: OnionRouter -> (tid -> Nonce8)
                            -> TransactionMethods d tid (OnionDestination RouteId) x
                            -> TransactionMethods d tid (OnionDestination RouteId) x
 hookQueries or t8 tmethods = TransactionMethods
-    { dispatchRegister = \mvar od d -> {-# SCC "hookQ.dispatchRegister" #-} do --  :: MVar x -> d -> STM (tid, d)
+    { dispatchRegister = \getTimeout now mvar od d -> {-# SCC "hookQ.dispatchRegister" #-} do --  :: MVar x -> d -> STM (tid, d)
         let ni = onionNodeInfo od
             rid@(RouteId ridn) = fromMaybe (routeId (nodeId ni)) $ onionRouteSpec od
         wanted <- {-# SCC "hookQ.wanted" #-} (readArray (pendingRoutes or) ridn)
@@ -587,7 +587,7 @@ hookQueries or t8 tmethods = TransactionMethods
         check $ fromMaybe False $ do
             RouteRecord{routeVersion=rv} <- {-# SCC "hookQ.mr" #-} mr
             return $ wanted <= rv
-        (tid,d') <- dispatchRegister tmethods mvar od d
+        ((tid,a,expiry),d') <- dispatchRegister tmethods getTimeout now mvar od d
         let Nonce8 w8 = t8 tid
             od' = case od of
                 OnionDestination {} -> od { onionRouteSpec = Just rid }
@@ -599,7 +599,7 @@ hookQueries or t8 tmethods = TransactionMethods
         -- check $ W64.size pqs < 20
         modifyTVar' (pendingQueries or) (W64.insert w8 pq)
         writeTChan (routeLog or) $ "ONION query add " ++ unwords [ show (Just $ pendingVersion pq,w8), ":=", show ni ]
-        return (tid,d')
+        return ((tid,a,expiry),d')
     , dispatchResponse = \tid x d -> {-# SCC "hookQ.dispatchResponse" #-} do -- :: tid -> x -> d -> STM (d, IO ())
         let Nonce8 w8 = t8 tid
         mb <- W64.lookup w8 <$> readTVar (pendingQueries or)