More progress on ToxTransport and related modules.

1 files changed, 46 insertions, 0 deletions

diff --git a/ToxPacket.hs b/ToxPacket.hs
index d10a7597..bc20f480 100644
--- a/ToxPacket.hs
+++ b/ToxPacket.hs
@@ -71,6 +71,52 @@ data Assym a = Assym
     , assymData :: a
     }
 
+newtype GetNodes = GetNodes NodeId
+    deriving (Eq,Ord,Show,Read,S.Serialize)
+
 newtype SendNodes = SendNodes [NodeInfo]
     deriving (Eq,Ord,Show,Read)
 
+instance S.Serialize SendNodes where
+    get = do
+        cnt <- S.get :: S.Get Word8
+        ns <- sequence $ replicate (fromIntegral cnt) S.get
+        return $ SendNodes ns
+
+    put (SendNodes ns) = do
+        let ns' = take 4 ns
+        S.put (fromIntegral (length ns') :: Word8)
+        mapM_ S.put ns'
+
+data Ping = Ping deriving Show
+data Pong = Pong deriving Show
+
+instance S.Serialize Ping where
+    get = do w8 <- S.get
+             if (w8 :: Word8) /= 0
+                then fail "Malformed ping."
+                else return Ping
+    put Ping = S.put (0 :: Word8)
+
+instance S.Serialize Pong where
+    get = do w8 <- S.get
+             if (w8 :: Word8) /= 1
+                then fail "Malformed pong."
+                else return Pong
+    put Pong = S.put (1 :: Word8)
+
+newtype CookieRequest = CookieRequest PublicKey
+newtype CookieResponse = CookieResponse Cookie
+
+data Cookie = Cookie Nonce24 (Encrypted CookieData)
+
+instance Sized Cookie where size = ConstSize 112 -- 24 byte nonce + 88 byte cookie data
+
+data CookieData = CookieData   --   16 (mac)
+    { cookieTime  :: Word64    --    8
+    , longTermKey :: PublicKey --   32
+    , dhtKey      :: PublicKey -- + 32
+    }                          -- = 88 bytes when encrypted.
+
+instance Sized CookieRequest where
+    size = ConstSize 64 -- 32 byte key + 32 byte padding