debugging sessionPacketH

1 files changed, 10 insertions, 2 deletions

diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index 0dc7f08d..bc7d7af8 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -559,6 +559,7 @@ freshCryptoSession  sessions
     dropNum <- atomically $ newTVar 0
     theirbasenonce <- atomically $ readTVar ncTheirBaseNonce0
     dput XNetCrypto $ "freshCryptoSession: Session ncTheirBaseNonce=" ++ show theirbasenonce
+    dput XNetCrypto $ "freshCryptoSession: My Session Public =" ++ show (key2id $ toPublic newsession)
     ncTheirSessionPublic0 <- atomically $ newTVar (frmMaybe mbtheirSessionKey)
     let netCryptoSession0 =
             NCrypto { ncState              = ncState0
@@ -606,7 +607,10 @@ createNetCryptoOutQueue sessions newsession theirSessionKey pktq ncMyPacketNonce
                     atomically $ do
                         n24 <- readTVar ncMyPacketNonce0
                         let n24plus1 = incrementNonce24 n24
-                        trace ("ncMyPacketNonce+1=" ++ show n24plus1) $ writeTVar ncMyPacketNonce0 n24plus1
+                        trace ("ncMyPacketNonce+1=" ++ show n24plus1
+                            ++ "\n toWireIO: theirSessionKey = " ++ show (key2id theirSessionKey)
+                            ++ "\n toWireIO: my public session key = " ++ show (key2id (toPublic newsession))
+                              ) $ writeTVar ncMyPacketNonce0 n24plus1
                         return (return (f n24, n24, ncOutgoingIdMap0))
             pktoq <- atomically $ PQ.newOutGoing pktq ncToWire toWireIO 0 (outboundQueueCapacity sessions) 0
             return (HaveHandshake pktoq)
@@ -710,7 +714,9 @@ updateCryptoSession sessions addr hp session handshake = do
                          ++ bool "(/=)" "(==)" (toMaybe ncTheirBaseNonce0 == hpTheirBaseNonce hp)
                          ++ "hpTheirBaseNonce=" ++ show (hpTheirBaseNonce hp))
           if ( ncTheirBaseNonce0 /= frmMaybe (hpTheirBaseNonce hp))
-            then freshCryptoSession sessions addr hp -- basenonce mismatch, trigger refresh
+            then do
+                 dput XNetCrypto "basenonce mismatch, trigger refresh"
+                 freshCryptoSession sessions addr hp -- basenonce mismatch, trigger refresh
             else atomically $ writeTVar (ncState session) {-Accepted-}(InProgress AwaitingSessionPacket)
 
 anyRight :: Monad m => a -> [t] -> (t -> m (Either b b1)) -> m (Either a b1)
@@ -833,6 +839,8 @@ sessionPacketH sessions addr (CryptoPacket nonce16 encrypted) = do
                         dput XNetCrypto $ "(NetCrypto)sessionPacketH: theirBaseNonce =  " ++ show theirBaseNonce
                         dput XNetCrypto $ "(NetCrypto)sessionPacketH: tempNonce =  " ++ show tempNonce
                                        ++ " nonce16=" ++ printf "0x%x" nonce16 ++ " last2bytes =" ++ printf "0x%x" (last2Bytes theirBaseNonce)
+                        dput XNetCrypto $ "(NetCrypto)sessionPacketH: mySession public=" ++ show (key2id $ toPublic ncSessionSecret)
+                        dput XNetCrypto $ "(NetCrypto)sessionPacketH: theirSession public=" ++ show (key2id $ pubkey)
                         secret <- lookupSharedSecret crypto ncSessionSecret pubkey tempNonce
                         let step1 = decrypt secret encrypted
                         case step1 of