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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/03/27 13:22:35

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

Log message:
        patch #7138

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1410&r2=1.1411
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTGlobals.ml?cvsroot=mldonkey&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTTypes.ml?cvsroot=mldonkey&r1=1.46&r2=1.47

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1410
retrieving revision 1.1411
diff -u -b -r1.1410 -r1.1411
--- distrib/ChangeLog   27 Mar 2010 13:21:12 -0000      1.1410
+++ distrib/ChangeLog   27 Mar 2010 13:22:35 -0000      1.1411
@@ -15,6 +15,7 @@
 =========
 
 2010/03/27
+7138: BT: Recognize more client brands (ygrek)
 7137: Fix error in calculating average upload speed for client (ygrek)
 7136: GTK2 GUI: start downloads from search results items
       by double-click (soulcatcher)

Index: src/networks/bittorrent/bTGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTGlobals.ml,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- src/networks/bittorrent/bTGlobals.ml        20 Mar 2010 13:36:54 -0000      
1.83
+++ src/networks/bittorrent/bTGlobals.ml        27 Mar 2010 13:22:35 -0000      
1.84
@@ -467,6 +467,7 @@
       | "ZT" -> Brand_ziptorrent
       | "bk" -> Brand_bitkitten
       | "MP" -> Brand_moopolice
+      | "UM" -> Brand_utorrent_mac
       | "UT" -> Brand_utorrent
       | "KT" -> Brand_ktorrent
       | "LP" -> Brand_lphant
@@ -484,9 +485,15 @@
       | "AX" -> Brand_bitpump
       | "DE" -> Brand_deluge
       | "TT" -> Brand_tuotu
+      | "SD" (* Thunder (aka XùnLéi) *)
       | "XL" -> Brand_xunlei
       | "FT" -> Brand_foxtorrent
       | "BF" -> Brand_bitflu
+      | "OS" -> Brand_oneswarm
+      | "LW" -> Brand_limewire
+      | "HL" -> Brand_halite
+      | "MR" -> Brand_miro
+      | "PD" -> Brand_pando
       | _ -> Brand_unknown
     in
     if brand = Brand_unknown then None else
@@ -495,12 +502,15 @@
           (* 4.56 *)
           | Brand_bitpump
           | Brand_bitcomet -> (String.sub s 4 1) ^ "." ^ (String.sub s 5 2)
-          (* 3.45 *)
+          (* 3.4.5 *)
           | Brand_tuotu
+          | Brand_utorrent_mac
+          | Brand_oneswarm
           | Brand_utorrent -> (String.sub s 3 1) ^ "." ^ (String.sub s 4 1) ^ 
"." ^ (String.sub s 5 1)
+          (* 3.45 *)
+          | Brand_transmission -> (String.sub s 3 1) ^ "." ^ (String.sub s 4 2)
           (* 34.56 *)
-          | Brand_ctorrent
-          | Brand_transmission -> (strip_leading_zeroes (String.sub s 3 2)) ^ 
"." ^ (strip_leading_zeroes(String.sub s 5 2))
+          | Brand_ctorrent -> (strip_leading_zeroes (String.sub s 3 2)) ^ "." 
^ (strip_leading_zeroes(String.sub s 5 2))
           (* 3.4.5->[R=RC.6|D=Dev|''] *)
           | Brand_ktorrent -> 
               let x = match s.[5] with 
@@ -596,6 +606,7 @@
       (0,  "btpd",              Brand_btpd,            (dot_string(String.sub 
s 5 3)));
       (0,  "XBT",               Brand_xbt,             (dot_string(String.sub 
s 3 3)));
       (0,  "-FG",               Brand_flashget,        (dot_string(String.sub 
s 4 3)));
+      (0,  "-SP",               Brand_bitspirit,       (dot_string(String.sub 
s 3 3)));
     ]
   in
   let len = List.length !simple_list in

Index: src/networks/bittorrent/bTTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTTypes.ml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- src/networks/bittorrent/bTTypes.ml  20 Mar 2010 13:36:54 -0000      1.46
+++ src/networks/bittorrent/bTTypes.ml  27 Mar 2010 13:22:35 -0000      1.47
@@ -92,6 +92,7 @@
 | Brand_xbt
 | Brand_ziptorrent
 | Brand_moopolice
+| Brand_utorrent_mac
 | Brand_utorrent
 | Brand_opera
 | Brand_torrenttopia
@@ -124,6 +125,10 @@
 | Brand_xunlei
 | Brand_foxtorrent
 | Brand_bitflu
+| Brand_oneswarm
+| Brand_halite
+| Brand_miro
+| Brand_pando
 
 let brand_list = [ 
    ( Brand_unknown          , "unknown"                , "unk" ) ;
@@ -171,6 +176,7 @@
    ( Brand_xbt              , "XBT"                    , "xbt" ) ;
    ( Brand_ziptorrent       , "ZipTorrent"             , "zit" ) ;
    ( Brand_moopolice        , "MooPolice"              , "moo" ) ;
+   ( Brand_utorrent_mac     , "uTorrent for Mac"       , "uTm" ) ;
    ( Brand_utorrent         , "uTorrent"               , "uTo" ) ;
    ( Brand_opera            , "Opera"                  , "opr" ) ;
    ( Brand_torrenttopia     , "TorrentTopia"           , "tt" ) ;
@@ -203,6 +209,10 @@
    ( Brand_xunlei           , "XunLei"                 , "xun" ) ;
    ( Brand_foxtorrent       , "FoxTorrent"             , "fox" ) ;
    ( Brand_bitflu           , "BitFlu"                 , "flu" ) ;
+   ( Brand_oneswarm         , "OneSwarm"               , "osw" ) ;
+   ( Brand_halite           , "Halite"                 , "hal" ) ;
+   ( Brand_miro             , "Miro"                   , "mir" ) ;
+   ( Brand_pando            , "Pando"                  , "pan" ) ;
   ] 
 
 let brand_count = List.length brand_list