1 files changed, 5 insertions, 5 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index d434360f..d5db6979 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -174,7 +174,7 @@ myAddr routing maddr = atomically $ do
 
 newClient :: (DRG g, Show addr, Show meth) =>
               g -> Transport String addr x
-                -> (x -> MessageClass String meth DHT.TransactionId)
+                -> (Client String meth DHT.TransactionId addr x -> x -> MessageClass String meth DHT.TransactionId addr x)
                 -> (Maybe addr -> IO addr)
                 -> (meth -> Maybe (MethodHandler String DHT.TransactionId addr x))
                 -> (forall d. TransactionMethods d DHT.TransactionId addr x -> TransactionMethods d DHT.TransactionId addr x)
@@ -195,8 +195,8 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
             let word64mapT = transactionMethods (contramap w64Key w64MapMethods) gen
             map_var <- atomically $ newTVar (drg, Data.Word64Map.empty)
             return $ Left (word64mapT,map_var)
-    let dispatch tbl var handlers = DispatchMethods
-                { classifyInbound = classify
+    let dispatch tbl var handlers client = DispatchMethods
+                { classifyInbound = classify client
                 , lookupHandler = handlers -- var
                 , tableMethods = modifytbl tbl
                 }
@@ -204,7 +204,7 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
         mkclient (tbl,var) handlers =
             let client = Client
                     { clientNet           = addHandler eprinter (handleMessage client) $ modifynet client net
-                    , clientDispatcher    = dispatch tbl var handlers
+                    , clientDispatcher    = dispatch tbl var handlers client
                     , clientErrorReporter = eprinter { reportTimeout = reportTimeout ignoreErrors }
                     , clientPending       = var
                     , clientAddress       = selfAddr
@@ -301,7 +301,7 @@ newTox keydb addr = do
         atomically $ newTVar nil { maxInterval = 20 } -- 20 second timeout on announce ping-ids.
     oniondrg <- drgNew
     let onionnet = layerTransportM (Onion.decrypt crypto) (Onion.encrypt crypto) onioncrypt
-    onionclient <- newClient oniondrg onionnet Onion.classify
+    onionclient <- newClient oniondrg onionnet (const Onion.classify)
                     (getOnionAlias crypto $ R.thisNode <$> readTVar (DHT.routing4 routing))
                     (Onion.handlers onionnet routing toks keydb)
                     (hookQueries orouter DHT.transactionKey)