3 files changed, 23 insertions, 0 deletions

diff --git a/src/Data/Torrent/Client.hs b/src/Data/Torrent/Client.hs
index 1b24105f..7b178d41 100644
--- a/src/Data/Torrent/Client.hs
+++ b/src/Data/Torrent/Client.hs
@@ -62,6 +62,7 @@ data ClientImpl =
 
 -- UPnP(!) Bit Torrent !???
 -- 'U' - UPnP NAT Bit Torrent
+ | IBitLord
 
  | IAres
  | IArctic
diff --git a/src/Network/BitTorrent/Core/PeerId.hs b/src/Network/BitTorrent/Core/PeerId.hs
index 5962a6e5..b8dd17e2 100644
--- a/src/Network/BitTorrent/Core/PeerId.hs
+++ b/src/Network/BitTorrent/Core/PeerId.hs
@@ -287,6 +287,8 @@ clientInfo pid = either (const def) id $ runGet getCI (getPeerId pid)
       case leading of
         '-' -> ClientInfo <$> getAzureusImpl <*> getAzureusVersion
         'M' -> ClientInfo <$> pure IMainline <*> getMainlineVersion
+        'e' -> ClientInfo <$> getBitCometImpl <*> getBitCometVersion
+        'F' -> ClientInfo <$> getBitCometImpl <*> getBitCometVersion
         c   -> ClientInfo <$> pure (getShadowImpl c) <*> getShadowVersion
 
     getMainlineVersion = do
@@ -299,6 +301,21 @@ clientInfo pid = either (const def) id $ runGet getCI (getPeerId pid)
       where
         mkVer bs = Version [fromMaybe 0 $ readMaybe $ BC.unpack bs] []
 
+    getBitCometImpl = do
+      bs <- getByteString 3
+      lookAhead $ do
+        _  <- getByteString 2
+        lr <- getByteString 4
+        return $
+          if lr == "LORD" then IBitLord  else
+          if bs == "UTB"  then IBitComet else
+          if bs == "xbc"  then IBitComet else def
+
+    getBitCometVersion = do
+      x <- getWord8
+      y <- getWord8
+      return $ Version [fromIntegral x, fromIntegral y] []
+
     getShadowImpl 'A' = IABC
     getShadowImpl 'O' = IOspreyPermaseed
     getShadowImpl 'Q' = IBTQueue
diff --git a/tests/Data/Torrent/ClientSpec.hs b/tests/Data/Torrent/ClientSpec.hs
index c4c08798..8b3e7342 100644
--- a/tests/Data/Torrent/ClientSpec.hs
+++ b/tests/Data/Torrent/ClientSpec.hs
@@ -17,3 +17,8 @@ spec = do
     it "decode Shad0w style peer id" $ do
       clientInfo "S58B-----xxxxxxxxxxx" `shouldBe` "Shadow-5.8.11"
       clientInfo "T58B-----xxxxxxxxxxx" `shouldBe` "BitTornado-5.8.11"
+
+    it "decode bitcomet style peer id" $ do
+      clientInfo "exbc01xxxxxxxxxxxxxx" `shouldBe` "BitComet-48.49"
+      clientInfo "FUTB01xxxxxxxxxxxxxx" `shouldBe` "BitComet-48.49"
+      clientInfo "exbc01LORDxxxxxxxxxx" `shouldBe` "BitLord-48.49"
\ No newline at end of file