Use combined IPv6/IPv4 announce item for announcing toxid.

1 files changed, 4 insertions, 6 deletions

diff --git a/Announcer/Tox.hs b/Announcer/Tox.hs
index eab974bc..c9164d22 100644
--- a/Announcer/Tox.hs
+++ b/Announcer/Tox.hs
@@ -14,7 +14,6 @@ import Announcer
 import qualified Data.MinMaxPSQ as MM
 import Data.Wrapper.PSQ         as PSQ
 import InterruptibleDelay
-import Network.Kademlia.Routing as R
 import Network.Kademlia.Search
 
 import Control.Concurrent.Lifted.Instrument
@@ -68,9 +67,8 @@ data AnnounceMethod r = forall nid ni sr addr tok a.
                 --  [Right] The action requires a "token" from the destination
                 --  node.  This is the more typical "announce" semantics for
                 --  Kademlia.
-    , aBuckets  :: TVar (R.BucketList ni)
-                -- ^ Set this to the current Kademlia routing table buckets.
-                -- TODO: List of TVars to have separate routing tables for IPv6 and IPv4?
+    , aNearestNodes :: nid -> STM [ni]
+                -- ^ Method to obtain starting nodes from an iterative Kademlia search.
     , aTarget   :: nid
                 -- ^ This is the Kademlia node-id of the item being announced.
     , aInterval :: POSIXTime
@@ -118,7 +116,7 @@ reAnnounce checkFin announce interval = \announcer k now -> do
 
 -- | Schedule a recurring Search + Announce sequence.
 schedule :: Announcer -> AnnounceKey -> AnnounceMethod r -> r -> IO ()
-schedule announcer k AnnounceMethod{aSearch,aPublish,aBuckets,aTarget,aInterval} r = do
+schedule announcer k AnnounceMethod{aSearch,aPublish,aNearestNodes,aTarget,aInterval} r = do
     st <- atomically $ newSearch aSearch aTarget []
     ns <- atomically $ newTVar MM.empty
     let astate = AnnounceState st ns
@@ -156,7 +154,7 @@ schedule announcer k AnnounceMethod{aSearch,aPublish,aBuckets,aTarget,aInterval}
             isfin <- searchIsFinished st -- Always True, since we canceled.
             return $ when isfin $ void $ fork search
         search  = do -- thread to fork
-            atomically $ reset aBuckets aSearch aTarget st
+            atomically $ reset aNearestNodes aSearch aTarget st
             searchLoop aSearch aTarget onResult st
             fork $ do -- Announce to any nodes we haven't already announced to.
                 is <- atomically $ do