From 3197cc3d13f00c6f3cf1600b601007d737aea086 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Tue, 14 Jan 2020 03:36:33 -0500 Subject: Enable toxid search from TCP-only command-line. --- dht/ToxManager.hs | 2 +- dht/examples/dhtd.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dht/ToxManager.hs b/dht/ToxManager.hs index dd8f5940..733a0cdc 100644 --- a/dht/ToxManager.hs +++ b/dht/ToxManager.hs @@ -290,7 +290,7 @@ connectViaRelay tx theirKey theirDhtKey ann tkey now = do Just contact -> do established <- activeSesh tx theirKey runAction ann "connectViaRelay-print" $ do - dput XMan $ "connectViaRelay("++unpackAnnounceKey ann tkey++") " ++ show established + dput XMan $ "connectViaRelay("++unpackAnnounceKey ann tkey++") established=" ++ show established return $ when (not established) go -- $ scheduleImmediately ann tkey $ ScheduledItem go -- return $ return () diff --git a/dht/examples/dhtd.hs b/dht/examples/dhtd.hs index 3095e7b4..5bf9296e 100644 --- a/dht/examples/dhtd.hs +++ b/dht/examples/dhtd.hs @@ -1473,7 +1473,6 @@ selectManager announcer mtman tcp profile = case stripSuffix ".tox" profile of , showProgress = \(XMPPStatus stat) -> showProgress tcp stat } - initTox :: (IO () -> STM ()) -> Options -> TVar (Map.Map Uniq24 AggregateSession) @@ -1545,7 +1544,7 @@ initTox runio opts ssvar keysdb mbxmpp invc = case porttox opts of (Tox.AnnounceRequest zeros32 nid Tox.zeroID)) , qshowR = show -- Rendezvous , qshowTok = Just . show -- Nonce32 - , qbootNodes = genericBootNodes (refreshBuckets toxBkts) q + , qbootNodes = atomically . nearNodes tox -- genericBootNodes (refreshBuckets toxBkts) q }) ] , dhtParseId = readEither :: String -> Either String Tox.NodeId -- cgit v1.2.3