Outgoing queue and related

1 files changed, 16 insertions, 0 deletions

diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index 386c2766..b89bde46 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -23,6 +23,7 @@ module Network.Tox.Crypto.Transport
     , MessageType(..)
     , KnownLossyness(..)
     , AsWord16(..)
+    , AsWord64(..)
     -- feild name classes
     , HasGroupChatID(..)
     , HasGroupNumber(..)
@@ -420,6 +421,11 @@ class AsWord16 a where
    toWord16 :: a -> Word16
    fromWord16 :: Word16 -> a
 
+class AsWord64 a where
+   toWord64 :: a -> Word64
+   fromWord64 :: Word64 -> a
+
+
 toEnum8 :: (Enum a, Integral word8) => word8 -> a
 toEnum8 = toEnum . fromIntegral
 fromEnum8 :: Enum a => a -> Word8
@@ -428,6 +434,9 @@ fromEnum8 = fromIntegral . fromEnum
 fromEnum16 :: Enum a => a -> Word16
 fromEnum16 = fromIntegral . fromEnum
 
+fromEnum64 :: Enum a => a -> Word64
+fromEnum64 = fromIntegral . fromEnum
+
 
 -- MessageType, for our client keep it inside 16 bits
 -- but we should extend it to 32 or even 64 on the wire.
@@ -440,6 +449,13 @@ instance AsWord16 MessageType where
     fromWord16 x | x < 1024, x .|. 0x0200 == 0x0200 = GrpMsg (toEnum8 ((x - 512) `div` 256)) (toEnum8 x)
     fromWord16 x = error "Not clear how to convert Word16 to MessageType"
 
+instance AsWord64 MessageType where
+    toWord64 (Msg msgID) = fromIntegral (fromIntegral (fromEnum16 msgID) :: Word8)
+    toWord64 (GrpMsg lsy msgName) = 512 + 256 * (fromEnum64 lsy) + fromIntegral (fromEnum8 msgName)
+    fromWord64 x | x < 256                          = Msg (toEnum $ fromIntegral x)
+    fromWord64 x | x < 1024, x .|. 0x0200 == 0x0200 = GrpMsg (toEnum8 ((x - 512) `div` 256)) (toEnum8 x)
+    fromWord64 x = error "Not clear how to convert Word64 to MessageType"
+
 word16 :: (Functor f, AsWord16 x) => (Word16 -> f Word16) -> (x -> f x)
 word16  = lens toWord16 (\_ x -> fromWord16 x)