1 files changed, 30 insertions, 3 deletions

diff --git a/ToxMessage.hs b/ToxMessage.hs
index 6853a4a1..6248facf 100644
--- a/ToxMessage.hs
+++ b/ToxMessage.hs
@@ -18,6 +18,10 @@ import Data.Word
 import Data.Data
 import Data.Ord
 import Data.Serialize
+import Foreign.Ptr
+import Foreign.Marshal.Alloc
+import System.Endian
+import Foreign.Storable
 
 newtype Auth = Auth Poly1305.Auth
  deriving (Eq, ByteArrayAccess)
@@ -67,7 +71,20 @@ instance Serialize Nonce24 where
     put (Nonce24 bs) = putByteString bs
 
 newtype Nonce8 = Nonce8 Word64
- deriving (Eq, Ord,Data)
+ deriving (Eq, Ord, Data, Serialize)
+
+instance ByteArrayAccess Nonce8 where
+    length _ = 8
+    withByteArray (Nonce8 w64) kont =
+        allocaBytes 8 $ \p -> do
+            poke (castPtr p :: Ptr Word64) $ toBE64 w64
+            kont p
+
+instance Show Nonce8 where
+    showsPrec d nonce = quoted (mappend $ bin2hex nonce)
+
+
+
 
 -- TODO: This should probably be represented by Curve25519.PublicKey, but
 -- ByteString has more instances...
@@ -245,6 +262,9 @@ pktKind OnionResponse3   {} = PacketKind 0x8c
 
 data PacketClass =
     AssymetricClass (Assymetric -> Packet) (Packet -> Assymetric)
+    | AliasedClass (Aliased Assymetric -> Packet) (Packet -> Aliased Assymetric)
+    | NoncedUnclaimedClass (Nonce8 -> UnclaimedAssymetric -> Packet)
+                           (Packet -> (Nonce8, UnclaimedAssymetric))
     | Unclassified
 
 pktClass :: PacketKind -> PacketClass
@@ -257,6 +277,9 @@ pktClass (PacketKind 0x18) = AssymetricClass CookieRequest (\(CookieRequest a) -
 pktClass (PacketKind 0x80) = AssymetricClass OnionRequest0 (\(OnionRequest0 a) -> a)
 pktClass (PacketKind 0x86) = AssymetricClass (DataToRouteResponse . Aliased) (\(DataToRouteResponse (Aliased a)) -> a)
 
+pkgClass (PacketKind 0x83) = AliasedClass Announce (\(Announce a)-> a)
+pkgClass (PacketKind 0x84) = NoncedUnclaimedClass AnnounceResponse (\(AnnounceResponse n8 uncl)-> (n8,uncl))
+
     -- (indexConstr (dataTypeOf (error "dataTypeOf Packet" :: Packet)) 0) -- Ping
 
 instance Serialize Packet where
@@ -266,12 +289,16 @@ instance Serialize Packet where
 getPacket = do
     typ <- get
     case pktClass typ of
-        AssymetricClass toPacket fromPacket -> toPacket <$> get
+        AssymetricClass toPacket _      -> toPacket <$> get
+        AliasedClass    toPacket _      -> toPacket <$> get
+        NoncedUnclaimedClass toPacket _ -> toPacket <$> get <*> get
 
 putPacket p = do
     put $ pktKind p
     case pktClass (pktKind p) of
-        AssymetricClass toPacket fromPacket -> put $ fromPacket p
+        AssymetricClass _ fromPacket      -> put $ fromPacket p
+        AliasedClass    _ fromPacket      -> put $ fromPacket p
+        NoncedUnclaimedClass _ fromPacket -> put $ fromPacket p -- putting a pair.
 
 {-
 data Packet' where