summaryrefslogtreecommitdiff
path: root/src/Network/Tox
diff options
context:
space:
mode:
authorJoe Crayne <joe@jerkface.net>2019-01-16 22:53:41 -0500
committerJoe Crayne <joe@jerkface.net>2019-01-16 22:53:41 -0500
commit6ebe91b686ca8bef893f9a3dd704e45c04124b8f (patch)
treeaf27dcf06f07ddbbbbfc6073a0fdf60591fec90c /src/Network/Tox
parentb5df06bf0fed5a30a9b16e1032037e6cea378464 (diff)
kademlia: support for async search queries.
Diffstat (limited to 'src/Network/Tox')
-rw-r--r--src/Network/Tox/DHT/Handlers.hs4
-rw-r--r--src/Network/Tox/Onion/Handlers.hs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index afdf2cc3..abd607c3 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -194,7 +194,7 @@ newRouting addr crypto update4 update6 = do
194 nullSearch = Search 194 nullSearch = Search
195 { searchSpace = toxSpace 195 { searchSpace = toxSpace
196 , searchNodeAddress = nodeIP &&& nodePort 196 , searchNodeAddress = nodeIP &&& nodePort
197 , searchQuery = \_ _ -> return Nothing 197 , searchQuery = Left $ \_ _ -> return Nothing
198 , searchAlpha = 1 198 , searchAlpha = 1
199 , searchK = 2 199 , searchK = 2
200 } 200 }
@@ -525,7 +525,7 @@ nodeSearch :: Client -> TVar (HashMap NodeId [NodeInfoCallback]) -> Search NodeI
525nodeSearch client cbvar = Search 525nodeSearch client cbvar = Search
526 { searchSpace = toxSpace 526 { searchSpace = toxSpace
527 , searchNodeAddress = nodeIP &&& nodePort 527 , searchNodeAddress = nodeIP &&& nodePort
528 , searchQuery = getNodes client cbvar 528 , searchQuery = Left $ getNodes client cbvar
529 , searchAlpha = 8 529 , searchAlpha = 8
530 , searchK = 16 530 , searchK = 16
531 531
diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs
index 52cc298d..edbbbb49 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/src/Network/Tox/Onion/Handlers.hs
@@ -218,7 +218,7 @@ toxidSearch :: (TransactionId -> OnionDestination r -> STM (OnionDestination r,
218toxidSearch getTimeout crypto client = Search 218toxidSearch getTimeout crypto client = Search
219 { searchSpace = toxSpace 219 { searchSpace = toxSpace
220 , searchNodeAddress = nodeIP &&& nodePort 220 , searchNodeAddress = nodeIP &&& nodePort
221 , searchQuery = getRendezvous getTimeout crypto client 221 , searchQuery = Left $ getRendezvous getTimeout crypto client
222 , searchAlpha = 3 222 , searchAlpha = 3
223 , searchK = 6 223 , searchK = 6
224 } 224 }