[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/04/08 14:31:43

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml 
        src/networks/donkey: donkeyMain.ml donkeyOptions.ml 

Log message:
        patch #5853

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1223&r2=1.1224
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.203&r2=1.204
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyMain.ml?cvsroot=mldonkey&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOptions.ml?cvsroot=mldonkey&r1=1.62&r2=1.63

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1223
retrieving revision 1.1224
diff -u -b -r1.1223 -r1.1224
--- distrib/ChangeLog   3 Apr 2007 21:51:58 -0000       1.1223
+++ distrib/ChangeLog   8 Apr 2007 14:31:43 -0000       1.1224
@@ -14,6 +14,18 @@
 ChangeLog
 =========
 
+2007/04/08
+5853: New option defaults
+- download_sample_size 100, 10 is too low, download rate is computed wrong
+- EDK-propagate_sources false, this activates outdated MLDonkey-style source
+  exchange, MLDonkey supports eMule-style source exchange which is not affected
+  by this option
+- EDK-update_server_list_server should be false, there are lots of fake servers
+  out there, trust only servers from trusted server lists. For more details 
read
+  http://mldonkey.sourceforge.net/ServerList#Fake_search_results
+- EDK-upload_full_chunks should be true to reflect the same default eMule uses
+- EDK-upload_compression_table_size should not be smaller than max_upload_slots
+
 2007/04/03
 5821: New variables for file_completed_cmd:
       file_group_cnt, file_group_user, file_group_dir

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -b -r1.203 -r1.204
--- src/daemon/common/commonOptions.ml  8 Mar 2007 21:01:02 -0000       1.203
+++ src/daemon/common/commonOptions.ml  8 Apr 2007 14:31:43 -0000       1.204
@@ -1559,7 +1559,7 @@
 
 let download_sample_size = define_expert_option current_section 
["download_sample_size"]
   "How many samples go into an estimate of transfer rates"
-    int_option 10
+    int_option 100
 
 let calendar = define_expert_option current_section ["calendar"]
   "This option defines a set of date at which some commands have to be 
executed.
@@ -1589,7 +1589,7 @@
 let options_version = define_expert_option current_section ["options_version"]
   ~internal: true
   "(internal option)"
-    int_option 16
+    int_option 17
 
 let max_comments_per_file = define_expert_option current_section 
["max_comments_per_file"]
   "Maximum number of comments per file"
@@ -2174,4 +2174,8 @@
         messages_filter =:= "DI-Emule|ZamBoR|Ketamine|eMule FX|AUTOMATED 
MESSAGE";
       update 16
 
+  | 16 ->
+      if !!download_sample_size = 10 then download_sample_size =:= 100;
+      update 17
+
   | _ -> ()

Index: src/networks/donkey/donkeyMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- src/networks/donkey/donkeyMain.ml   28 Jan 2007 20:39:59 -0000      1.67
+++ src/networks/donkey/donkeyMain.ml   8 Apr 2007 14:31:43 -0000       1.68
@@ -368,6 +368,11 @@
       if !!upload_timeout = 60. then
         upload_timeout =:= 600.;
       update 3
+  | 3 ->
+      propagate_sources =:= false;
+      update_server_list_server =:= false;
+      upload_full_chunks =:= true;
+      update 4
   | _ -> ()
 
 

Index: src/networks/donkey/donkeyOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOptions.ml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- src/networks/donkey/donkeyOptions.ml        19 Feb 2007 21:19:44 -0000      
1.62
+++ src/networks/donkey/donkeyOptions.ml        8 Apr 2007 14:31:43 -0000       
1.63
@@ -80,7 +80,7 @@
 let update_server_list_server = define_option donkey_section 
["update_server_list_server"]
   "Set this option to false if you don't want to
   receive new servers from servers"
-    bool_option true
+    bool_option false
 
 let update_server_list_server_met = define_option donkey_section 
["update_server_list_server_met"]
   "Set this option to false if you don't want to
@@ -116,8 +116,10 @@
     bool_option false
 
 let propagate_sources = define_expert_option donkey_section 
["propagate_sources"]
-  "Allow mldonkey to propagate your sources to other donkey clients"
-    bool_option true
+  "Allow mldonkey to propagate your sources to other mldonkey clients.
+   This function is superseeded by eMule-style source exchange,
+   this option is outdated"
+    bool_option false
 
 let max_sources_per_file = define_option donkey_section 
["max_sources_per_file"]
   "Maximal number of sources for each file"
@@ -177,7 +179,7 @@
 
 let upload_full_chunks = define_expert_option donkey_section 
["upload_full_chunks"]
   "If true, each client is allowed to receive one chunk, this setting 
overrides upload_lifetime"
-    bool_option false
+    bool_option true
 
 let upload_complete_chunks = define_expert_option donkey_section 
["upload_complete_chunks"]
   "If true, each client is allowed to complete only one chunk, independent, if 
it is empty or
@@ -233,14 +235,13 @@
   ~restart: true
   "Size of the cache table in entries (ca. 2 * 180 kbytes). zones have to be
   compressed at once, but only parts of it are sent at a time (10 kbytes).
-  to reduce diskaccess and repeated compression to a minimum, size should be
-  at least the number of total upload slots. restart of core is required."
+  Minimum value is the number of total upload slots."
     int_option 20
 
 let _ =
   option_hook upload_compression_table_size (fun _ ->
-    if !!upload_compression_table_size < 1 then
-        upload_compression_table_size =:= 1
+    if !!upload_compression_table_size < !!max_upload_slots then
+        upload_compression_table_size =:= !!max_upload_slots
   )
 
 let connected_server_timeout = define_expert_option donkey_section 
["connected_server_timeout"]
@@ -336,7 +337,7 @@
 let options_version = define_expert_option donkey_section ["options_version"]
   ~internal: true
   "(internal option)"
-    int_option 3
+    int_option 4
 
 let gui_donkey_options_panel =
   [