[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co... |
|
Date: |
Tue, 27 Jun 2006 21:20:28 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 06/06/27 21:20:28
Modified files:
distrib : ChangeLog
src/daemon/common: commonOptions.ml
src/daemon/driver: driverCommands.ml driverInteractive.ml
src/gtk2/gui : guiConfig.ml
src/networks/donkey: donkeyComplexOptions.ml donkeyGlobals.ml
donkeyOptions.ml donkeyServers.ml
Log message:
patch #5207
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.906&r2=1.907
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.157&r2=1.158
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.158&r2=1.159
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiConfig.ml?cvsroot=mldonkey&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyComplexOptions.ml?cvsroot=mldonkey&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOptions.ml?cvsroot=mldonkey&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyServers.ml?cvsroot=mldonkey&r1=1.56&r2=1.57
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.906
retrieving revision 1.907
diff -u -b -r1.906 -r1.907
--- distrib/ChangeLog 27 Jun 2006 21:17:29 -0000 1.906
+++ distrib/ChangeLog 27 Jun 2006 21:20:28 -0000 1.907
@@ -15,6 +15,8 @@
=========
2006/06/27
+5207: Remove some obsolete options: html_mods_vd_queues, ED2K-initial_score,
+ ED2K-max_dialog_history, ED2K-immediate_master
5206: Remove Kiss DP500 support
5200: BT: Do not start downloads if no usable trackers are found in
file.torrent
MLDonkey only supports http:// style trackers, not udp:// or dht://
Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- src/daemon/common/commonOptions.ml 27 Jun 2006 21:17:29 -0000 1.157
+++ src/daemon/common/commonOptions.ml 27 Jun 2006 21:20:28 -0000 1.158
@@ -754,9 +754,6 @@
let html_mods_vd_prio = define_expert_option current_section
["html_mods_vd_prio"] "Whether to display the Priority column in vd
output" bool_option true
-let html_mods_vd_queues = define_expert_option current_section
- ["html_mods_vd_queues"] "Whether to display the Queues in vd # output"
bool_option true
-
let html_vd_barheight = define_expert_option current_section
["html_vd_barheight"] "Change height of download indicator bar in vd
output" int_option 2
Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- src/daemon/driver/driverCommands.ml 27 Jun 2006 10:38:35 -0000 1.158
+++ src/daemon/driver/driverCommands.ml 27 Jun 2006 21:20:28 -0000 1.159
@@ -1561,7 +1561,6 @@
strings_of_option html_mods_vd_age;
strings_of_option html_mods_vd_last;
strings_of_option html_mods_vd_prio;
- strings_of_option html_mods_vd_queues;
strings_of_option html_mods_show_pending;
strings_of_option html_mods_load_message_file;
strings_of_option html_mods_max_messages;
Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- src/daemon/driver/driverInteractive.ml 27 Jun 2006 10:24:32 -0000
1.86
+++ src/daemon/driver/driverInteractive.ml 27 Jun 2006 21:20:28 -0000
1.87
@@ -876,7 +876,7 @@
let print_table = if format.conn_output = HTML then print_table_html 2
else print_table_text in
if not finished then
- if format.conn_output = HTML && ( !!html_checkbox_vd_file_list ) then
+ if format.conn_output = HTML && !!html_checkbox_vd_file_list then
begin
if !!html_mods then print_file_html_mods buf files
else
Index: src/gtk2/gui/guiConfig.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiConfig.ml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/gtk2/gui/guiConfig.ml 27 Jun 2006 10:38:36 -0000 1.6
+++ src/gtk2/gui/guiConfig.ml 27 Jun 2006 21:20:28 -0000 1.7
@@ -177,7 +177,7 @@
let ed2k_client_reg = Str.regexp_case_fold
".*md4.*\\|.*login.*\\|.*high_id.*\\|.*port.*\\|.*max_xs.*\\|.*max_udp.*"
let ed2k_upload_reg = Str.regexp_case_fold
".*upload.*\\|.*warning.*\\|.*queued.*"
let ed2k_download_reg = Str.regexp_case_fold
".*download.*\\|.*sources_per_chunk.*"
-let ed2k_sources_reg = Str.regexp_case_fold
".*source.*\\|.*initial_score.*\\|.*ban.*\\|.*clients.*\\|.*client_connections_delay.*\\|.*client_rank.*\\|.*black_list.*\\|.*max_indirect.*"
+let ed2k_sources_reg = Str.regexp_case_fold
".*source.*\\|.*ban.*\\|.*clients.*\\|.*client_connections_delay.*\\|.*client_rank.*\\|.*black_list.*\\|.*max_indirect.*"
let ed2k_server_reg = Str.regexp_case_fold
".*files_queries.*\\|.*connections_delay.*\\|.*protocol_version.*\\|.*server.*"
let nap_server_reg = Str.regexp_case_fold ".*napigator.*\\|.*server.*"
let slsk_client_reg = Str.regexp_case_fold
".*client_.*\\|.*login.*\\|.*password.*"
Index: src/networks/donkey/donkeyComplexOptions.ml
===================================================================
RCS file:
/sources/mldonkey/mldonkey/src/networks/donkey/donkeyComplexOptions.ml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- src/networks/donkey/donkeyComplexOptions.ml 25 May 2006 19:47:25 -0000
1.49
+++ src/networks/donkey/donkeyComplexOptions.ml 27 Jun 2006 21:20:28 -0000
1.50
@@ -179,7 +179,7 @@
ip, port
| _ -> failwith "Options: Not an server option"
) in
- let l = DonkeyGlobals.new_server ip port !!initial_score in
+ let l = DonkeyGlobals.new_server ip port in
(try
l.server_description <- get_value "server_desc" value_to_string
@@ -439,7 +439,7 @@
try
DonkeyGlobals.find_server ip port
with _ ->
- let s = DonkeyGlobals.new_server ip port !!initial_score in
+ let s = DonkeyGlobals.new_server ip port in
s
let check_add_server ip port =
@@ -454,7 +454,7 @@
try
ignore (DonkeyGlobals.find_server ip port)
with _ ->
- ignore (DonkeyGlobals.new_server ip port !!initial_score)
+ ignore (DonkeyGlobals.new_server ip port)
let config_files_loaded = ref false
Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- src/networks/donkey/donkeyGlobals.ml 31 May 2006 20:02:14 -0000
1.82
+++ src/networks/donkey/donkeyGlobals.ml 27 Jun 2006 21:20:28 -0000
1.83
@@ -480,7 +480,7 @@
lprintf_nl "%s:%d blocked: %s" (Ip.to_string ip) port reason;
true))
-let new_server ip port score =
+let new_server ip port =
let key = (ip) in
try
let found = Hashtbl.find servers_by_key key in
@@ -501,7 +501,7 @@
server_search_queries = Fifo.create ();
server_users_queries = Fifo.create ();
server_connection_control = new_connection_control ();
- server_score = score;
+ server_score = 5;
server_tags = [];
server_nfiles = Int64.zero;
server_nusers = Int64.zero;
Index: src/networks/donkey/donkeyOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOptions.ml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- src/networks/donkey/donkeyOptions.ml 12 Jun 2006 20:18:09 -0000
1.44
+++ src/networks/donkey/donkeyOptions.ml 27 Jun 2006 21:20:28 -0000
1.45
@@ -25,15 +25,9 @@
let donkey_section = file_section donkey_ini ["Donkey"] "Donkey options"
-let initial_score = define_expert_option donkey_section ["initial_score"]
- "Initial score for a new server" int_option 5
-
let max_xs_packets = define_expert_option donkey_section ["max_xs_packets"]
"Max number of UDP packets per round for eXtended Search" int_option 30
-let max_dialog_history = define_expert_option donkey_section
["max_dialog_history"]
- "Max number of messages of Chat remembered" int_option 30
-
let donkey_port = define_option donkey_section ["port"] "The port used for
connection by other donkey clients." int_option 4662
let check_client_connections_delay =
@@ -288,12 +282,6 @@
3: based on separate file queues (2.02-10)
" int_option 3 *)
-(* This option is used to avoid the delay when connecting to a server before
-sending the list of shared files, which is only sent to master servers. *)
-let immediate_master =
- define_expert_option donkey_section ["immediate_master"]
- "(only for development tests)" bool_option false
-
let become_master_delay =
define_expert_option donkey_section ["become_master_delay"]
"(only for development tests)" int_option 120
Index: src/networks/donkey/donkeyServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- src/networks/donkey/donkeyServers.ml 19 May 2006 23:43:54 -0000
1.56
+++ src/networks/donkey/donkeyServers.ml 27 Jun 2006 21:20:28 -0000
1.57
@@ -818,7 +818,6 @@
if not s.server_master
&& (s.server_preferred
|| connection_time > !!become_master_delay
- || !!immediate_master
)
then
begin
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...,
mldonkey-commits <=