summaryrefslogtreecommitdiff
path: root/ToxManager.hs
diff options
context:
space:
mode:
authorJoe Crayne <joe@jerkface.net>2018-12-16 13:51:02 -0500
committerJoe Crayne <joe@jerkface.net>2018-12-16 14:08:27 -0500
commit688450c2d9998db7b4389dc9642d219774c23857 (patch)
tree69933330ad0baba2eb115d70d1e63cb085664ea1 /ToxManager.hs
parent8a72757ae66f6ec013b8f3443aea6f3266a2ab26 (diff)
More TCP work.
Diffstat (limited to 'ToxManager.hs')
-rw-r--r--ToxManager.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/ToxManager.hs b/ToxManager.hs
index 01403d9d..dceb9210 100644
--- a/ToxManager.hs
+++ b/ToxManager.hs
@@ -115,8 +115,8 @@ toxman ssvar announcer toxbkts tox presence = ToxManager
115 if not (Map.null rs) 115 if not (Map.null rs)
116 then return (acnt,Nothing) 116 then return (acnt,Nothing)
117 else return (acnt,Just $ \nid -> foldr interweave [] 117 else return (acnt,Just $ \nid -> foldr interweave []
118 . map (R.kclosest (searchSpace (toxQSearch tox)) 118 . map (R.kclosest (searchSpace $ toxQSearch tox)
119 searchK 119 (searchK $ toxQSearch tox)
120 nid) 120 nid)
121 <$> mapM (readTVar . snd) toxbkts) 121 <$> mapM (readTVar . snd) toxbkts)
122 122
@@ -575,7 +575,7 @@ nearNodes tox nid = do
575 bkts6 <- readTVar $ routing6 $ toxRouting tox 575 bkts6 <- readTVar $ routing6 $ toxRouting tox
576 let nss = 576 let nss =
577 map 577 map
578 (R.kclosest (searchSpace (toxQSearch tox)) searchK nid) 578 (R.kclosest (searchSpace $ toxQSearch tox) (searchK $ toxQSearch tox) nid)
579 [bkts4, bkts6] 579 [bkts4, bkts6]
580 return $ foldr interweave [] nss 580 return $ foldr interweave [] nss
581 581
@@ -591,7 +591,7 @@ startConnecting0 tx them contact reason = do
591 let nearNodes nid = do 591 let nearNodes nid = do
592 bkts4 <- readTVar $ routing4 $ toxRouting tox 592 bkts4 <- readTVar $ routing4 $ toxRouting tox
593 bkts6 <- readTVar $ routing6 $ toxRouting tox 593 bkts6 <- readTVar $ routing6 $ toxRouting tox
594 let nss = map (R.kclosest (searchSpace (toxQSearch tox)) searchK nid) 594 let nss = map (R.kclosest (searchSpace $ toxQSearch tox) (searchK $ toxQSearch tox) nid)
595 [bkts4,bkts6] 595 [bkts4,bkts6]
596 return $ foldr interweave [] nss 596 return $ foldr interweave [] nss
597 wanted <- atomically $ (==Just TryingToConnect) <$> readTVar (contactPolicy contact) 597 wanted <- atomically $ (==Just TryingToConnect) <$> readTVar (contactPolicy contact)