[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/bittorr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/04/01 23:20:55

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTGlobals.ml bTTypes.ml 

Log message:
        patch #5003

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.779&tr2=1.780&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTGlobals.ml.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTTypes.ml.diff?tr1=1.31&tr2=1.32&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.779 mldonkey/distrib/ChangeLog:1.780
--- mldonkey/distrib/ChangeLog:1.779    Sat Apr  1 23:19:21 2006
+++ mldonkey/distrib/ChangeLog  Sat Apr  1 23:20:55 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/04/02
+5003: BT: Improve client recognition (zet)
 5002: Overnet: Fix Out of Memory Exception (zet)
 
 2006/03/31
Index: mldonkey/src/networks/bittorrent/bTGlobals.ml
diff -u mldonkey/src/networks/bittorrent/bTGlobals.ml:1.53 
mldonkey/src/networks/bittorrent/bTGlobals.ml:1.54
--- mldonkey/src/networks/bittorrent/bTGlobals.ml:1.53  Wed Mar 15 20:55:15 2006
+++ mldonkey/src/networks/bittorrent/bTGlobals.ml       Sat Apr  1 23:20:55 2006
@@ -367,6 +367,7 @@
       | "BS" -> Brand_btslave
       | "BX" -> Brand_bittorrentx
       | "CT" -> Brand_ctorrent
+      | "CD" -> Brand_ctorrent
       | "LT" -> Brand_libtorrent
       | "MT" -> Brand_moonlighttorrent
       | "SB" -> Brand_swiftbit
@@ -382,12 +383,27 @@
       | "MP" -> Brand_moopolice
       | "UT" -> Brand_utorrent
       | "KT" -> Brand_ktorrent
+      | "LP" -> Brand_lphant
+      | "TR" -> Brand_transmission
+      | "HN" -> Brand_hydranode
+      | "RT" -> Brand_retriever
       | _ -> Brand_unknown
     in
     if brand = Brand_unknown then None else
       let version = 
-        if brand = Brand_bitcomet then (String.sub s 4 1) ^ "." ^ (String.sub 
s 5 2) 
-        else (dot_string (String.sub s 3 4)) 
+        match brand with
+          | Brand_bitcomet -> (String.sub s 4 1) ^ "." ^ (String.sub s 5 2)
+          | Brand_utorrent -> (String.sub s 3 1) ^ "." ^ (String.sub s 4 1) ^ 
"." ^ (String.sub s 5 1)
+          | Brand_ctorrent 
+          | Brand_transmission -> (String.sub s 3 2) ^ "." ^ (String.sub s 5 2)
+          | Brand_ktorrent -> 
+              let x = match s.[5] with 
+                | 'R' -> " RC" ^ (String.sub s 6 1)
+                | 'D' -> " Dev"
+                | _ -> ""
+              in
+              (String.sub s 3 1) ^ "." ^ (String.sub s 4 1) ^ x
+          | _ -> (dot_string (String.sub s 3 4)) 
       in
       Some (brand, version)
   end else
@@ -401,6 +417,7 @@
      | "S" -> Brand_shadow
      | "A" -> Brand_abc
      | "U" -> Brand_upnp
+     | "O" -> Brand_osprey
      | _ -> Brand_unknown
     in
     let bv = ref None in
@@ -443,15 +460,18 @@
       (0, "S587Plus", Brand_btplus, "");
       (5, "Azureus", Brand_azureus, "2.0.3.2");
       (0, "-G3", Brand_g3torrent, "");
+      (0, "-AR", Brand_arctic, "");
       (4, "btfans", Brand_simplebt, "");
       (0, "btuga", Brand_btugaxp, "");
+      (0, "BTuga", Brand_btugaxp, "");
       (0, "DansClient", Brand_xantorrent, "");
       (0, "Deadman Walking-", Brand_deadmanwalking, "");
       (0, "346-", Brand_torrenttopia, "");
       (0, "271-", Brand_greedbt, "2.7.1");
-      (0, "BG", Brand_btgetit, "");
+      (10, "BG", Brand_btgetit, "");
       (0, "a00---0", Brand_swarmy, "");
       (0, "a02---0", Brand_swarmy, "");
+      (0, "10-------", Brand_jvtorrent, "");
       (0, "T00---0", Brand_teeweety, "") ]
   in
   let len = List.length !simple_list in
Index: mldonkey/src/networks/bittorrent/bTTypes.ml
diff -u mldonkey/src/networks/bittorrent/bTTypes.ml:1.31 
mldonkey/src/networks/bittorrent/bTTypes.ml:1.32
--- mldonkey/src/networks/bittorrent/bTTypes.ml:1.31    Sun Feb  5 18:35:51 2006
+++ mldonkey/src/networks/bittorrent/bTTypes.ml Sat Apr  1 23:20:55 2006
@@ -97,6 +97,12 @@
 | Brand_greedbt
 | Brand_btgetit
 | Brand_ktorrent
+| Brand_lphant
+| Brand_transmission
+| Brand_hydranode
+| Brand_jvtorrent
+| Brand_retriever
+| Brand_osprey
 
 let brand_list = [ 
    ( Brand_unknown          , "unknown"                , "unk" ) ;
@@ -149,6 +155,12 @@
    ( Brand_greedbt          , "GreedBT"                , "gbt" ) ;
    ( Brand_btgetit          , "BTGetit"                , "btg" ) ;
    ( Brand_ktorrent         , "KTorrent"               , "kto" ) ;
+   ( Brand_lphant           , "Lphant"                 , "lph" ) ;
+   ( Brand_transmission     , "Transmission"           , "tra" ) ;
+   ( Brand_hydranode        , "Hydranode"              , "hyd" ) ;
+   ( Brand_jvtorrent        , "JVtorrent"              , "jvt" ) ;
+   ( Brand_retriever        , "Retriever"              , "ret" ) ;
+   ( Brand_osprey           , "Osprey permaseed"       , "osp" ) ;
   ] 
 
 let brand_count = List.length brand_list