Fix typo, fix Aliased Assymetric serialization.

1 files changed, 24 insertions, 5 deletions

diff --git a/ToxMessage.hs b/ToxMessage.hs
index 6248facf..1d139c93 100644
--- a/ToxMessage.hs
+++ b/ToxMessage.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE DeriveFunctor, DeriveTraversable,DeriveDataTypeable #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE FlexibleInstances #-}
 module ToxMessage where
 
 import Data.ByteString (ByteString)
@@ -52,7 +53,8 @@ instance Serialize Auth where
 -- other and is often refered to as your "real public key" by the Tox
 -- documents.  For the purposes of the DHT, it is an alias.
 newtype Aliased a = Aliased a
- deriving (Eq,Ord,Show,Data,Functor,Foldable,Traversable,Serialize)
+ deriving (Eq,Ord,Show,Data,Functor,Foldable,Traversable)
+
 
 newtype Nonce24 = Nonce24 ByteString
  deriving (Eq, Ord, ByteArrayAccess,Data)
@@ -142,10 +144,25 @@ data Assymetric = Assymetric
  deriving (Eq, Ord,Data)
 
 -- get requires isolate.
+-- sender key, then nonce
 instance Serialize Assymetric where
     get = Assymetric <$> get <*> get
     put (Assymetric key dta) = put key >> put dta
 
+-- Aliased packets have the sender key and nonce reversed.
+instance Serialize (Aliased Assymetric) where
+    get = do
+        nonce <- get
+        key <- get
+        dta <- get
+        return $ Aliased (Assymetric key (UnclaimedAssymetric nonce dta))
+
+    put (Aliased (Assymetric key (UnclaimedAssymetric nonce dta))) = do
+        put nonce
+        put key
+        put dta
+
+
 newtype Cookie = Cookie UnclaimedAssymetric
  deriving (Eq, Ord,Data)
 
@@ -185,6 +202,7 @@ data Packet where
 
     OnionRequest3 :: ByteString -> Symmetric -> Packet -- 0x82
 
+    -- reverse of typical serialization, nonce and then sender key
     Announce :: Aliased Assymetric -> Packet --0x83
     AnnounceResponse :: Nonce8 -> UnclaimedAssymetric -> Packet -- 0x84
 
@@ -275,12 +293,13 @@ pktClass (PacketKind 4) = AssymetricClass SendNodes (\(SendNodes a) -> a)
 
 pktClass (PacketKind 0x18) = AssymetricClass CookieRequest (\(CookieRequest a) -> a)
 pktClass (PacketKind 0x80) = AssymetricClass OnionRequest0 (\(OnionRequest0 a) -> a)
-pktClass (PacketKind 0x86) = AssymetricClass (DataToRouteResponse . Aliased) (\(DataToRouteResponse (Aliased a)) -> a)
+-- pktClass (PacketKind 0x86) = AssymetricClass (DataToRouteResponse . Aliased) (\(DataToRouteResponse (Aliased a)) -> a)
+
+pktClass (PacketKind 0x83) = AliasedClass Announce (\(Announce a)-> a)
+pktClass (PacketKind 0x84) = NoncedUnclaimedClass AnnounceResponse (\(AnnounceResponse n8 uncl)-> (n8,uncl))
 
-pkgClass (PacketKind 0x83) = AliasedClass Announce (\(Announce a)-> a)
-pkgClass (PacketKind 0x84) = NoncedUnclaimedClass AnnounceResponse (\(AnnounceResponse n8 uncl)-> (n8,uncl))
+pktClass _ = Unclassified
 
-    -- (indexConstr (dataTypeOf (error "dataTypeOf Packet" :: Packet)) 0) -- Ping
 
 instance Serialize Packet where
     get = getPacket