2 files changed, 10 insertions, 9 deletions

diff --git a/Connection/Tox.hs b/Connection/Tox.hs
index 7b304050..0c2f281f 100644
--- a/Connection/Tox.hs
+++ b/Connection/Tox.hs
@@ -192,12 +192,12 @@ setToxPolicy params conmap k@(Key me them) policy = do
                 registerNodeCallback routing $ NodeInfoCallback
                     { interestingNodeId = nid
                     , listenerId        = callbackId
-                    , observedAddress   = \ni -> writeTVar (contactLastSeenAddr c) (Just $ nodeAddr ni)
-                    , rumoredAddress    = \saddr ni -> do
+                    , observedAddress   = \now ni -> writeTVar (contactLastSeenAddr c) (Just (now,nodeAddr ni))
+                    , rumoredAddress    = \now saddr ni -> do
                         m <- readTVar (contactLastSeenAddr c)
                         -- TODO remember information source and handle multiple rumors.
                         case m of Just _  -> return ()
-                                  Nothing -> writeTVar (contactLastSeenAddr c) (Just $ nodeAddr ni)
+                                  Nothing -> writeTVar (contactLastSeenAddr c) (Just (now,nodeAddr ni))
                     }
             return ()
     RefusingToConnect -> do -- disconnect or cancel any pending connection
@@ -234,12 +234,12 @@ setToxPolicy params conmap k@(Key me them) policy = do
                 registerNodeCallback routing $ NodeInfoCallback
                     { interestingNodeId = nid
                     , listenerId        = callbackId
-                    , observedAddress   = \ni -> writeTVar (contactLastSeenAddr c) (Just $ nodeAddr ni)
-                    , rumoredAddress    = \saddr ni -> do
+                    , observedAddress   = \now ni -> writeTVar (contactLastSeenAddr c) (Just (now,nodeAddr ni))
+                    , rumoredAddress    = \now saddr ni -> do
                         m <- readTVar (contactLastSeenAddr c)
                         -- TODO remember information source and handle multiple rumors.
                         case m of Just _  -> return ()
-                                  Nothing -> writeTVar (contactLastSeenAddr c) (Just $ nodeAddr ni)
+                                  Nothing -> writeTVar (contactLastSeenAddr c) (Just (now,nodeAddr ni))
                     }
 
 stringToKey_ :: String -> Maybe Key
diff --git a/Connection/Tox/Threads.hs b/Connection/Tox/Threads.hs
index 5602fa40..a5a839f9 100644
--- a/Connection/Tox/Threads.hs
+++ b/Connection/Tox/Threads.hs
@@ -32,6 +32,7 @@ import Control.Concurrent.Lifted
 import GHC.Conc                  (labelThread)
 #endif
 
+import Control.Arrow
 import Control.Concurrent.STM
 import Control.Monad
 import Data.Function
@@ -124,15 +125,15 @@ persueContact getPolicy getStatus PersueContactMethods{..} statusVar = do
         $ \retryAfterTimeout ->
             orElse (do
                     readTVar statusVar >>= check . (/= InProgress AcquiringIPAddress)
-                    theirDhtKey <- DHT.dhtpk <$> retryUntilJust (contactKeyPacket contact)
+                    (stamp_theirDhtKey,theirDhtKey) <- second DHT.dhtpk <$> retryUntilJust (contactKeyPacket contact)
                     -- We don't have an IP address yet.
                     maybe (return ()) (const retry) =<< readTVar (contactLastSeenAddr contact)
                     return $ do -- AcquiringIPAddress
                         atomically $ writeTVar statusVar (InProgress AcquiringIPAddress)
                         retryAfterTimeout 0)
                    (do
-                    theirDhtKey <- DHT.dhtpk <$> retryUntilJust (contactKeyPacket contact)
-                    saddr <- retryUntilJust (contactLastSeenAddr contact)
+                    (stamp_theirDhtKey,theirDhtKey) <- second DHT.dhtpk <$> retryUntilJust (contactKeyPacket contact)
+                    (stamp_saddr,saddr) <- retryUntilJust (contactLastSeenAddr contact)
                     ni <- either (const retry) return $ nodeInfo (key2id theirDhtKey) saddr
                     return $ do
                     -- AcquiringCookie