Partitioned friend-request transport from the onion transport.

1 files changed, 20 insertions, 10 deletions

diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs
index 167df336..439de709 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/src/Network/Tox/Onion/Handlers.hs
@@ -130,7 +130,7 @@ toOnionDestination :: AnnouncedRoute -> OnionDestination r
 toOnionDestination (AnnouncedRoute ni rpath) = OnionToOwner ni rpath
 
 data AnnouncedKeys = AnnouncedKeys
-    { keyByAge :: !(PSQ NodeId (Down POSIXTime)) -- timeout of 300 seconds
+    { keyByAge :: !(PSQ NodeId (Down POSIXTime)) -- TODO: timeout of 300 seconds
     , keyAssoc :: !(MinMaxPSQ' NodeId NodeDistance (Int,AnnouncedRoute))
     }
 
@@ -160,15 +160,6 @@ handlers net routing toks keydb AnnounceType
 handlers net _ _ keydb _ = Just $ NoReply Right $ dataToRouteH keydb net
 
 
-data Rendezvous = Rendezvous
-    { rendezvousKey :: PublicKey
-    , rendezvousNode :: NodeInfo
-    }
- deriving Eq
-
-instance Show Rendezvous where
-    show (Rendezvous k ni) = concat [show $ key2id k, ":", show ni]
-
 toxidSearch :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
                -> Client r
                -> Search NodeId (IP, PortNumber) (Maybe Nonce32) NodeInfo Rendezvous
@@ -211,6 +202,25 @@ unwrapAnnounceResponse ni (AnnounceResponse is_stored (SendNodes ns))
         SendBackKey k    -> (ns, [Rendezvous k ni], Nothing)
         Acknowledged n32 -> (ns, [],  Just n32)
 
+-- TODO Announce key to announce peers.
+--
+--   Announce Peers are only put in the 8 closest peers array if they respond
+--   to an announce request. If the peers fail to respond to 3 announce
+--   requests they are deemed timed out and removed.
+--
+--   ...
+--
+--   For this reason, after the peer is announced successfully for 17 seconds,
+--   announce packets are sent aggressively every 3 seconds to each known close
+--   peer (in the list of 8 peers) to search aggressively for peers that know
+--   the peer we are searching for.
+
+-- TODO
+-- If toxcore goes offline (no onion traffic for 20 seconds) toxcore will
+-- aggressively reannounce itself and search for friends as if it was just
+-- started.
+
+
 announce :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
             -> Client r
             -> NodeId