Onion: Support for forwarding from a TCP-relay.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/Data/Tox/Relay.hs b/src/Data/Tox/Relay.hs
index f801d1cd..82fef126 100644
--- a/src/Data/Tox/Relay.hs
+++ b/src/Data/Tox/Relay.hs
@@ -48,11 +48,11 @@ data RelayPacket
     | OnionPacket (OnionRequest N0)
     | OnionPacketResponse (OnionResponse N1)
     -- 0x0A through 0x0F reserved for future use.
-    | RelayData ConId ByteString -- Word8 is a connection id.  Encoded as number 16 to 255.
+    | RelayData ByteString ConId -- Word8 is a connection id.  Encoded as number 16 to 255.
  deriving (Eq,Ord,Show,Data)
 
 packetNumber :: RelayPacket -> Word8
-packetNumber (RelayData (ConId conid) _) = conid -- 0 to 15 not allowed.
+packetNumber (RelayData _ (ConId conid)) = conid -- 0 to 15 not allowed.
 packetNumber rp                          = fromIntegral $ pred $ constrIndex $ toConstr rp
 
 instance Sized RelayPacket where
@@ -71,7 +71,7 @@ instance Sized RelayPacket where
         OnionPacketResponse answer   -> case contramap (`asTypeOf` answer) size of
                                             ConstSize n -> n
                                             VarSize f   -> f answer
-        RelayData _ bs               -> B.length bs
+        RelayData bs _               -> B.length bs
 
 instance Serialize RelayPacket where
 
@@ -88,7 +88,7 @@ instance Serialize RelayPacket where
             7 -> OOBRecv <$> getPublicKey <*> (remaining >>= getBytes)
             8 -> OnionPacket <$> get
             9 -> OnionPacketResponse <$> get
-            conid -> RelayData (ConId conid) <$> (remaining >>= getBytes)
+            conid -> (`RelayData` ConId conid) <$> (remaining >>= getBytes)
 
     put rp = do
         putWord8 $ packetNumber rp
@@ -103,7 +103,7 @@ instance Serialize RelayPacket where
             OOBRecv k bs                 -> putPublicKey k >> putByteString bs
             OnionPacket query            -> put query
             OnionPacketResponse answer   -> put answer
-            RelayData _ bs               -> putByteString bs
+            RelayData bs _               -> putByteString bs
 
 -- | Initial client-to-server handshake message.
 newtype Hello (f :: * -> *) = Hello (Asymm (f HelloData))