netcrypto bug fixes

1 files changed, 12 insertions, 0 deletions

diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index ce3bafee..fab0f3e2 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -7,6 +7,7 @@
 module Network.Tox.Crypto.Transport
     ( parseCrypto
     , encodeCrypto
+    , unpadCryptoMsg
     , parseHandshakes
     , encodeHandshakes
     , CryptoData(..)
@@ -220,6 +221,17 @@ data UserStatus = Online | Away | Busy deriving (Show,Read,Eq,Ord,Enum)
 
 data TypingStatus = NotTyping | Typing deriving (Show,Read,Eq,Ord,Enum)
 
+unpadCryptoMsg :: CryptoMessage -> CryptoMessage
+unpadCryptoMsg x@(TwoByte Padding (toEnum8 -> mid))
+    | msgSizeParam mid == Just (True,0) = OneByte mid
+unpadCryptoMsg x@(UpToN mid0 (B.dropWhile (==0) -> B.uncons -> Just (toEnum8 -> mid,bytes)))
+    | mid0 == Padding
+        = case msgSizeParam mid of
+            Just (True,0)  -> OneByte mid
+            Just (True,1)  -> TwoByte mid (B.head bytes)
+            _ -> UpToN mid bytes
+unpadCryptoMsg x = x
+
 data CryptoMessage
         = OneByte  { msgID :: MessageID }
         | TwoByte  { msgID :: MessageID, msgByte  :: Word8 }