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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/06/17 01:25:11

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTClients.ml 

Log message:
        patch #6011

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1278&r2=1.1279
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTClients.ml?cvsroot=mldonkey&r1=1.93&r2=1.94

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1278
retrieving revision 1.1279
diff -u -b -r1.1278 -r1.1279
--- distrib/ChangeLog   17 Jun 2007 01:24:27 -0000      1.1278
+++ distrib/ChangeLog   17 Jun 2007 01:25:10 -0000      1.1279
@@ -15,6 +15,7 @@
 =========
 
 2007/06/17
+6011: BT: Send no_peer_id to trackers to save some bandwidth (berni)
 6010: Update syslog.ml to version 1.4
 5995: EDK: Better handle permission denied errors for shared/downloading files
 5992: BT/IP block: Fix country-based IP blocking

Index: src/networks/bittorrent/bTClients.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- src/networks/bittorrent/bTClients.ml        17 Jun 2007 01:20:19 -0000      
1.93
+++ src/networks/bittorrent/bTClients.ml        17 Jun 2007 01:25:10 -0000      
1.94
@@ -110,6 +110,16 @@
         | _ -> [],true,local_downloaded, left
   in
 
+  let args = ("no_peer_id", "1") :: ("compact", "1") :: args in
+  let args = if !!numwant > -1 then
+      ("numwant", string_of_int !!numwant) :: args else args
+  in
+  let args = if !!send_key then
+      ("key", Sha1.to_hexa !!client_uid) :: args else args
+  in
+   let args = if !!force_client_ip then
+      ("ip", Ip.to_string !!set_client_ip) :: args else args
+  in
   let args =
     ("info_hash", Sha1.direct_to_string file.file_id) ::
     ("peer_id", Sha1.direct_to_string !!client_uid) ::
@@ -117,18 +127,9 @@
     ("uploaded", Int64.to_string file.file_uploaded) ::
     ("downloaded", Int64.to_string downloaded) ::
     ("left", Int64.to_string left) ::
-    ("compact","1") ::
     args
   in
-  let args = if !!send_key then
-      ("key", Sha1.to_hexa !!client_uid) :: args else args
-  in
-  let args = if !!numwant > -1 then
-      ("numwant", string_of_int !!numwant) :: args else args
-  in
-  let args = if !!force_client_ip then
-      ("ip", Ip.to_string !!set_client_ip) :: args else args
-  in
+  
 
   let enabled_trackers =
     let enabled_trackers = List.filter (fun t -> tracker_is_enabled t) 
file.file_trackers in