1 files changed, 14 insertions, 2 deletions

diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index dfe7da36..ac7379d4 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -666,8 +666,20 @@ cryptoNetHandler sessions addr (NetCrypto (CryptoPacket nonce16 encrypted)) = do
             lr <- fmap join $ sequence $ do -- Either Monad --
                         pubkey <- maybeToEither ncTheirSessionPublic
                         Right $ do -- IO Monad
+                        dput XNetCrypto $ "cryptoNetHandler: pubkey =  " ++ show (key2id $ pubkey)
+                        dput XNetCrypto $ "cryptoNetHandler: tempNonce =  " ++ show tempNonce
                         secret <- lookupSharedSecret crypto ncSessionSecret pubkey tempNonce
-                        return $ decodePlain =<< decrypt secret encrypted
+                        let step1 = decrypt secret encrypted
+                        case step1 of
+                            Left s -> do
+                                dput XNetCrypto $ "cryptoNetHandler: (decrypt) " ++ s
+                                return (Left s)
+                            Right pln -> do
+                                case decodePlain pln of
+                                    Left s -> do
+                                        dput XNetCrypto $ "cryptoNetHandler: (decodePlain) " ++ s
+                                        return (Left s)
+                                    Right x -> return (Right x)
             case lr of
                 Left s -> do
                     dput XNetCrypto $ "cryptoNetHandler: " ++ s
@@ -709,7 +721,7 @@ cryptoNetHandler sessions addr (NetCrypto (CryptoPacket nonce16 encrypted)) = do
     where
         last2Bytes :: Nonce24 -> Word16
         last2Bytes (Nonce24 bs) = case S.decode (B.drop 22 bs) of
-                                    Right n -> n
+                                    Right n -> byteSwap16 n
                                     _ -> error "unreachable-last2Bytes"
         dATA_NUM_THRESHOLD = 21845 -- = 65535 / 3