summaryrefslogtreecommitdiff
path: root/dht/ToxManager.hs
diff options
context:
space:
mode:
Diffstat (limited to 'dht/ToxManager.hs')
-rw-r--r--dht/ToxManager.hs9
1 files changed, 6 insertions, 3 deletions
diff --git a/dht/ToxManager.hs b/dht/ToxManager.hs
index 545dbd6c..c0717083 100644
--- a/dht/ToxManager.hs
+++ b/dht/ToxManager.hs
@@ -52,7 +52,7 @@ import Network.Tox.NodeId
52import qualified Network.Tox.Onion.Handlers as Tox 52import qualified Network.Tox.Onion.Handlers as Tox
53import qualified Network.Tox.Onion.Transport as Tox 53import qualified Network.Tox.Onion.Transport as Tox
54 ;import Network.Tox.Onion.Transport (OnionData (..)) 54 ;import Network.Tox.Onion.Transport (OnionData (..))
55import Network.Tox.Onion.Routes (tcpKademliaClient,tcpBucketRefresher,tcpRelayPinger) 55import Network.Tox.Onion.Routes (tcpKademliaClient,tcpBucketRefresher,tcpRelayPinger,resolveRouteFromNodeId,showRoute)
56import Network.Tox.RelayPinger 56import Network.Tox.RelayPinger
57import qualified Network.Tox.TCP as TCP 57import qualified Network.Tox.TCP as TCP
58import Presence 58import Presence
@@ -663,10 +663,13 @@ startConnecting0 tx them contact reason = do
663 ] 663 ]
664 sendMessage tr route (mypub,Tox.OnionDHTPublicKey dkey) 664 sendMessage tr route (mypub,Tox.OnionDHTPublicKey dkey)
665 `catchIOError` \e -> do 665 `catchIOError` \e -> do
666 let or = toxOnionRoutes $ txTox tx
667 nid = nodeId $ Tox.rendezvousNode $ Tox.rendezvous route
668 (rid,r)<- resolveRouteFromNodeId or nid
666 dput XMan $ unlines 669 dput XMan $ unlines
667 [ "Error sharing DHTKey to " ++ show route 670 $ [ "Error sharing DHTKey via " ++ show rid ++ " to " ++ show route
668 , " " ++ show e 671 , " " ++ show e
669 ] 672 ] ++ maybe [] (showRoute " ") r
670 forM_ soliciting $ \cksum@(NoSpam nospam _)-> do 673 forM_ soliciting $ \cksum@(NoSpam nospam _)-> do
671 dput XMan $ unwords [ take 8 (show $ key2id theirkey) 674 dput XMan $ unwords [ take 8 (show $ key2id theirkey)
672 , show (nodeAddr $ Tox.rendezvousNode rendezvous) 675 , show (nodeAddr $ Tox.rendezvousNode rendezvous)