more debug messages in cryptoNetHandler

1 files changed, 21 insertions, 4 deletions

diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index f4199374..268928ee 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -545,10 +545,23 @@ updateCryptoSession sessions addr hp session = do
         -- duplicate handshake packet, otherwise disregard everything, and
         -- refresh all state.
         --
-     then when (  Just ncTheirBaseNonce0 /= hpTheirBaseNonce hp -- XXX: Do we really want to compare base nonce here?
+     then do
+          dput XNetCrypto "updateCryptoSession already accepted.."
+          dput XNetCrypto ("   ncTheirBaseNonce0=" ++ show ncTheirBaseNonce0
+                         ++ bool "(/=)" "(==)" (Just ncTheirBaseNonce0 == hpTheirBaseNonce hp)
+                         ++ "hpTheirBaseNonce=" ++ show (hpTheirBaseNonce hp))
+          dput XNetCrypto ("   ncTheirDHTKey=" ++ show (ncTheirDHTKey session)
+                         ++ bool "{/=}" "{==}" (ncTheirDHTKey session == hpCookieRemoteDhtkey hp)
+                         ++ "hpCookieRemoteDhtkey=" ++ show (hpCookieRemoteDhtkey hp))
+          when (  Just ncTheirBaseNonce0 /= hpTheirBaseNonce hp -- XXX: Do we really want to compare base nonce here?
                || ncTheirDHTKey session /= hpCookieRemoteDhtkey hp
                ) $ freshCryptoSession sessions addr hp
-     else if ( Just ncTheirBaseNonce0 /= hpTheirBaseNonce hp)
+     else do
+          dput XNetCrypto "updateCryptoSession else clause"
+          dput XNetCrypto ("   ncTheirBaseNonce0=" ++ show ncTheirBaseNonce0
+                         ++ bool "(/=)" "(==)" (Just ncTheirBaseNonce0 == hpTheirBaseNonce hp)
+                         ++ "hpTheirBaseNonce=" ++ show (hpTheirBaseNonce hp))
+          if ( Just ncTheirBaseNonce0 /= hpTheirBaseNonce hp)
             then freshCryptoSession sessions addr hp -- basenonce mismatch, trigger refresh
             else atomically $ writeTVar (ncState session) Accepted
 
@@ -620,8 +633,12 @@ cryptoNetHandler sessions addr (NetHandshake (Handshake (Cookie n24 ecookie) non
             sessionsmap <- atomically $ readTVar allsessions
             -- Do a lookup, so we can handle the update case differently
             case Map.lookup addr sessionsmap of
-                Nothing -> freshCryptoSession sessions addr hp -- create new session
-                Just session -> updateCryptoSession sessions addr hp session -- update existing session
+                Nothing -> do
+                    dput XNetCrypto "sockaddr not in session map, so freshCryptoSession"
+                    freshCryptoSession sessions addr hp -- create new session
+                Just session -> do
+                    dput XNetCrypto "sockaddr ALREADY in session map, so updateCryptoSession"
+                    updateCryptoSession sessions addr hp session -- update existing session
     return Nothing
 
 cryptoNetHandler sessions addr (NetCrypto (CryptoPacket nonce16 encrypted)) = do