ToxManager simplification.

2 files changed, 13 insertions, 32 deletions

diff --git a/dht/ToxManager.hs b/dht/ToxManager.hs
index 34cdcb6f..403167c2 100644
--- a/dht/ToxManager.hs
+++ b/dht/ToxManager.hs
@@ -100,11 +100,10 @@ stringToKey_ s = let (xs,ys) = break (==':') s
 -- XMPP roster.
 toxman :: TVar (Map.Map Uniq24 AggregateSession)
             -> Announcer
-            -> [(String,TVar (BucketList Tox.NodeInfo))]
             -> Tox.Tox JabberClients
             -> PresenceState Pending
             -> ToxManager ClientAddress
-toxman ssvar announcer toxbkts tox presence = ToxManager
+toxman ssvar announcer tox presence = ToxManager
     { activateAccount        = \k pubname seckey -> do
         dput XMan $ "toxman ACTIVATE " ++ show (Tox.key2id $ toPublic seckey)
         let ContactInfo{ accounts } = Tox.toxContactInfo tox
@@ -119,12 +118,7 @@ toxman ssvar announcer toxbkts tox presence = ToxManager
             modifyTVar accounts (HashMap.insert pubid acnt)
             if not (Map.null rs)
                 then return (acnt,Nothing)
-                else return (acnt,Just $ \nid -> foldr interweave []
-                                                 . map (R.kclosest (searchSpace $ toxQSearch tox)
-                                                                   (searchK $ toxQSearch tox)
-                                                                   nid)
-                                                 <$> mapM (readTVar . snd) toxbkts)
-
+                else return (acnt,Just $ \nid -> nearNodes tox nid)
         forM_ newlyActive $ \nearNodes -> do
             -- Schedule recurring announce.
             --
@@ -160,19 +154,18 @@ toxman ssvar announcer toxbkts tox presence = ToxManager
                 -- account active.
                 modifyTVar' (accountExtra acnt) $ Map.delete k
             return rs
-        if (Map.null $ Map.delete k refs) then do
-            let akey = akeyAccountActive announcer pubid
-            fmap Just $ forM toxbkts $ \(nm,bkts) -> do
-                return (akey,bkts)
-        else return Nothing
-       forM_ bStopped $ \kbkts -> do
+        return $
+            if (Map.null $ Map.delete k refs) then
+                let akey = akeyAccountActive announcer pubid
+                in Just akey
+            else Nothing
+       forM_ bStopped $ \akey -> do
            let Just pubid = mpubid
                pub        = Tox.id2key pubid
            -- Stop the announce-toxid task for this account.  Note that other
            -- announced tasks will be stopped by the forkAccountWatcher thread
            -- when it terminates.
-           forM_ kbkts $ \(akey,bkts) -> do
-                cancel announcer akey
+           cancel announcer akey
 
     , toxConnections = Manager
      { setPolicy = \(ToxContact meid themid) p -> do
@@ -615,12 +608,6 @@ startConnecting0 tx them contact reason = do
         let ToxToXMPP { txTox       = tox
                       , txAnnouncer = announcer
                       , txAccount   = acnt     } = tx
-        let nearNodes nid = do
-                bkts4 <- readTVar $ routing4 $ toxRouting tox
-                bkts6 <- readTVar $ routing6 $ toxRouting tox
-                let nss = map (R.kclosest (searchSpace $ toxQSearch tox) (searchK $ toxQSearch tox) nid)
-                              [bkts4,bkts6]
-                return $ foldr interweave [] nss
         wanted <- atomically $ (==Just TryingToConnect) <$> readTVar (contactPolicy contact)
         let mypub = toPublic $ userSecret acnt
             me  = key2id mypub
@@ -641,7 +628,7 @@ startConnecting0 tx them contact reason = do
                     -- likelihood of failure as the chances of packet loss
                     -- happening to all (up to to 8) packets sent is low.
                     --
-            let meth = SearchMethod (toxQSearch tox) onResult nearNodes (key2id them) 30
+            let meth = SearchMethod (toxQSearch tox) onResult (nearNodes tox) (key2id them) 30
                  where
                   onResult theirkey rendezvous = do
                     dkey <- Tox.getContactInfo tox
diff --git a/dht/examples/dhtd.hs b/dht/examples/dhtd.hs
index 96f0cb72..35b0d07b 100644
--- a/dht/examples/dhtd.hs
+++ b/dht/examples/dhtd.hs
@@ -1660,14 +1660,13 @@ initJabber :: Options
               -> TVar (Map.Map Uniq24 AggregateSession)
               -> Announcer
               -> Maybe (Tox.Tox JabberClients)
-              -> Map.Map String DHT
               -> MUC
               -> IO ( Maybe XMPPServer
                     , Maybe ConnectionManager -- (Manager (Either Pending TCPStatus) (Either T.Text T.Text))
                     , Maybe (PresenceState Pending)
                     , IO () -- quit chat thread
                     )
-initJabber opts ssvar announcer mbtox toxdhts toxchat = case portxmpp opts of
+initJabber opts ssvar announcer mbtox toxchat = case portxmpp opts of
         "" -> return (Nothing,Nothing,Nothing,return())
         p  -> do
             cport <- getBindAddress p True{-IPv6 supported-}
@@ -1681,14 +1680,9 @@ initJabber opts ssvar announcer mbtox toxdhts toxchat = case portxmpp opts of
                 lookupBkts name m = case Map.lookup name m of
                     Nothing              -> Nothing
                     Just DHT{dhtBuckets} -> cast (name, dhtBuckets)
-            let toxbkts = catMaybes
-                            [ lookupBkts "tox4" toxdhts
-                            , lookupBkts "tox6" toxdhts
-                            ]
-
             sv <- xmppServer Tcp.noCleanUp (Just sport)
             tcp <- xmppConnections sv -- :: IO ( Manager TCPStatus T.Text )
-            let tman = toxman ssvar announcer toxbkts <$> mbtox
+            let tman = toxman ssvar announcer <$> mbtox
             state     <- newPresenceState cw tman sv (selectManager tman tcp)
             chat <- atomically newMUC
             quitChatService <- forkLocalChat chat
@@ -1823,7 +1817,7 @@ main = do
 
         (mbtox,quitTox,toxdhts,toxips,(taddrs::[SockAddr])) <- initTox opts ssvar keysdb msv invc
 
-        (msv,mconns,mstate,quitChat) <- initJabber opts ssvar announcer mbtox toxdhts toxchat
+        (msv,mconns,mstate,quitChat) <- initJabber opts ssvar announcer mbtox toxchat
 
         return (mbtox,quitTox >> quitChat,toxdhts,toxips,(taddrs::[SockAddr]),msv,mconns,mstate)