tcp: Avoid ponging on new non-pinged connections.

1 files changed, 11 insertions, 4 deletions

diff --git a/src/Data/Tox/Relay.hs b/src/Data/Tox/Relay.hs
index d1e9fb99..c563db8d 100644
--- a/src/Data/Tox/Relay.hs
+++ b/src/Data/Tox/Relay.hs
@@ -4,6 +4,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE KindSignatures             #-}
 {-# LANGUAGE MultiParamTypeClasses      #-}
+{-# LANGUAGE PatternSynonyms            #-}
 {-# LANGUAGE StandaloneDeriving         #-}
 {-# LANGUAGE UndecidableInstances       #-}
 module Data.Tox.Relay where
@@ -61,9 +62,15 @@ data RelayPacket
     | RelayData ByteString ConId
  deriving (Eq,Ord,Show,Data)
 
-packetNumber :: RelayPacket -> Word8
-packetNumber (RelayData _ (ConId conid)) = conid -- 0 to 15 not allowed.
-packetNumber rp                          = fromIntegral $ pred $ constrIndex $ toConstr rp
+newtype PacketNumber = PacketNumber { packetNumberToWord8 :: Word8 }
+ deriving (Eq,Ord,Show)
+
+pattern PingPacket    = PacketNumber 4
+pattern OnionPacketID = PacketNumber 8
+
+packetNumber :: RelayPacket -> PacketNumber
+packetNumber (RelayData _ (ConId conid)) = PacketNumber $ conid -- 0 to 15 not allowed.
+packetNumber rp                          = PacketNumber $ fromIntegral $ pred $ constrIndex $ toConstr rp
 
 instance Sized RelayPacket where
     size = mappend (ConstSize 1) $ VarSize $ \x -> case x of
@@ -101,7 +108,7 @@ instance Serialize RelayPacket where
             conid -> (`RelayData` ConId conid) <$> (remaining >>= getBytes)
 
     put rp = do
-        putWord8 $ packetNumber rp
+        putWord8 $ packetNumberToWord8 $ packetNumber rp
         case rp of
             RoutingRequest k             -> putPublicKey k
             RoutingResponse rpid k       -> put rpid >> putPublicKey k