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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/09 16:17:19

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyOptions.ml donkeyServers.ml 
                             donkeyShare.ml 

Log message:
        patch #5446

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1046&r2=1.1047
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOptions.ml?cvsroot=mldonkey&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyServers.ml?cvsroot=mldonkey&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyShare.ml?cvsroot=mldonkey&r1=1.54&r2=1.55

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1046
retrieving revision 1.1047
diff -u -b -r1.1046 -r1.1047
--- distrib/ChangeLog   8 Oct 2006 14:20:21 -0000       1.1046
+++ distrib/ChangeLog   9 Oct 2006 16:17:19 -0000       1.1047
@@ -14,6 +14,12 @@
 ChangeLog
 =========
 
+2006/10/09
+5446: EDK: Small update for EDK publish patch 5430
+- new option max_published_files
+  maximum number of files published to servers per minute, eMule default 200
+- bug fix for patch 5430, publish also to non-preferred servers
+
 2006/10/08
 5430: EDK: Improve file publishing
 - publish no more than 200 files/minute to avoid server-side blacklisting,

Index: src/networks/donkey/donkeyOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOptions.ml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- src/networks/donkey/donkeyOptions.ml        8 Oct 2006 14:20:22 -0000       
1.53
+++ src/networks/donkey/donkeyOptions.ml        9 Oct 2006 16:17:19 -0000       
1.54
@@ -246,6 +246,10 @@
   "min connected users for each server"
     int_option 0
 
+let max_published_files = define_option donkey_section ["max_published_files"]
+  "maximum number of files published to servers per minute, eMule default 200"
+    int_option 200
+
 let login = define_option donkey_section ["login"]
   "login of client on eDonkey network (nothing default to global one)"
     string_option ""

Index: src/networks/donkey/donkeyServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- src/networks/donkey/donkeyServers.ml        8 Oct 2006 14:20:22 -0000       
1.60
+++ src/networks/donkey/donkeyServers.ml        9 Oct 2006 16:17:19 -0000       
1.61
@@ -825,10 +825,13 @@
                (string_of_server s)
                (match s.server_nusers with None -> 0L | Some v -> v)
                connection_time;
-          if not s.server_master && s.server_preferred then
+          if not s.server_master then
               begin
-                if (!nmasters < max_allowed_connected_servers) then
+                if (!nmasters < max_allowed_connected_servers) then begin
+                 if !verbose_location then
+                   lprintf_nl "master servers: raising %s" (string_of_server 
s);
                     make_master s
+                 end
                 else if s.server_sent_all_queries then
                   match !masters with
                       [] -> disconnect_old_server s

Index: src/networks/donkey/donkeyShare.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyShare.ml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- src/networks/donkey/donkeyShare.ml  8 Oct 2006 14:20:22 -0000       1.54
+++ src/networks/donkey/donkeyShare.ml  9 Oct 2006 16:17:19 -0000       1.55
@@ -164,9 +164,6 @@
 
 (* publish shared files to servers, called once per minute *)
 let send_new_shared () =
-(* emule sends 200 files in this period to avoid server blacklist *)
-  let limit_per_minute = 200 in
-
 (* sort list to publish least published files first *)
   let ( |> ) x f = f x in
   let all_shared =
@@ -196,7 +193,7 @@
           match f.file_shared with
            Some impl ->
              if not (List.mem (CommonServer.as_server s.server_server) 
impl.impl_shared_servers)
-               && List.length !files_to_send < limit_per_minute then
+               && List.length !files_to_send < !!max_published_files then
              files_to_send := f :: !files_to_send
            | _ -> () (* this case never happens *)
        ) all_shared;