summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Crayne <joe@jerkface.net>2018-12-15 16:00:29 -0500
committerJoe Crayne <joe@jerkface.net>2018-12-16 14:08:27 -0500
commit8a72757ae66f6ec013b8f3443aea6f3266a2ab26 (patch)
treef9cd7a42b40e78ad01d4aef29ee734cf6ea61087
parent929ad70bb8ba771b7a684c824f391c679aed6071 (diff)
Re-added eroneously removed onion query handling.
-rw-r--r--src/Network/Tox.hs9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 6e2a42c5..d0304170 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -257,15 +257,18 @@ newOnionClient :: DRG g =>
257 DHT.TransactionId 257 DHT.TransactionId
258 (Onion.OnionDestination RouteId) 258 (Onion.OnionDestination RouteId)
259 Onion.Message 259 Onion.Message
260newOnionClient crypto net r toks keydb orouter map_var store load = Client 260newOnionClient crypto net r toks keydb orouter map_var store load = c
261 { clientNet = net 261 where
262 eprinter = logErrors
263 c = Client
264 { clientNet = addHandler (reportParseError eprinter) (handleMessage c) net
262 , clientDispatcher = DispatchMethods 265 , clientDispatcher = DispatchMethods
263 { classifyInbound = Onion.classify 266 { classifyInbound = Onion.classify
264 , lookupHandler = Onion.handlers net r toks keydb 267 , lookupHandler = Onion.handlers net r toks keydb
265 , tableMethods = hookQueries orouter DHT.transactionKey 268 , tableMethods = hookQueries orouter DHT.transactionKey
266 $ transactionMethods' store load (contramap w64Key w64MapMethods) gen 269 $ transactionMethods' store load (contramap w64Key w64MapMethods) gen
267 } 270 }
268 , clientErrorReporter = logErrors { reportTimeout = reportTimeout ignoreErrors } 271 , clientErrorReporter = eprinter { reportTimeout = reportTimeout ignoreErrors }
269 , clientPending = map_var 272 , clientPending = map_var
270 , clientAddress = getOnionAlias crypto $ R.thisNode <$> readTVar (DHT.routing4 r) 273 , clientAddress = getOnionAlias crypto $ R.thisNode <$> readTVar (DHT.routing4 r)
271 , clientResponseId = genNonce24 map_var 274 , clientResponseId = genNonce24 map_var