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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/07/09 23:50:55

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

Log message:
        patch #5996

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1301&r2=1.1302
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTGlobals.ml?cvsroot=mldonkey&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTTypes.ml?cvsroot=mldonkey&r1=1.44&r2=1.45

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1301
retrieving revision 1.1302
diff -u -b -r1.1301 -r1.1302
--- distrib/ChangeLog   9 Jul 2007 23:45:44 -0000       1.1301
+++ distrib/ChangeLog   9 Jul 2007 23:50:54 -0000       1.1302
@@ -15,6 +15,7 @@
 =========
 
 2007/07/10
+5996: BT: Recognize more client types (orbit)
 6065: DirectConnect: Support dc++ hublist in web_infos
 6063: BT: Better detect single-file torrents
 

Index: src/networks/bittorrent/bTGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTGlobals.ml,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- src/networks/bittorrent/bTGlobals.ml        3 Jun 2007 13:13:17 -0000       
1.79
+++ src/networks/bittorrent/bTGlobals.ml        9 Jul 2007 23:50:54 -0000       
1.80
@@ -481,6 +481,10 @@
       | "A~" -> Brand_ares
       | "AX" -> Brand_bitpump
       | "DE" -> Brand_deluge
+      | "TT" -> Brand_tuotu
+      | "XL" -> Brand_xunlei
+      | "FT" -> Brand_foxtorrent
+      | "BF" -> Brand_bitflu
       | _ -> Brand_unknown
     in
     if brand = Brand_unknown then None else
@@ -490,6 +494,7 @@
           | Brand_bitpump
           | Brand_bitcomet -> (String.sub s 4 1) ^ "." ^ (String.sub s 5 2)
           (* 3.45 *)
+          | Brand_tuotu
           | Brand_utorrent -> (String.sub s 3 1) ^ "." ^ (String.sub s 4 1) ^ 
"." ^ (String.sub s 5 1)
           (* 34.56 *)
           | Brand_ctorrent
@@ -506,6 +511,8 @@
           | Brand_bitrocket -> (String.sub s 3 1) ^ "." ^ (String.sub s 4 1) ^ 
"(" ^ (String.sub s 5 2) ^ ")"
           (* v 3456 *)
           | Brand_xtorrent -> "v" ^ (strip_leading_zeroes (String.sub s 3 4))
+          (* BitFlu is too complicated YMDD (Y+M -> HEX) eg. 7224 is 
2007.02.24 *)
+          | Brand_bitflu -> ""
           (* 3.4.5.6 *)
           | _ -> (dot_string (String.sub s 3 4)) 
       in

Index: src/networks/bittorrent/bTTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTTypes.ml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- src/networks/bittorrent/bTTypes.ml  26 May 2007 23:21:47 -0000      1.44
+++ src/networks/bittorrent/bTTypes.ml  9 Jul 2007 23:50:54 -0000       1.45
@@ -120,6 +120,10 @@
 | Brand_bitpump
 | Brand_deluge
 | Brand_btuga
+| Brand_tuotu
+| Brand_xunlei
+| Brand_foxtorrent
+| Brand_bitflu
 
 let brand_list = [ 
    ( Brand_unknown          , "unknown"                , "unk" ) ;
@@ -195,6 +199,10 @@
    ( Brand_bitpump          , "BitPump"                , "bpu" ) ;
    ( Brand_deluge           , "Deluge"                 , "del" ) ;
    ( Brand_btuga            , "BTuga Revolution"       , "btr" ) ;
+   ( Brand_tuotu            , "Tuotu"                  , "tuo" ) ;
+   ( Brand_xunlei           , "XunLei"                 , "xun" ) ;
+   ( Brand_foxtorrent       , "FoxTorrent"             , "fox" ) ;
+   ( Brand_bitflu           , "BitFlu"                 , "flu" ) ;
   ] 
 
 let brand_count = List.length brand_list