WIP: connection-related scheduled announce items.

2 files changed, 19 insertions, 9 deletions

diff --git a/ToxToXMPP.hs b/ToxToXMPP.hs
index ad5cb0dd..d6a31f1e 100644
--- a/ToxToXMPP.hs
+++ b/ToxToXMPP.hs
@@ -100,11 +100,13 @@ key2jid nospam key = T.pack $ show $ NoSpamId nsp key
     nlo = fromIntegral (0x0FFFF .&. nospam) :: Word16
     nhi = fromIntegral (0x0FFFF .&. (nospam `shiftR` 16)) :: Word16
 
-dispatch :: Account -> PresenceState -> ContactEvent -> IO ()
-dispatch acnt st (AddrChange   theirkey saddr)                    = return () -- todo
-dispatch acnt st (PolicyChange theirkey policy                  ) = return () -- todo
-dispatch acnt st (OnionRouted  theirkey (OnionDHTPublicKey pkey)) = return () -- todo
-dispatch acnt st (OnionRouted  theirkey (OnionFriendRequest fr) ) = do
+dispatch :: Announcer -> Account -> PresenceState -> ContactEvent -> IO ()
+dispatch acr acnt st (SessionEstablished theirKey) = return ()
+dispatch acr acnt st (SessionTerminated theirKey)  = return ()
+dispatch acr acnt st (AddrChange   theirkey saddr)                    = return () -- todo
+dispatch acr acnt st (PolicyChange theirkey policy                  ) = return () -- todo
+dispatch acr acnt st (OnionRouted  theirkey (OnionDHTPublicKey pkey)) = return () -- todo
+dispatch acr acnt st (OnionRouted  theirkey (OnionFriendRequest fr) ) = do
     k2c <- atomically $ do
         refs <- readTVar (clientRefs acnt)
         k2c <- Map.filterWithKey (\k _ -> k `Set.member` refs) <$> readTVar (keyToChan st)
@@ -127,6 +129,10 @@ interweave :: [a] -> [a] -> [a]
 interweave []     ys = ys
 interweave (x:xs) ys = x : interweave ys xs
 
+akeyDHTKeyShare announcer me them = atomically $ do
+    packAnnounceKey announcer $ "dhtkey:" ++ (take 8 $ show me) ++ ":" ++ show them
+akeyConnect announcer me them = atomically $ do
+    packAnnounceKey announcer $ "connect:" ++ (take 8 $ show me) ++ ":" ++ show them
 
 forkAccountWatcher :: Account -> Tox -> PresenceState -> Announcer -> IO ThreadId
 forkAccountWatcher acc tox st announcer = forkIO $ do
@@ -150,7 +156,8 @@ forkAccountWatcher acc tox st announcer = forkIO $ do
         wanted <- atomically $ (==Just TryingToConnect) <$> readTVar contactPolicy
         when wanted $ do
             let pub = toPublic $ userSecret acc
-            akey <- atomically $ packAnnounceKey announcer $ "dhtkey:" ++ show them
+                me  = key2id pub
+            akey <- akeyDHTKeyShare announcer me them
                     -- We send this packet every 30 seconds if there is more
                     -- than one peer (in the 8) that says they our friend is
                     -- announced on them. This packet can also be sent through
@@ -165,6 +172,7 @@ forkAccountWatcher acc tox st announcer = forkIO $ do
                     -- likelihood of failure as the chances of packet loss
                     -- happening to all (up to to 8) packets sent is low.
                     --
+            -- TODO: Reschedule this as appropriate within 'dispatch' function.
             scheduleSearch announcer
                      akey
                      (SearchMethod   (toxQSearch tox)
@@ -189,7 +197,7 @@ forkAccountWatcher acc tox st announcer = forkIO $ do
                 refs <- readTVar $ clientRefs acc
                 check $ Set.null refs
                 return Nothing
-    forM_ mev $ \ev -> dispatch acc st ev >> loop
+    forM_ mev $ \ev -> dispatch announcer acc st ev >> loop
 
 toxQSearch :: Tox.Tox -> Search Tox.NodeId (IP, PortNumber) Nonce32 Tox.NodeInfo Tox.Rendezvous
 toxQSearch tox = Tox.toxidSearch (Tox.onionTimeout tox) (Tox.toxCryptoKeys tox) (Tox.toxOnion tox)
@@ -197,3 +205,5 @@ toxQSearch tox = Tox.toxidSearch (Tox.onionTimeout tox) (Tox.toxCryptoKeys tox)
 toxAnnounceInterval :: POSIXTime
 toxAnnounceInterval = 15
 
+
+
diff --git a/conn-notes.txt b/conn-notes.txt
index c1bbed00..257987d1 100644
--- a/conn-notes.txt
+++ b/conn-notes.txt
@@ -51,14 +51,14 @@ will be scheduled:
                 This task searches for our own user key, and publishes itself
                 at rendezvous nodes.
 
-        dhtkey:DdhbLjiwaV0GAiGKgesNPbvj2TbhrBHEWEEc5icfvQN
+        dhtkey:OrjBG.Gy:DdhbLjiwaV0GAiGKgesNPbvj2TbhrBHEWEEc5icfvQN
 
                 This task searches for our contact's user key and uses the
                 rendezvous nodes that it finds in order to share our dhtkey
                 with our contact.
 
 
-        connect:DdhbLjiwaV0GAiGKgesNPbvj2TbhrBHEWEEc5icfvQN
+        connect:OrjBG.Gy:DdhbLjiwaV0GAiGKgesNPbvj2TbhrBHEWEEc5icfvQN
 
                 Depending on whether or not the ip/port is "fresh", this task
                 has two modes only one of which is active at a time: