1 files changed, 41 insertions, 0 deletions

diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index 634a7a43..7bc6e67f 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -43,6 +43,8 @@ module Network.Tox.Crypto.Transport
     , sizedN
     , sizedAtLeastN
     , isIndirectGrpChat
+    , LossyOrLossless(..)
+    , lossyness
     ) where
 
 import Crypto.Tox
@@ -148,6 +150,10 @@ data CryptoData = CryptoData
     , bufferData :: CryptoMessage
     }
 
+instance Serialize CryptoData where
+    get = CryptoData <$> get <*> get <*> get
+    put (CryptoData start end dta) = put start >> put end >> put dta
+
 -- The 'UserStatus' equivalent in Presence is:
 --
 -- data JabberShow = Offline
@@ -176,6 +182,25 @@ instance Sized CryptoMessage where
         TwoByte {}              -> 2
         UpToN { msgBytes = bs } -> 1 + B.length bs
 
+instance Serialize CryptoMessage where
+    get = do
+        i <- get :: Get MessageID
+        n <- remaining
+        case msgSizeParam i of
+            Just (True,1) -> return $ OneByte i
+            Just (True,2) -> TwoByte i <$> get
+            _ -> UpToN i <$> getByteString n
+
+    put (OneByte i)   =    putWord8 (fromIntegral . fromEnum $ i)
+    put (TwoByte i b) = do putWord8 (fromIntegral . fromEnum $ i)
+                           putWord8 b 
+    put (UpToN i x)   = do putWord8 (fromIntegral . fromEnum $ i)
+                           putByteString x
+
+instance Serialize MessageID where
+    get = toEnum . fromIntegral <$> getWord8
+    put x = putWord8 (fromIntegral . fromEnum $ x)
+    
 erCompat :: String -> a
 erCompat lens = error $ "Use of '" ++ lens ++ "'  lens on incompatible CryptoMessage type"
 
@@ -381,6 +406,12 @@ data MessageType = Msg MessageID
                  | GrpMsg MessageName
     deriving (Eq,Show)
 
+instance Ord MessageType where
+    compare (Msg x) (Msg y) = compare x y
+    compare (GrpMsg x) (GrpMsg y) = compare x y
+    compare (Msg _) (GrpMsg _) = LT
+    compare (GrpMsg _) (Msg _) = GT
+
 class HasMessageType x where
     getMessageType :: x -> MessageType
     setMessageType :: x -> MessageType -> x
@@ -564,6 +595,16 @@ isIndirectGrpChat MESSAGE_GROUPCHAT = True
 isIndirectGrpChat LOSSY_GROUPCHAT = True
 isIndirectGrpChat _ = False
 
+data LossyOrLossless = UnknownLossyness | Lossless | Lossy 
+    deriving (Eq,Ord,Enum,Show,Bounded)
+
+lossyness :: MessageID -> LossyOrLossless
+lossyness (fromEnum -> x) | x < 3             = Lossy
+lossyness (fromEnum -> x) | x >= 16, x < 192  = Lossless
+lossyness (fromEnum -> x) | x >= 192, x < 255 = Lossy
+lossyness (fromEnum -> 255)                   = Lossless
+lossyness _ = UnknownLossyness
+
 -- TODO: Flesh this out.
 data MessageID              -- First byte indicates data
     = Padding               -- ^ 0 padding (skipped until we hit a non zero (data id) byte)