Stubs for maintaining onion routes.

1 files changed, 9 insertions, 5 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 3c5fc955..7814046e 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -93,6 +93,7 @@ import qualified Network.Tox.Onion.Transport as Onion
 import qualified Network.Tox.Onion.Handlers as Onion
 import Network.Tox.Crypto.Transport (NetCrypto)
 import Text.XXD
+import OnionRouter
 
 newCrypto :: IO TransportCrypto
 newCrypto = do
@@ -157,9 +158,10 @@ newClient :: (DRG g, Show addr, Show meth) =>
                 -> (x -> MessageClass String meth DHT.TransactionId)
                 -> (Maybe addr -> IO addr)
                 -> (meth -> Maybe (MethodHandler String DHT.TransactionId addr x))
+                -> (forall d. TransactionMethods d DHT.TransactionId x -> TransactionMethods d DHT.TransactionId x)
                 -> (Client String meth DHT.TransactionId addr x -> Transport String addr x -> Transport String addr x)
                 -> IO (Client String meth DHT.TransactionId addr x)
-newClient drg net classify selfAddr handlers modifynet = do
+newClient drg net classify selfAddr handlers modifytbl modifynet = do
     -- If we have 8-byte keys for IntMap, then use it for transaction lookups.
     -- Otherwise, use ordinary Map.  The details of which will be hidden by an
     -- existential closure (see mkclient below).
@@ -176,7 +178,7 @@ newClient drg net classify selfAddr handlers modifynet = do
     let dispatch tbl var handlers = DispatchMethods
                 { classifyInbound = classify
                 , lookupHandler = handlers -- var
-                , tableMethods = tbl
+                , tableMethods = modifytbl tbl
                 }
         mkclient (tbl,var) handlers =
             let client = Client
@@ -224,11 +226,12 @@ newTox keydb addr = do
     crypto <- newCrypto
     drg <- drgNew
     let lookupClose _ = return Nothing
-    (dhtcrypt,onioncrypt,cryptonet) <- toxTransport crypto lookupClose udp
-
     routing <- DHT.newRouting addr crypto updateIP updateIP
+
+    (dhtcrypt,onioncrypt,cryptonet) <- toxTransport crypto (DHT.orouter routing) lookupClose udp
+
     let dhtnet0 = layerTransport (DHT.decrypt crypto) (DHT.encrypt crypto) dhtcrypt
-    dhtclient <- newClient drg dhtnet0 DHT.classify (myAddr routing) (DHT.handlers routing)
+    dhtclient <- newClient drg dhtnet0 DHT.classify (myAddr routing) (DHT.handlers routing) id
                     $ \client net -> onInbound (DHT.updateRouting client routing) net
 
     toks <- do
@@ -242,6 +245,7 @@ newTox keydb addr = do
                                     (flip Onion.OnionDestination Nothing)
                            $ nodeInfo zeroID addr)
                     (Onion.handlers onionnet routing toks keydb)
+                    (hookQueries (DHT.orouter routing) DHT.transactionKey)
                     (const id)
     return Tox
         { toxDHT = dhtclient