PSQ instead of list for peer set. Also: dhtd "swarms" command.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/BitTorrent/DHT/Message.hs
index 9d66741f..d31cce82 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/BitTorrent/DHT/Message.hs
@@ -86,6 +86,7 @@ module Network.BitTorrent.DHT.Message
 import Control.Applicative
 import Data.BEncode as BE
 import Data.BEncode.BDict
+import Data.ByteString (ByteString)
 import Data.List as L
 import Data.Monoid
 import Data.Serialize as S
@@ -251,6 +252,9 @@ peers_key = "values"
 token_key :: BKey
 token_key = "token"
 
+name_key :: BKey
+name_key = "name"
+
 instance (Typeable ip, Serialize ip) => BEncode (GotPeers ip) where
   toBEncode GotPeers {..} = toDict $
     case peers of
@@ -295,11 +299,17 @@ data Announce = Announce
     -- | infohash of the torrent;
   , topic    :: InfoHash
 
+    -- | some clients announce the friendly name of the torrent here.
+  , announcedName :: Maybe ByteString
+
     -- | the port /this/ peer is listening;
   , port     :: PortNumber
 
+    -- TODO: optional boolean "seed" key
+
     -- | received in response to a previous get_peers query.
   , sessionToken :: Token
+
   } deriving (Show, Eq, Typeable)
 
 port_key :: BKey
@@ -312,6 +322,7 @@ instance BEncode Announce where
   toBEncode Announce {..} = toDict $
        implied_port_key .=? flagField impliedPort
     .: info_hash_key    .=! topic
+    .: name_key         .=? announcedName
     .: port_key         .=! port
     .: token_key        .=! sessionToken
     .: endDict
@@ -321,6 +332,7 @@ instance BEncode Announce where
   fromBEncode = fromDict $ do
     Announce <$> (boolField <$> optional (field (req implied_port_key)))
              <*>! info_hash_key
+             <*>? name_key
              <*>! port_key
              <*>! token_key
     where