Parse IPv4 addresses even when using variadic IP type.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/Network/BitTorrent/Address.hs b/src/Network/BitTorrent/Address.hs
index 8dbe1583..c0c0a3f8 100644
--- a/src/Network/BitTorrent/Address.hs
+++ b/src/Network/BitTorrent/Address.hs
@@ -18,6 +18,8 @@
 {-# LANGUAGE MultiParamTypeClasses      #-}
 {-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE DeriveFunctor              #-}
+{-# LANGUAGE DeriveFoldable             #-}
+{-# LANGUAGE DeriveTraversable          #-}
 {-# LANGUAGE TemplateHaskell            #-}
 {-# OPTIONS -fno-warn-orphans           #-}
 module Network.BitTorrent.Address
@@ -443,7 +445,7 @@ instance Serialize IP where
       case n of
         4  -> IPv4 <$> get
         16 -> IPv6 <$> get
-        _ -> fail "Wrong number of bytes remaining to parse IP"
+        _ -> fail (show n ++ " is the wrong number of remaining bytes to parse IP")
 
 instance Serialize IPv4 where
     put = putWord32host    .  toHostAddress
@@ -693,7 +695,7 @@ distance (NodeId a) (NodeId b) = NodeDistance (BS.pack (BS.zipWith xor a b))
 data NodeAddr a = NodeAddr
   { nodeHost ::                !a
   , nodePort :: {-# UNPACK #-} !PortNumber
-  } deriving (Eq, Typeable, Functor)
+  } deriving (Eq, Typeable, Functor, Foldable, Traversable)
 
 instance Show a => Show (NodeAddr a) where
   showsPrec i NodeAddr {..}
@@ -745,7 +747,7 @@ fromPeerAddr PeerAddr {..} = NodeAddr
 data NodeInfo a = NodeInfo
   { nodeId   :: !NodeId
   , nodeAddr :: !(NodeAddr a)
-  } deriving (Show, Eq, Functor)
+  } deriving (Show, Eq, Functor, Foldable, Traversable)
 
 instance Eq a => Ord (NodeInfo a) where
   compare = comparing nodeId