Completed TCP getNodes query.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/Data/Tox/Relay.hs b/src/Data/Tox/Relay.hs
index 1437c9cd..1fe6d256 100644
--- a/src/Data/Tox/Relay.hs
+++ b/src/Data/Tox/Relay.hs
@@ -45,8 +45,8 @@ data RelayPacket
     | RelayPong Nonce8
     | OOBSend PublicKey ByteString
     | OOBRecv PublicKey ByteString
-    | OnionPacket (OnionRequest N0)
-    | OnionPacketResponse (OnionResponse N1)
+    | OnionPacket Nonce24 (Addressed (Forwarding N2 (OnionMessage Encrypted))) -- (OnionRequest N0)
+    | OnionPacketResponse (OnionMessage Encrypted)
     -- 0x0A through 0x0F reserved for future use.
     | RelayData ByteString ConId
  deriving (Eq,Ord,Show,Data)
@@ -65,9 +65,9 @@ instance Sized RelayPacket where
         RelayPong pingid             -> 8
         OOBSend k bs                 -> 32 + B.length bs
         OOBRecv k bs                 -> 32 + B.length bs
-        OnionPacket query            -> case contramap (`asTypeOf` query) size of
-                                            ConstSize n -> n
-                                            VarSize f   -> f query
+        OnionPacket n24 query        -> 24 + case contramap (`asTypeOf` query) size of
+                                                ConstSize n -> n
+                                                VarSize f   -> f query
         OnionPacketResponse answer   -> case contramap (`asTypeOf` answer) size of
                                             ConstSize n -> n
                                             VarSize f   -> f answer
@@ -86,7 +86,7 @@ instance Serialize RelayPacket where
             5 -> RelayPong <$> get
             6 -> OOBSend <$> getPublicKey <*> (remaining >>= getBytes)
             7 -> OOBRecv <$> getPublicKey <*> (remaining >>= getBytes)
-            8 -> OnionPacket <$> get
+            8 -> OnionPacket <$> get <*> get
             9 -> OnionPacketResponse <$> get
             conid -> (`RelayData` ConId conid) <$> (remaining >>= getBytes)
 
@@ -101,7 +101,7 @@ instance Serialize RelayPacket where
             RelayPong pingid             -> put pingid
             OOBSend k bs                 -> putPublicKey k >> putByteString bs
             OOBRecv k bs                 -> putPublicKey k >> putByteString bs
-            OnionPacket query            -> put query
+            OnionPacket n24 query        -> put n24 >> put query
             OnionPacketResponse answer   -> put answer
             RelayData bs _               -> putByteString bs