2 files changed, 16 insertions, 9 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index f7cf7b1e..cebbebfb 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -261,7 +261,7 @@ netCryptoWithBackoff millisecs tox myseckey theirpubkey = do
                 -- Convert to NodeInfo, so we can send cookieRequest
                 let crypto = toxCryptoKeys tox
                     client = toxDHT tox
-                case nodeInfo (key2id theirDhtKey) saddr of
+                case nodeInfo (key2id theirDhtKey) (nodeAddr saddr) of
                    Left e   -> dput XNetCrypto ("netCrypto: nodeInfo fail... " ++ e) >> return []
                    Right ni -> do
                     mbCookie <- DHT.cookieRequest crypto client (toPublic myseckey) ni
@@ -282,11 +282,11 @@ netCryptoWithBackoff millisecs tox myseckey theirpubkey = do
                         newsession <- generateSecretKey
                         timestamp <- getPOSIXTime
                         (myhandshake,ioAction)
-                                <- atomically $ freshCryptoSession (toxCryptoSessions tox) saddr newsession timestamp hp
+                                <- atomically $ freshCryptoSession (toxCryptoSessions tox) (nodeAddr saddr) newsession timestamp hp
                         ioAction
                         -- send handshake
                         forM myhandshake $ \response_handshake -> do
-                                sendHandshake (toxCryptoSessions tox) saddr response_handshake
+                                sendHandshake (toxCryptoSessions tox) (nodeAddr saddr) response_handshake
                         let secnum :: Double
                             secnum = fromIntegral millisecs / 1000000
                             delay = (millisecs * 5 `div` 4)
diff --git a/src/Network/Tox/ContactInfo.hs b/src/Network/Tox/ContactInfo.hs
index 3f794197..1970b782 100644
--- a/src/Network/Tox/ContactInfo.hs
+++ b/src/Network/Tox/ContactInfo.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE LambdaCase #-}
 module Network.Tox.ContactInfo where
 
 import Connection
@@ -30,13 +31,13 @@ data Account extra = Account
 
 data ContactEvent = OnionRouted  { contact :: PublicKey, onionRouted :: OnionData }
                   | PolicyChange { contact :: PublicKey, policyChange :: Policy }
-                  | AddrChange   { contact :: PublicKey, addrChange :: SockAddr }
+                  | AddrChange   { contact :: PublicKey, addrChange :: NodeInfo }
                   | SessionEstablished { contact :: PublicKey }
                   | SessionTerminated  { contact :: PublicKey }
 
 data Contact = Contact
     { contactKeyPacket     :: TVar (Maybe (POSIXTime,DHT.DHTPublicKey))
-    , contactLastSeenAddr  :: TVar (Maybe (POSIXTime,SockAddr))
+    , contactLastSeenAddr  :: TVar (Maybe (POSIXTime,NodeInfo))
     , contactFriendRequest :: TVar (Maybe (POSIXTime,DHT.FriendRequest))
     , contactPolicy        :: TVar (Maybe Connection.Policy)
     }
@@ -97,7 +98,7 @@ onionUpdate now (Onion.OnionFriendRequest fr)   contact
 policyUpdate :: Policy -> Contact -> STM ()
 policyUpdate policy contact = writeTVar (contactPolicy contact) $ Just policy
 
-addrUpdate :: POSIXTime -> SockAddr -> Contact -> STM ()
+addrUpdate :: POSIXTime -> NodeInfo -> Contact -> STM ()
 addrUpdate now addr contact = writeTVar (contactLastSeenAddr contact) $ Just (now,addr)
 
 setContactPolicy :: PublicKey -> Policy -> Account extra -> STM ()
@@ -105,10 +106,16 @@ setContactPolicy remoteUserKey policy acc = do
     updateAccount' remoteUserKey acc $ policyUpdate policy
     writeTChan (eventChan acc) $ PolicyChange remoteUserKey policy
 
-setContactAddr :: POSIXTime -> PublicKey -> SockAddr -> Account extra -> STM ()
+setContactAddr :: POSIXTime -> PublicKey -> NodeInfo -> Account extra -> STM ()
 setContactAddr now remoteUserKey addr acc = do
-    updateAccount' remoteUserKey acc $ addrUpdate now addr
-    writeTChan (eventChan acc) $ AddrChange remoteUserKey addr
+    contact <- getContact remoteUserKey acc
+    let update = updateAccount' remoteUserKey acc $ addrUpdate now addr
+    let notify = writeTChan (eventChan acc) $ AddrChange remoteUserKey addr
+    join <$> traverse (readTVar . contactLastSeenAddr) contact >>= \case
+      Just (_, a) | addr == a    -> update -- updates time only
+      Just (t, _) | now > t + 60 -> update >> notify -- update IP if existing one is old
+      Nothing                    -> update >> notify -- or if we don't have any
+      _                          -> return () -- otherwise just wait
 
 setEstablished :: POSIXTime -> PublicKey -> Account extra -> STM ()
 setEstablished now remoteUserKey acc =