14 files changed, 91 insertions, 46 deletions

diff --git a/Connection.hs b/Connection.hs
index 7228a0e4..58b4f4e5 100644
--- a/Connection.hs
+++ b/Connection.hs
@@ -13,7 +13,7 @@ data Status status
     = Dormant
     | InProgress status
     | Established
- deriving (Eq,Ord,Functor)
+ deriving (Show,Eq,Ord,Functor)
 
 data Policy
     = RefusingToConnect
diff --git a/bittorrent/src/Network/BitTorrent/Tracker.hs b/bittorrent/src/Network/BitTorrent/Tracker.hs
index 6db67559..1191f921 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker.hs
@@ -23,6 +23,7 @@ module Network.BitTorrent.Tracker
        , trackerList
        , Session
        , Event (..)
+       , trackers
        , newSession
        , closeSession
        , withSession
diff --git a/bittorrent/src/Network/BitTorrent/Tracker/List.hs b/bittorrent/src/Network/BitTorrent/Tracker/List.hs
index 0eb11641..1507b4be 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker/List.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker/List.hs
@@ -16,6 +16,7 @@ module Network.BitTorrent.Tracker.List
        , TrackerList
 
          -- * Construction
+       , trackers
        , trackerList
        , shuffleTiers
        , mapWithURI
@@ -116,6 +117,9 @@ fixList mxss mx = do
   let xss' = L.filter (not . L.null) xss
   return $ maybe xss' (addBackup xss') mx
 
+trackers :: [URI] -> TrackerList ()
+trackers uris = TierList $ map (\uri -> [(uri,())]) uris
+
 -- | Extract set of trackers from torrent file. The 'tAnnounce' key is
 -- only ignored if the 'tAnnounceList' key is present.
 trackerList :: Torrent -> TrackerList ()
diff --git a/bittorrent/src/Network/BitTorrent/Tracker/Message.hs b/bittorrent/src/Network/BitTorrent/Tracker/Message.hs
index b9b6a9d3..e01ebbf4 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker/Message.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker/Message.hs
@@ -404,8 +404,8 @@ parseAnnounceQuery params = AnnounceQuery
 --   For more info see: <http://www.bittorrent.org/beps/bep_0023.html>
 --
 data PeerList ip
-  = PeerList        [PeerAddr IP]
-  | CompactPeerList [PeerAddr ip]
+  = PeerList        [PeerAddr]
+  | CompactPeerList [PeerAddr]
     deriving (Show, Eq, Typeable, Functor)
 
 -- | The empty non-compact peer list.
@@ -413,11 +413,11 @@ instance Default (PeerList IP) where
   def = PeerList []
   {-# INLINE def #-}
 
-getPeerList :: PeerList IP -> [PeerAddr IP]
+getPeerList :: PeerList IP -> [PeerAddr]
 getPeerList (PeerList        xs) = xs
 getPeerList (CompactPeerList xs) = xs
 
-instance Serialize a => BEncode (PeerList a) where
+instance BEncode (PeerList a) where
   toBEncode (PeerList        xs) = toBEncode xs
   toBEncode (CompactPeerList xs) = toBEncode $ runPut (mapM_ put xs)
 
@@ -491,10 +491,10 @@ instance BEncode AnnounceInfo where
             | L.null v6s = (CompactPeerList v4s, Nothing)
             | otherwise  = (CompactPeerList v4s, Just (CompactPeerList v6s))
 
-          toEither :: PeerAddr IP -> Either (PeerAddr IPv4) (PeerAddr IPv6)
+          toEither :: PeerAddr -> Either PeerAddr PeerAddr
           toEither PeerAddr {..} = case peerHost of
-            IPv4 ipv4 -> Left  $ PeerAddr peerId ipv4 peerPort
-            IPv6 ipv6 -> Right $ PeerAddr peerId ipv6 peerPort
+            ipv4@IPv4{} -> Left  $ PeerAddr peerId ipv4 peerPort
+            ipv6@IPv6{} -> Right $ PeerAddr peerId ipv6 peerPort
 
   fromBEncode (BDict d)
     | Just t <- BE.lookup "failure reason" d = Failure <$> fromBEncode t
@@ -514,7 +514,7 @@ instance BEncode AnnounceInfo where
                          \but the `peers6' field present"
 
       merge (CompactPeerList ipv4s) Nothing
-        = pure $ CompactPeerList (fmap IPv4 <$> ipv4s)
+        = pure $ CompactPeerList ipv4s
 
       merge (CompactPeerList _    ) (Just (PeerList _))
         = fail "PeerList: the `peers6' field value \
@@ -522,7 +522,7 @@ instance BEncode AnnounceInfo where
 
       merge (CompactPeerList ipv4s) (Just (CompactPeerList ipv6s))
         = pure $ CompactPeerList $
-                 (fmap IPv4 <$> ipv4s) <> (fmap IPv6 <$> ipv6s)
+                 ipv4s <> ipv6s
 
   fromBEncode _ = decodingError "Announce info"
 
@@ -533,13 +533,13 @@ instance Serialize AnnounceInfo where
     putWord32be $ fromIntegral respInterval
     putWord32be $ fromIntegral $ fromMaybe 0 respIncomplete
     putWord32be $ fromIntegral $ fromMaybe 0 respComplete
-    forM_ (fmap ipv4 <$> getPeerList respPeers) put
+    forM_ (getPeerList respPeers) put
 
   get = do
     interval <- getWord32be
     leechers <- getWord32be
     seeders  <- getWord32be
-    peers    <- many $ fmap IPv4 <$> get
+    peers    <- many $ isolate 6 get -- isolated to specify IPv4.
 
     return $ AnnounceInfo {
         respWarning     = Nothing
diff --git a/bittorrent/src/Network/BitTorrent/Tracker/RPC/HTTP.hs b/bittorrent/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
index 9b6e056a..6f7a53bf 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
@@ -129,7 +129,7 @@ fillRequest Options {..} q r = r
 
 httpTracker :: BEncode a => Manager -> URI -> SimpleQuery -> IO a
 httpTracker Manager {..} uri q = packHttpException $ do
-  request  <- fillRequest options q <$> setUri def {- http-client instance for Request -} uri
+  request  <- fillRequest options q <$> setUri defaultRequest uri
   response <- runResourceT $ httpLbs request httpMgr
   case BE.decode $ BL.toStrict $ responseBody response of
     Left  msg  -> throwIO (ParserFailure msg)
diff --git a/bittorrent/src/Network/BitTorrent/Tracker/Session.hs b/bittorrent/src/Network/BitTorrent/Tracker/Session.hs
index aa4a832f..db6ebaff 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker/Session.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker/Session.hs
@@ -98,7 +98,7 @@ data TrackerSession = TrackerSession
     statusSent    :: !(Maybe Status)
 
     -- | Can be used to retrieve peer set.
-  , trackerPeers  :: Cached [PeerAddr IP]
+  , trackerPeers  :: Cached [PeerAddr]
 
     -- | Can be used to show brief swarm stats in client GUI.
   , trackerScrape :: Cached LastScrape
@@ -129,7 +129,7 @@ nextStatus Completed = Nothing -- must keep previous status
 seconds :: Int -> NominalDiffTime
 seconds n = realToFrac (toEnum n :: Uni)
 
-cachePeers :: AnnounceInfo -> IO (Cached [PeerAddr IP])
+cachePeers :: AnnounceInfo -> IO (Cached [PeerAddr])
 cachePeers AnnounceInfo {..} =
   newCached (seconds respInterval)
             (seconds (fromMaybe respInterval respMinInterval))
@@ -264,7 +264,7 @@ notify mgr ses event = do
 -- TODO run announce if sesion have no peers
 -- | The returned list of peers can have duplicates.
 --   This function /may/ block. Use async if needed.
-askPeers :: Manager -> Session -> IO [PeerAddr IP]
+askPeers :: Manager -> Session -> IO [PeerAddr]
 askPeers _mgr ses = do
   list    <- readMVar (sessionTrackers ses)
   L.concat <$> collect (tryTakeData . trackerPeers) list
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 67507634..369650f9 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -622,14 +622,17 @@ clientSession s@Session{..} sock cnum h = do
             -> cmd0 $ do
                 sessions <- concat . Map.elems <$> (atomically $ readTVar (Tox.netCryptoSessionsByKey cryptosessions))
                 let sessionsReport = mapM showPerSession sessions
-                    headers = ["SessionID", "YourKey", "TheirKey", "NextMsg", "Dropped","Handled","Unhandled"]
+                    headers = ["SessionID", "YourKey", "TheirKey", "NextMsg", "Dropped" {-,"Handled","Unhandled" -}
+                              ,"Progress" ]
                     showPerSession (Tox.NCrypto
-                                        { ncSessionId = id
+                                        { ncState = progressVar
+                                        , ncSessionId = id
                                         , ncMyPublicKey = yourkey
                                         , ncTheirPublicKey = theirkey
                                         , ncLastNMsgs = lastN
                                         , ncSockAddr = sockAddr
                                         }) = do
+                        progress <- atomically $ readTVar progressVar
                         (num,dropped) <- atomically $ liftA2 (,) (CB.getTotal lastN) (CB.getDropped lastN)
                         as <- atomically (CB.cyclicBufferViewList lastN)
                         let (h,u) = partition (fst . snd) as
@@ -640,8 +643,9 @@ clientSession s@Session{..} sock cnum h = do
                                , show (Tox.key2id theirkey)-- "TheirKey"
                                , show num                 -- "NextMsg"
                                , show dropped             -- "Dropped"
-                               , show countHandled        -- "Handled"
-                               , show countUnhandled      -- "Unhandled"
+                            -- , show countHandled        -- "Handled"
+                            -- , show countUnhandled      -- "Unhandled"
+                               , show progress
                                ]
                 if null sessions
                  then hPutClient h "No sessions."
@@ -1161,7 +1165,7 @@ clientSession s@Session{..} sock cnum h = do
                         keydb <- atomically $ readTVar toxkeys
                         now <- getPOSIXTime
                         let entries = map mkentry $ PSQ.toList (Tox.keyByAge keydb)
-                            mkentry (k :-> Down tm) = [ show cnt, show k, show (now - tm) ]
+                            mkentry (k :-> tm) = [ show cnt, show k, show (now - tm) ]
                                 where Just (_,(cnt,_)) = MM.lookup' k (Tox.keyAssoc keydb)
                         hPutClient h $ showColumns entries
 
@@ -1415,7 +1419,7 @@ announceToxJabberPeer them echan laddr saddr pingflag tsrc tsnk
         , Tcp.Connection pingflag xsrc xsnk )
      return Nothing
  where
-    xsrc = tsrc =$= toxToXmpp (T.pack $ show them ++ ".tox")
+    xsrc = tsrc =$= toxToXmpp (T.pack $ show (Tox.key2id them) ++ ".tox")
     xsnk = flushPassThrough xmppToTox =$= tsnk
 
 vShowMe :: Tox.ViewSnapshot -> Int -> B.ByteString
diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index 71aa99c4..0a7f07c3 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -218,7 +218,7 @@ decryptSymmetric (SymmetricKey symmkey) (Nonce24 n24) (Encrypted bs) = do
     let (ds, symm') = Symmetric.decrypt bs'' symm
         auth = Symmetric.finalize symm'
     if BA.convert auth /= mac
-        then Left "symmetricDecipher: Auth fail."
+        then Left "Symmetric decryption failed.  Incorrect key material?"
         else return $ Plain ds
 
 encryptSymmetric :: SymmetricKey -> Nonce24 -> Plain s x -> Encrypted x
@@ -237,7 +237,7 @@ data State = State Poly1305.State XSalsa.State
 decrypt :: State -> Encrypted a -> Either String (Plain s a)
 decrypt (State hash crypt) ciphertext
     | (a == mac) = Right (Plain m)
-    | otherwise  = Left "decipherAndAuth: auth fail"
+    | otherwise  = Left "Asymmetric decryption failed.  Incorrect key material?"
   where
     (mac, c) = authAndBytes ciphertext
     m = fst . XSalsa.combine crypt $ c
diff --git a/src/Network/Kademlia.hs b/src/Network/Kademlia.hs
index 8956df2c..0ab26e80 100644
--- a/src/Network/Kademlia.hs
+++ b/src/Network/Kademlia.hs
@@ -26,8 +26,6 @@ import Data.IP
 import Data.Monoid
 import Data.Serialize                 (Serialize)
 import Data.Time.Clock.POSIX          (POSIXTime)
-import qualified Data.Wrapper.PSQInt  as Int
-         ;import Data.Wrapper.PSQInt  (pattern (:->))
 import Network.Address                (bucketRange,genBucketSample)
 import Network.Kademlia.Search
 import System.Entropy
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 5bd23da8..3c3bce49 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -19,7 +19,7 @@ import Debug.Trace
 import Control.Exception hiding (Handler)
 import Control.Applicative
 import Control.Arrow
-import Control.Concurrent                     (MVar)
+import Control.Concurrent                     (MVar,killThread)
 import Control.Concurrent.STM
 import Control.Monad
 import Control.Monad.Fix
@@ -485,18 +485,19 @@ forkTox tox = do
     quit <- forkListener "toxCrypto" (toxCrypto tox)
     forkPollForRefresh (DHT.refresher4 $ toxRouting tox)
     forkPollForRefresh (DHT.refresher6 $ toxRouting tox)
-    return ( quit
+    keygc <- Onion.forkAnnouncedKeysGC (toxAnnouncedKeys tox)
+    return ( killThread keygc >> quit
            , bootstrap (DHT.refresher4 $ toxRouting tox)
            , bootstrap (DHT.refresher6 $ toxRouting tox)
            )
 
--- TODO: Don't export this.
+-- TODO: Don't export this.  The exported interface is 'toxAnnounceToLan'.
 announceToLan :: Socket -> NodeId -> IO ()
 announceToLan sock nid = do
     addrs <- broadcastAddrs
     forM_ addrs $ \addr -> do
     (broadcast_info:_) <- getAddrInfo (Just defaultHints { addrFlags = [AI_NUMERICHOST], addrSocketType = Datagram })
-                                      (Just addr) -- TODO: Detect broadcast address.
+                                      (Just addr)
                                       (Just "33445")
     let broadcast = addrAddress broadcast_info
         bs = S.runPut $ DHT.putMessage (DHT.DHTLanDiscovery nid)
diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index 5316acc8..e22388a3 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE DeriveFunctor #-}
+{-# LANGUAGE CPP #-}
 module Network.Tox.Crypto.Handlers where
 
 import Network.Tox.NodeId
@@ -40,8 +41,12 @@ import System.IO.Temp
 import System.Environment
 import System.Directory
 import System.Random -- for ping fuzz
+#ifdef THREAD_DEBUG
+import Control.Concurrent.Lifted.Instrument
+#else
 import Control.Concurrent
 import GHC.Conc (labelThread)
+#endif
 import PingMachine
 import qualified Data.IntMap.Strict as IntMap
 import Control.Concurrent.Supply
@@ -719,8 +724,8 @@ updateCryptoSession sessions addr newsession timestamp hp session handshake = do
           dmsg ("   ncTheirDHTKey=" ++ show (ncTheirDHTKey session)
                          ++ bool "{/=}" "{==}" (ncTheirDHTKey session == HaveDHTKey (hpCookieRemoteDhtkey hp))
                          ++ "hpCookieRemoteDhtkey=" ++ show (hpCookieRemoteDhtkey hp))
-          if (  -- Just ncTheirBaseNonce0 /= hpTheirBaseNonce hp -- XXX: Do we really want to compare base nonce here?
-                -- ||
+          if (  toMaybe ncTheirBaseNonce0 /= hpTheirBaseNonce hp
+                ||
                ncTheirDHTKey session /= HaveDHTKey (hpCookieRemoteDhtkey hp)
              )
             then freshCryptoSession sessions addr newsession timestamp hp
@@ -1042,10 +1047,16 @@ sendCrypto crypto session updateLocal cm = do
             PQ.OGEncodeFail -> return (Left "Failed to encode outgoing packet")
 
 sendOnline :: TransportCrypto -> NetCryptoSession -> IO (Either String ())
-sendOnline crypto session = sendCrypto crypto session (return ()) (OneByte ONLINE)
+sendOnline crypto session = do
+    let cm=OneByte ONLINE
+    addMsgToLastN False (cm ^. messageType) session (Out cm)
+    sendCrypto crypto session (return ()) (OneByte ONLINE)
 
 sendOffline :: TransportCrypto -> NetCryptoSession -> IO (Either String ())
-sendOffline crypto session = sendCrypto crypto session (return ()) (OneByte OFFLINE)
+sendOffline crypto session = do
+    let cm=OneByte OFFLINE
+    addMsgToLastN False (cm ^. messageType) session (Out cm)
+    sendCrypto crypto session (return ()) (OneByte OFFLINE)
 
 
 sendKill :: TransportCrypto -> NetCryptoSession -> IO (Either String ())
diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index 74239710..dab1b14a 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -555,8 +555,14 @@ parseNoSpamJID jid = do
                 _               -> Left "Hostname should be 43 base64 digits followed by .tox."
     pub <- id2key <$> readEither base64
     let ustr = Text.unpack u
-    '$' : b64digits <- Right ustr -- TODO: support 0x prefix also.
-    NoSpam nospam (Just x) <- readEither $ map (\case; '?' -> '0'; c -> c) ustr
+    case ustr of
+        '$' : b64digits       -> solveBase64NoSpamID b64digits pub
+        '0' : 'x' : hexdigits -> do nospam <- readEither ('0':'x':hexdigits)
+                                    return $ NoSpamId nospam pub
+
+solveBase64NoSpamID :: String -> PublicKey -> Either String NoSpamId
+solveBase64NoSpamID b64digits pub = do
+    NoSpam nospam (Just x) <- readEither $ '$' : map (\case; '?' -> '0'; c -> c) b64digits
     let nlo = fromIntegral (0x0FFFF .&. nospam) :: Word16
         nhi = fromIntegral (0x0FFFF .&. (nospam `shiftR` 16)) :: Word16
         sum = x `xor` nlo `xor` nhi `xor` xorsum pub
@@ -583,7 +589,6 @@ parseNoSpamJID jid = do
             let bitpos = q * 6 + p * 2
                 ac' = ac `xor` shiftR (fromIntegral b `shiftL` 48) bitpos
             solve ns ac'
-
     n64' <- solve ns n64
     let nospam' = fromIntegral (n64' `shiftR` 32)
         cksum'  = fromIntegral (n64' `shiftR` 16)
diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs
index 99ef3c69..263d60bd 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/src/Network/Tox/Onion/Handlers.hs
@@ -11,7 +11,7 @@ import Network.QueryResponse as QR hiding (Client)
 import qualified Network.QueryResponse as QR (Client)
 import Crypto.Tox
 import qualified Data.Wrapper.PSQ             as PSQ
-         ;import Data.Wrapper.PSQ             (PSQ)
+         ;import Data.Wrapper.PSQ             (PSQ,pattern (:->))
 #ifdef CRYPTONITE_BACKPORT
 import Crypto.Error.Types                     (CryptoFailable (..),
                                                throwCryptoError)
@@ -35,6 +35,12 @@ import Network.BitTorrent.DHT.Token           as Token
 
 import Control.Exception hiding (Handler)
 import Control.Monad
+#ifdef THREAD_DEBUG
+import Control.Concurrent.Lifted.Instrument
+#else
+import Control.Concurrent
+import GHC.Conc (labelThread)
+#endif
 import Control.Concurrent.STM
 import Data.Time.Clock.POSIX  (POSIXTime, getPOSIXTime)
 import Network.Socket
@@ -159,7 +165,7 @@ toOnionDestination (AnnouncedRoute ni rpath) = OnionToOwner ni rpath
 -- structure.
 --
 data AnnouncedKeys = AnnouncedKeys
-    { keyByAge :: !(PSQ NodeId (Down POSIXTime{-Time at which they announced to you-})) -- TODO: timeout of 300 seconds
+    { keyByAge :: !(PSQ NodeId (POSIXTime{-Time at which they announced to you-}))
     , keyAssoc :: !(MinMaxPSQ' NodeId NodeDistance (Int{-count of route usage-},AnnouncedRoute))
         -- ^ PSQ using NodeId(user/public key) as Key
         --   and using 'NodeDistance' as priority.
@@ -172,12 +178,33 @@ data AnnouncedKeys = AnnouncedKeys
 
 insertKey :: POSIXTime -> NodeId -> AnnouncedRoute -> NodeDistance -> AnnouncedKeys -> AnnouncedKeys
 insertKey tm pub toxpath d keydb = AnnouncedKeys
-    { keyByAge = PSQ.insert pub (Down tm) (keyByAge keydb)
+    { keyByAge = PSQ.insert pub tm (keyByAge keydb)
     , keyAssoc = case MinMaxPSQ.lookup' pub (keyAssoc keydb) of
                     Just (_,(cnt,_)) -> MinMaxPSQ.insert' pub (cnt,toxpath) d (keyAssoc keydb)
                     Nothing          -> MinMaxPSQ.insert' pub (0  ,toxpath) d (keyAssoc keydb)
     }
 
+-- | Forks a thread to garbage-collect old key announcements.  Keys may be
+-- discarded after 5 minutes.
+forkAnnouncedKeysGC :: TVar AnnouncedKeys -> IO ThreadId
+forkAnnouncedKeysGC db = forkIO $ do
+    myThreadId >>= flip labelThread "gc:toxids"
+    fix $ \loop -> do
+    cutoff <- getPOSIXTime
+    threadDelay 300000000 -- 300 seconds
+    join $ atomically $ do
+        fix $ \gc -> do
+        keys <- readTVar db
+        case PSQ.minView (keyByAge keys) of
+            Nothing -> return loop
+            Just (pub :-> tm,kba')
+                | tm > cutoff -> return loop
+                | otherwise   -> do writeTVar db keys
+                                        { keyByAge = kba'
+                                        , keyAssoc = MinMaxPSQ.delete pub (keyAssoc keys)
+                                        }
+                                    gc
+
 areq :: Message -> Either String AnnounceRequest
 areq (OnionAnnounce asymm) = Right $ fst $ runIdentity $ asymmData asymm
 areq _                     = Left "Unexpected non-announce OnionMessage"
diff --git a/todo.txt b/todo.txt
index 645197d5..d4b2d828 100644
--- a/todo.txt
+++ b/todo.txt
@@ -9,10 +9,6 @@ ui: better error message for a +dhtkey without any selected key.
 
 tox: tcp relay
 
-bug: local IPv6 addresses are occurring in the IPv4 tox routing table.
-
-xmpp: xmpp-added roster keys are not in TransportCrypto and unusable from TOx.Crypto.Handlers.
-
 xmpp: handle tox-friends in roster.
 
 tox: Add fallback trials to cookie response in case response is from another address than request.
@@ -43,8 +39,6 @@ tox: nat ping
 
 tox: cache diffie-helman secrets
 
-tox: Expire ofline Tox announces.
-
 tox: Chat support.
 
 bt: Collect PeerStore garbage: "Note that you should call .put() every hour for