diff options
author | Joe Crayne <joe@jerkface.net> | 2020-01-14 03:36:33 -0500 |
---|---|---|
committer | Joe Crayne <joe@jerkface.net> | 2020-01-14 03:37:41 -0500 |
commit | 3197cc3d13f00c6f3cf1600b601007d737aea086 (patch) | |
tree | d27e5e695b12754eb1793bc8912334a7adb30ba8 | |
parent | f876f153013604d8af647541be58c59862a85ca7 (diff) |
Enable toxid search from TCP-only command-line.
-rw-r--r-- | dht/ToxManager.hs | 2 | ||||
-rw-r--r-- | 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 | |||
290 | Just contact -> do | 290 | Just contact -> do |
291 | established <- activeSesh tx theirKey | 291 | established <- activeSesh tx theirKey |
292 | runAction ann "connectViaRelay-print" $ do | 292 | runAction ann "connectViaRelay-print" $ do |
293 | dput XMan $ "connectViaRelay("++unpackAnnounceKey ann tkey++") " ++ show established | 293 | dput XMan $ "connectViaRelay("++unpackAnnounceKey ann tkey++") established=" ++ show established |
294 | return $ when (not established) go | 294 | return $ when (not established) go |
295 | -- $ scheduleImmediately ann tkey $ ScheduledItem go | 295 | -- $ scheduleImmediately ann tkey $ ScheduledItem go |
296 | -- return $ return () | 296 | -- 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 | |||
1473 | , showProgress = \(XMPPStatus stat) -> showProgress tcp stat | 1473 | , showProgress = \(XMPPStatus stat) -> showProgress tcp stat |
1474 | } | 1474 | } |
1475 | 1475 | ||
1476 | |||
1477 | initTox :: (IO () -> STM ()) | 1476 | initTox :: (IO () -> STM ()) |
1478 | -> Options | 1477 | -> Options |
1479 | -> TVar (Map.Map Uniq24 AggregateSession) | 1478 | -> TVar (Map.Map Uniq24 AggregateSession) |
@@ -1545,7 +1544,7 @@ initTox runio opts ssvar keysdb mbxmpp invc = case porttox opts of | |||
1545 | (Tox.AnnounceRequest zeros32 nid Tox.zeroID)) | 1544 | (Tox.AnnounceRequest zeros32 nid Tox.zeroID)) |
1546 | , qshowR = show -- Rendezvous | 1545 | , qshowR = show -- Rendezvous |
1547 | , qshowTok = Just . show -- Nonce32 | 1546 | , qshowTok = Just . show -- Nonce32 |
1548 | , qbootNodes = genericBootNodes (refreshBuckets toxBkts) q | 1547 | , qbootNodes = atomically . nearNodes tox -- genericBootNodes (refreshBuckets toxBkts) q |
1549 | }) | 1548 | }) |
1550 | ] | 1549 | ] |
1551 | , dhtParseId = readEither :: String -> Either String Tox.NodeId | 1550 | , dhtParseId = readEither :: String -> Either String Tox.NodeId |