5 files changed, 34 insertions, 10 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index b845f9df..369650f9 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -1165,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
 
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 634b0db1..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,7 +485,8 @@ 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)
            )
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 5483efbb..d4b2d828 100644
--- a/todo.txt
+++ b/todo.txt
@@ -39,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