From 68cf0f1981ef94ecd94a0f9c657aa132165f7ed0 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Tue, 28 Jan 2020 14:55:26 -0500 Subject: Show route on failure to send dht key. --- dht/ToxManager.hs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'dht/ToxManager.hs') 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 import qualified Network.Tox.Onion.Handlers as Tox import qualified Network.Tox.Onion.Transport as Tox ;import Network.Tox.Onion.Transport (OnionData (..)) -import Network.Tox.Onion.Routes (tcpKademliaClient,tcpBucketRefresher,tcpRelayPinger) +import Network.Tox.Onion.Routes (tcpKademliaClient,tcpBucketRefresher,tcpRelayPinger,resolveRouteFromNodeId,showRoute) import Network.Tox.RelayPinger import qualified Network.Tox.TCP as TCP import Presence @@ -663,10 +663,13 @@ startConnecting0 tx them contact reason = do ] sendMessage tr route (mypub,Tox.OnionDHTPublicKey dkey) `catchIOError` \e -> do + let or = toxOnionRoutes $ txTox tx + nid = nodeId $ Tox.rendezvousNode $ Tox.rendezvous route + (rid,r)<- resolveRouteFromNodeId or nid dput XMan $ unlines - [ "Error sharing DHTKey to " ++ show route + $ [ "Error sharing DHTKey via " ++ show rid ++ " to " ++ show route , " " ++ show e - ] + ] ++ maybe [] (showRoute " ") r forM_ soliciting $ \cksum@(NoSpam nospam _)-> do dput XMan $ unwords [ take 8 (show $ key2id theirkey) , show (nodeAddr $ Tox.rendezvousNode rendezvous) -- cgit v1.2.3