Fixed handshake behavior

The handshake code would flood the network with interminable handshakes.

2 files changed, 7 insertions, 7 deletions

diff --git a/Connection/Tox.hs b/Connection/Tox.hs
index 3f5f7e2c..9612f1e5 100644
--- a/Connection/Tox.hs
+++ b/Connection/Tox.hs
@@ -193,12 +193,12 @@ setToxPolicy params conmap k@(Key me them) policy = do
                 registerNodeCallback routing $ NodeInfoCallback
                     { interestingNodeId = nid
                     , listenerId        = callbackId
-                    , observedAddress   = \now ni -> writeTVar (contactLastSeenAddr c) (Just (now,nodeAddr ni))
+                    , observedAddress   = \now ni -> writeTVar (contactLastSeenAddr c) (Just (now, 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 (now,nodeAddr ni))
+                                  Nothing -> writeTVar (contactLastSeenAddr c) (Just (now, ni))
                     }
             return ()
     RefusingToConnect -> do -- disconnect or cancel any pending connection
@@ -235,12 +235,12 @@ setToxPolicy params conmap k@(Key me them) policy = do
                 registerNodeCallback routing $ NodeInfoCallback
                     { interestingNodeId = nid
                     , listenerId        = callbackId
-                    , observedAddress   = \now ni -> writeTVar (contactLastSeenAddr c) (Just (now,nodeAddr ni))
+                    , observedAddress   = \now ni -> writeTVar (contactLastSeenAddr c) (Just (now, 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 (now,nodeAddr ni))
+                                  Nothing -> writeTVar (contactLastSeenAddr c) (Just (now, ni))
                     }
 
 stringToKey_ :: String -> Maybe Key
diff --git a/Connection/Tox/Threads.hs b/Connection/Tox/Threads.hs
index ba49b7dc..de719655 100644
--- a/Connection/Tox/Threads.hs
+++ b/Connection/Tox/Threads.hs
@@ -140,7 +140,7 @@ pursueContact getPolicy getStatus PursueContactMethods{..} statusVar = do
                    (do
                     (stamp_theirDhtKey,theirDhtKey) <- second DHT.dhtpk <$> retryUntilJust (contactKeyPacket contact)
                     (stamp_saddr,saddr) <- retryUntilJust (contactLastSeenAddr contact)
-                    ni <- either (const retry) return $ nodeInfo (key2id theirDhtKey) saddr
+                    ni <- either (const retry) return $ nodeInfo (key2id theirDhtKey) (_fixme saddr)
                     return $ do
                     -- AcquiringCookie
                     atomically $ writeTVar statusVar (InProgress AcquiringCookie)
@@ -166,11 +166,11 @@ pursueContact getPolicy getStatus PursueContactMethods{..} statusVar = do
                             newsession <- generateSecretKey
                             timestamp <- getPOSIXTime
                             (myhandshake,ioAction)
-                                    <- atomically $ freshCryptoSession allsessions saddr newsession timestamp hp
+                                    <- atomically $ freshCryptoSession allsessions (_fixme saddr) newsession timestamp hp
                             ioAction
                             -- send handshake
                             forM myhandshake $ \response_handshake -> do
-                                    sendHandshake allsessions saddr response_handshake
+                                    sendHandshake allsessions (_fixme saddr) response_handshake
                             atomically $ writeTVar statusVar $ InProgress AwaitingHandshake
                             return shortRetryInterval
                     -- AwaitingHandshake