diff options
Diffstat (limited to 'dht/src/Network/Tox.hs')
-rw-r--r-- | dht/src/Network/Tox.hs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/dht/src/Network/Tox.hs b/dht/src/Network/Tox.hs index 6adfb9a9..084a9978 100644 --- a/dht/src/Network/Tox.hs +++ b/dht/src/Network/Tox.hs | |||
@@ -174,7 +174,6 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do | |||
174 | , lookupHandler = handlers -- var | 174 | , lookupHandler = handlers -- var |
175 | , tableMethods = modifytbl tbl | 175 | , tableMethods = modifytbl tbl |
176 | } | 176 | } |
177 | eprinter = logErrors -- printErrors stderr | ||
178 | mkclient :: (TransactionMethods | 177 | mkclient :: (TransactionMethods |
179 | (g, pending) DHT.TransactionId addr x, | 178 | (g, pending) DHT.TransactionId addr x, |
180 | TVar (g, pending)) | 179 | TVar (g, pending)) |
@@ -184,9 +183,9 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do | |||
184 | -> ClientA String meth DHT.TransactionId addr x x | 183 | -> ClientA String meth DHT.TransactionId addr x x |
185 | mkclient (tbl,var) handlers = | 184 | mkclient (tbl,var) handlers = |
186 | let client = Client | 185 | let client = Client |
187 | { clientNet = addHandler (reportParseError eprinter) (handleMessage client) $ modifynet client net | 186 | { clientNet = addHandler (handleMessage client) $ modifynet client net |
188 | , clientDispatcher = dispatch tbl var (handlers client) client | 187 | , clientDispatcher = dispatch tbl var (handlers client) client |
189 | , clientErrorReporter = eprinter | 188 | , clientErrorReporter = logErrors |
190 | , clientPending = var | 189 | , clientPending = var |
191 | , clientAddress = selfAddr | 190 | , clientAddress = selfAddr |
192 | , clientResponseId = genNonce24 var | 191 | , clientResponseId = genNonce24 var |
@@ -412,8 +411,8 @@ newToxOverTransport keydb addr onNewSession (crypto,roster) udp tcp = do | |||
412 | { toxDHT = dhtclient | 411 | { toxDHT = dhtclient |
413 | , toxOnion = onionclient | 412 | , toxOnion = onionclient |
414 | , toxToRoute = onInbound (updateContactInfo roster) dtacrypt | 413 | , toxToRoute = onInbound (updateContactInfo roster) dtacrypt |
415 | , toxCrypto = addHandler (dput XMisc) (sessionHandler sessions) cryptonet | 414 | , toxCrypto = addHandler (sessionHandler sessions) cryptonet |
416 | , toxHandshakes = addHandler (dput XMisc) (handshakeH sparams) handshakes | 415 | , toxHandshakes = addHandler (handshakeH sparams) handshakes |
417 | , toxHandshakeCache = hscache | 416 | , toxHandshakeCache = hscache |
418 | , toxCryptoKeys = crypto | 417 | , toxCryptoKeys = crypto |
419 | , toxRouting = mkrouting dhtclient | 418 | , toxRouting = mkrouting dhtclient |
@@ -467,13 +466,13 @@ forkTox :: Tox extra | |||
467 | -> Bool -- tcp | 466 | -> Bool -- tcp |
468 | -> IO (IO (), [NodeInfo] -> [NodeInfo] -> IO (), [NodeInfo] -> [NodeInfo] -> IO ()) | 467 | -> IO (IO (), [NodeInfo] -> [NodeInfo] -> IO (), [NodeInfo] -> [NodeInfo] -> IO ()) |
469 | forkTox tox with_avahi with_tcp = do | 468 | forkTox tox with_avahi with_tcp = do |
470 | quitHs <- forkListener "toxHandshakes" (toxHandshakes tox) | 469 | quitHs <- forkListener "toxHandshakes" (dput XMan . mappend "hs-parse: ") (toxHandshakes tox) |
471 | quitToRoute <- forkListener "toxToRoute" (toxToRoute tox) | 470 | quitToRoute <- forkListener "toxToRoute" (dput XOnion . mappend "dta-parse: ") (toxToRoute tox) |
472 | quitOnion <- forkListener "toxOnion" (clientNet $ toxOnion tox) | 471 | quitOnion <- forkListener "toxOnion" (dput XOnion . mappend "onion-parse: ") (clientNet $ toxOnion tox) |
473 | quitDHT <- forkListener "toxDHT" (clientNet $ toxDHT tox) | 472 | quitDHT <- forkListener "toxDHT" (dput XDHT . mappend "dht-parse: ") (clientNet $ toxDHT tox) |
474 | quitNC <- forkListener "toxCrypto" (toxCrypto tox) | 473 | quitNC <- forkListener "toxCrypto" (dput XNetCrypto . mappend "nc-parse: ") (toxCrypto tox) |
475 | quitTCP <- if with_tcp | 474 | quitTCP <- if with_tcp |
476 | then forkListener "relay-client" (clientNet $ tcpClient $ tcpKademliaClient $ toxOnionRoutes tox) | 475 | then forkListener "relay-client" (dput XTCP . mappend "tcp-parse: ") (clientNet $ tcpClient $ tcpKademliaClient $ toxOnionRoutes tox) |
477 | else return $ return () | 476 | else return $ return () |
478 | refresher4 <- forkPollForRefresh (DHT.refresher4 $ toxRouting tox) | 477 | refresher4 <- forkPollForRefresh (DHT.refresher4 $ toxRouting tox) |
479 | refresher6 <- forkPollForRefresh (DHT.refresher6 $ toxRouting tox) | 478 | refresher6 <- forkPollForRefresh (DHT.refresher6 $ toxRouting tox) |