1 files changed, 6 insertions, 7 deletions

diff --git a/src/Network/BitTorrent/DHT/ContactInfo.hs b/src/Network/BitTorrent/DHT/ContactInfo.hs
index 172306a1..b7d7f2a2 100644
--- a/src/Network/BitTorrent/DHT/ContactInfo.hs
+++ b/src/Network/BitTorrent/DHT/ContactInfo.hs
@@ -149,20 +149,21 @@ instance Address a => Serialize (SerializeAddress a) where
         | otherwise = return $ error "cannot serialize non-IP SerializeAddress"
 
 
-{- XXX: What happened to the ports?
 instance Serialize SwarmData where
     get = flip SwarmData <$> get
                          <*> ( PSQ.fromList . L.map parseAddr <$> get )
      where
-        parseAddr addr = (unserializeAddress <$> addr)
-                          :-> 0
+        parseAddr (pid,addr,port) = PeerAddr { peerId = pid
+                                             , peerHost = unserializeAddress addr
+                                             , peerPort = port
+                                             }
+                                      :-> 0
 
     put SwarmData{..} = do
         put name
-        put $ L.map (\(addr :-> _) -> (SerializeAddress <$> addr))
+        put $ L.map (\(addr :-> _) -> (peerId addr, SerializeAddress addr, peerPort addr))
                 -- XXX: should we serialize the timestamp?
             $ PSQ.toList peers
--}
 
 knownSwarms :: PeerStore -> [ (InfoHash, Int, Maybe ByteString) ]
 knownSwarms (PeerStore m) = L.map (\(ih,SwarmData q n) -> (ih,PSQ.size q,n)) $ HM.toList m
@@ -194,13 +195,11 @@ instance Monoid PeerStore where
     PeerStore (HM.unionWith swarmInsert a b)
   {-# INLINE mappend #-}
 
-{-
 -- | Can be used to store peers between invocations of the client
 -- software.
 instance Serialize PeerStore where
   get = PeerStore . HM.fromList <$> get
   put (PeerStore m) = put (L.filter (isSwarmOccupied . snd) $ HM.toList m)
--}
 
 -- | Returns all peers associated with a given info hash.
 lookup :: InfoHash -> PeerStore -> [PeerAddr]