[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: |
Sun, 05 Feb 2006 13:17:40 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Branch:
Changes by: spiralvoice <address@hidden> 06/02/05 13:17:40
Modified files:
distrib : ChangeLog
src/daemon/common: commonOptions.ml commonUploads.ml
commonWeb.ml
src/daemon/driver: driverCommands.ml driverMain.ml
src/networks/donkey: donkeyInteractive.ml donkeyNeighbours.ml
donkeyOvernet.ml donkeyServers.ml
Log message:
patch #4869
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.712&tr2=1.713&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.125&tr2=1.126&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonUploads.ml.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonWeb.ml.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.121&tr2=1.122&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverMain.ml.diff?tr1=1.96&tr2=1.97&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyNeighbours.ml.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyOvernet.ml.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.712 mldonkey/distrib/ChangeLog:1.713
--- mldonkey/distrib/ChangeLog:1.712 Sun Feb 5 13:16:25 2006
+++ mldonkey/distrib/ChangeLog Sun Feb 5 13:17:40 2006
@@ -15,6 +15,7 @@
=========
2006/02/05
+4869: Remove redirector code
4856: reverse patch: configure: disable iconv by default on MinGW
it is not necessary anymore
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.125
mldonkey/src/daemon/common/commonOptions.ml:1.126
--- mldonkey/src/daemon/common/commonOptions.ml:1.125 Sat Feb 4 22:26:36 2006
+++ mldonkey/src/daemon/common/commonOptions.ml Sun Feb 5 13:17:40 2006
@@ -468,7 +468,6 @@
hs : http_server messages
act : debug activity
bw : debug bandwidth
- redir : debug redirector
unexp : debug unexpected messages
"
string_option ""
@@ -900,28 +899,6 @@
This implies some bandwidth-cost (with 200 connections ~10-20%)"
bool_option !BasicSocket.socket_keepalive
-let network_update_url =
- define_expert_option current_section ["network_update_url"]
- "URL where mldonkey can download update information on the network"
- string_option ""
-
-let enable_mlnet_redirector =
- define_option current_section ["enable_mlnet_redirector"]
- "Enable the mlnet redirector"
- bool_option true
-
-let mlnet_redirector = define_expert_option current_section ["redirector"]
- "IP:port of the network redirector"
- addr_option ("129.104.11.42", 3999)
-
-(* The former redirector is dead, so use a new one. *)
-let _ =
- option_hook mlnet_redirector (fun _ ->
- let (ip, port) = !!mlnet_redirector in
- if ip = "128.93.52.5" then
- mlnet_redirector =:= ("129.104.11.42", 3999)
- )
-
let http_proxy_server = define_option current_section ["http_proxy_server"]
"Direct HTTP queries to HTTP proxy" string_option ""
let http_proxy_port = define_option current_section ["http_proxy_port"]
@@ -1081,12 +1058,6 @@
"How many megabytes should MLdonkey keep for saving configuration files."
int_option 10
-let propagate_servers = define_expert_option current_section
["propagate_servers"]
- "Send an UDP packet to a central servers with the list of servers you
- are currently connected to, for the central server to be able to
- generate accurate server lists." bool_option false
-
-
(*************************************************************************)
@@ -1673,10 +1644,6 @@
option_hook packet_frame_size (fun _ ->
TcpBufferedSocket.packet_frame_size := !!packet_frame_size
);
- option_hook network_update_url (fun _ ->
- if !!network_update_url =
- "http://savannah.nongnu.org/download/mldonkey/network/"; then
- network_update_url =:= "");
option_hook minor_heap_size (fun _ ->
let gc_control = Gc.get () in
Gc.set { gc_control with Gc.minor_heap_size =
@@ -1709,7 +1676,6 @@
let verbose_supernode = ref false
let verbose_swarming = ref false
let verbose_activity = ref false
-let verbose_redirector = ref false
let verbose_unexpected_messages = ref false
let set_all v =
@@ -1737,7 +1703,6 @@
Http_client.verbose := v;
Http_server.verbose := v;
verbose_activity := v;
- verbose_redirector := v;
verbose_unexpected_messages := v
let _ =
@@ -1771,7 +1736,6 @@
| "hs" -> Http_server.verbose := true
| "act" -> verbose_activity := true
| "bw" -> incr BasicSocket.verbose_bandwidth
- | "redir" -> verbose_redirector := true
| "unexp" -> verbose_unexpected_messages := true
| "all" ->
Index: mldonkey/src/daemon/common/commonUploads.ml
diff -u mldonkey/src/daemon/common/commonUploads.ml:1.40
mldonkey/src/daemon/common/commonUploads.ml:1.41
--- mldonkey/src/daemon/common/commonUploads.ml:1.40 Wed Jan 11 19:12:35 2006
+++ mldonkey/src/daemon/common/commonUploads.ml Sun Feb 5 13:17:40 2006
@@ -1053,19 +1053,3 @@
| l -> l
in
get_name_keywords
-
-open LittleEndian
-
-let _ =
- CommonWeb.add_redirector_info "SHARED" (fun buf ->
- let module S = CommonShared in
- let total_shared = ref Int64.zero in
- let total_uploaded = ref Int64.zero in
- S.shared_iter (fun s ->
- let i = S.as_shared_impl s in
- total_uploaded := !total_uploaded ++ i.S.impl_shared_uploaded;
- total_shared := !total_shared ++ i.S.impl_shared_size
- );
- buf_int64 buf !total_shared;
- buf_int64 buf !total_uploaded;
- )
Index: mldonkey/src/daemon/common/commonWeb.ml
diff -u mldonkey/src/daemon/common/commonWeb.ml:1.26
mldonkey/src/daemon/common/commonWeb.ml:1.27
--- mldonkey/src/daemon/common/commonWeb.ml:1.26 Sun Jan 29 18:44:18 2006
+++ mldonkey/src/daemon/common/commonWeb.ml Sun Feb 5 13:17:40 2006
@@ -131,216 +131,11 @@
(*************************************************************************)
(* *)
-(* cut_messages (internal) *)
-(* *)
-(*************************************************************************)
-
-let cut_messages f sock nread =
- let b = buf sock in
- try
- while b.len >= 4 do
- let msg_len = LittleEndian.get_int b.buf b.pos in
- if b.len >= 4 + msg_len then
- begin
- let s = String.sub b.buf (b.pos+4) msg_len in
- buf_used b (msg_len + 4);
- let opcode = LittleEndian.get_int16 s 0 in
- (f opcode s : unit)
- end
- else raise Not_found
- done
- with Not_found -> ()
-
-
-(*************************************************************************)
-(* *)
-(* add_redirector_info *)
-(* *)
-(*************************************************************************)
-
-(* Learn how many people are using mldonkey at a current time, and which
-servers they are connected to --> build a database of servers
-
-Now, get some more information:
-- Which version do they use ?
-- How much data is shared ?
-
-Note that the exact content/type/name of the files is not sent, nor
-any private information. Just for statistics. Can be disabled in the
- downloads.ini config file anyway.
-*)
-let buf = TcpBufferedSocket.internal_buf
-
-let buf_addr buf (ip,port) =
- buf_ip buf ip;
- buf_int16 buf port
-
-let buf_string buf s =
- buf_int16 buf (String.length s);
- Buffer.add_string buf s
-
-let redirector_infos = ref []
-let add_redirector_info (n : string) (f : Buffer.t -> unit) =
- redirector_infos := (n,f) :: !redirector_infos
-
-let gen_redirector_packet () =
-
- let infos =
- List.map (fun (n,f) ->
- n,
- ( Buffer.reset buf;
- f buf;
- Buffer.contents buf)
- ) !redirector_infos in
-
- Buffer.reset buf;
- buf_int8 buf 212; (* udp_magic *)
- buf_int8 buf 2; (* type of data sent *)
- let ip = client_ip None in
- buf_ip buf ip; (* The client IP *)
-
-(* Some statistics on the network *)
- buf_string buf Autoconf.current_version;
- buf_int buf (last_time () - start_time); (* uptime in sec *)
-
-(* Statistics for Supernode creation *)
- buf_int16 buf !!max_hard_upload_rate;
- buf_int16 buf !!max_hard_download_rate;
- buf_int buf (compute_lost_byte upload_control);
- buf_int buf (compute_lost_byte download_control);
-
- buf_list (fun buf (n,s) ->
- buf_string buf n;
- buf_string buf s
- ) buf infos;
-
- let s = Buffer.contents buf in
- s
-
-(*************************************************************************)
-(* *)
-(* connect_redirector *)
-(* *)
-(*************************************************************************)
-
-let propagation_socket = UdpSocket.create_sendonly ()
-let counter = ref 1
-
-let connect_redirector () =
- if !!propagate_servers && !!enable_mlnet_redirector then begin
- decr counter;
- if !counter = 0 then begin
- counter := 6;
- let s = gen_redirector_packet () in
- try
- let name, port = !!mlnet_redirector in
- UdpSocket.write propagation_socket false s (Ip.from_name name)
port;
-
- with e ->
- lprintf_nl "[cWeb] Exception %s in udp_sendonly"
(Printexc2.to_string e);
- end
- end
-
-(*************************************************************************)
-(* *)
(* load_web_infos *)
(* *)
(*************************************************************************)
let load_web_infos core_start =
-(* Try to connect the redirector to get interesting information, since we
-are not allowed to use savannah anymore. The redirector should be able to
-support the charge, at least, currently. *)
- if !!enable_mlnet_redirector then begin
- let (name, port) = !!mlnet_redirector in
- let packet = gen_redirector_packet () in
- Ip.async_ip name (fun ip ->
- try
- if !verbose_redirector then lprintf_nl "[cWeb] connecting to
redirector";
- let token = create_token unlimited_connection_manager in
- let sock = TcpBufferedSocket.connect token "connect redirector"
- (Ip.to_inet_addr ip) port
- (fun sock event ->
- match event with
- | BASIC_EVENT (LTIMEOUT | RTIMEOUT) ->
- TcpBufferedSocket.close sock Closed_for_timeout
- | _ -> ())
- in
- TcpBufferedSocket.set_rtimeout sock 30.;
- set_reader sock (cut_messages (fun opcode s ->
- if !verbose_redirector then lprintf_nl "[cWeb] redirector
info received";
- let module L = LittleEndian in
-
- let motd_html_s, pos = L.get_string16 s 2 in
- let pos = if motd_html_s <> "XX" then
- let servers_met_s, pos = L.get_string16 s pos in
- let peers_ocl_s, pos = L.get_string16 s pos in
- let peers_dat_s, pos = L.get_string16 s pos in
- let motd_conf_s, pos = L.get_string16 s pos in
- let peers_kad_s, pos = L.get_string16 s pos in
-
- motd_html =:= motd_html_s;
-
- let servers_met_file = Filename.temp_file "servers"
".met" in
- File.from_string servers_met_file servers_met_s;
- if !!enable_donkey then
- load_file "server.met" servers_met_file;
-
- let peers_ocl_file = Filename.temp_file "peers" ".ocl" in
- File.from_string peers_ocl_file peers_ocl_s;
- if !!enable_overnet then
- load_file "ocl" peers_ocl_file;
-
- let peers_dat_file = Filename.temp_file "contacts"
".dat" in
- File.from_string peers_dat_file peers_dat_s;
- if !!enable_overnet then
- load_file "contact.dat" peers_dat_file;
-
- let motd_conf_file = Filename.temp_file "motd" ".conf" in
- File.from_string motd_conf_file motd_conf_s;
- load_file "motd.conf" motd_conf_file;
-
- let peers_kad_file = Filename.temp_file "peers" ".kad" in
- File.from_string peers_kad_file peers_kad_s;
- if !!enable_kademlia then
- load_file "kad" peers_kad_file;
-
- pos
- else
-
- let get_item s pos =
- let kind, pos = get_string32 s pos in
- let file, pos = get_string32 s pos in
- (kind, file), pos
- in
- let files, pos = L.get_list16 get_item s pos in
- List.iter (fun (kind, file) ->
- let temp_file = Filename.temp_file "temp" ".mld" in
- File.from_string temp_file file;
- load_file kind temp_file
- ) files;
- pos
- in
- let ip = L.get_ip s pos in
- last_high_id := ip;
-
- lprintf_nl "[cWeb] Redirector info loaded (IP set to %s)"
- (Ip.to_string ip);
- TcpBufferedSocket.set_lifetime sock 30.;
-
- ));
- write_string sock packet
-
- with e ->
- lprintf_nl "[cWeb] Exception %s while connecting redirector"
- (Printexc2.to_string e)
- )
- end;
-
- if !!network_update_url <> "" then begin
- load_url true "motd.html" (Filename.concat !!network_update_url
"motd.html");
- load_url true "motd.conf" (Filename.concat !!network_update_url
"motd.conf");
- end;
List.iter (fun (kind, period, url) ->
if (core_start && period = 0) || (period <> 0 && !hours mod period = 0)
then
begin
@@ -378,32 +173,3 @@
feed.rss_date <- last_time ();
feed.rss_value <- c
)
-
-let initialized = ref false
-let tcp_latencies_block = ref ""
-let udp_latencies_block = ref ""
-
-let _ =
-(* Latency block *)
- add_redirector_info "LTCY" (fun buf ->
-
- if not !initialized then begin
- tcp_latencies_block := TcpBufferedSocket.get_latencies
verbose_redirector;
- udp_latencies_block := UdpSocket.get_latencies verbose_redirector;
- initialized := true;
- end;
-
- buf_int buf !!loop_delay;
-
-(* TCP block *)
- Buffer.add_string buf !tcp_latencies_block;
-
-(* UDP block *)
- Buffer.add_string buf !udp_latencies_block;
- );
-(* Every 6 hours *)
- add_infinite_timer 21600. (fun _ ->
- initialized := true;
- tcp_latencies_block := TcpBufferedSocket.get_latencies
verbose_redirector;
- udp_latencies_block := UdpSocket.get_latencies verbose_redirector;
- )
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.121
mldonkey/src/daemon/driver/driverCommands.ml:1.122
--- mldonkey/src/daemon/driver/driverCommands.ml:1.121 Sat Feb 4 22:26:36 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml Sun Feb 5 13:17:40 2006
@@ -1783,9 +1783,6 @@
strings_of_option tcpip_packet_size;
strings_of_option mtu_packet_size;
strings_of_option minimal_packet_size;
- strings_of_option network_update_url;
- strings_of_option enable_mlnet_redirector;
- strings_of_option mlnet_redirector;
strings_of_option http_proxy_tcp;
strings_of_option http_proxy_server;
strings_of_option http_proxy_port;
Index: mldonkey/src/daemon/driver/driverMain.ml
diff -u mldonkey/src/daemon/driver/driverMain.ml:1.96
mldonkey/src/daemon/driver/driverMain.ml:1.97
--- mldonkey/src/daemon/driver/driverMain.ml:1.96 Fri Feb 3 03:12:14 2006
+++ mldonkey/src/daemon/driver/driverMain.ml Sun Feb 5 13:17:40 2006
@@ -89,7 +89,6 @@
&& !CommonWeb.hours mod !!backup_options_delay = 0 then
CommonComplexOptions.backup_options ();
DriverControlers.check_calendar ();
- CommonWeb.connect_redirector ();
CommonFile.propose_filenames ()
Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.88
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.89
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.88 Fri Feb 3
21:00:47 2006
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml Sun Feb 5 13:17:40 2006
@@ -950,12 +950,6 @@
) args;
"done"
), "<port1> <port2> ... :\t\tadd these ports to the port black list";
-
- "send_servers", Arg_none (fun o ->
- CommonWeb.connect_redirector ();
- "done"
- ), ":\t\t\t\tsend the list of connected servers to the redirector";
-
]
let _ =
Index: mldonkey/src/networks/donkey/donkeyNeighbours.ml
diff -u mldonkey/src/networks/donkey/donkeyNeighbours.ml:1.11
mldonkey/src/networks/donkey/donkeyNeighbours.ml:1.12
--- mldonkey/src/networks/donkey/donkeyNeighbours.ml:1.11 Sat Dec 24
02:36:09 2005
+++ mldonkey/src/networks/donkey/donkeyNeighbours.ml Sun Feb 5 13:17:40 2006
@@ -376,21 +376,3 @@
Hashtbl.add neighbours cnum nb
) list)
[keep_glru; keep_history; keep_slru]
-
-open LittleEndian
-
-let _ =
- CommonWeb.add_redirector_info "DKNB" (fun buf ->
- compute_stats ();
- let len = Array.length ngood_propositions in
- buf_int buf len;
- for i = 0 to len - 1 do
- buf_int64 buf ngood_propositions.(i);
- buf_int64 buf nbad_propositions.(i)
- done;
- let len = Fifo.length propositions in
- buf_int buf len;
- let len = ref 0 in
- Hashtbl.iter (fun _ _ -> incr len) neighbours;
- buf_int buf !len
- )
Index: mldonkey/src/networks/donkey/donkeyOvernet.ml
diff -u mldonkey/src/networks/donkey/donkeyOvernet.ml:1.62
mldonkey/src/networks/donkey/donkeyOvernet.ml:1.63
--- mldonkey/src/networks/donkey/donkeyOvernet.ml:1.62 Thu Jan 26 10:34:53 2006
+++ mldonkey/src/networks/donkey/donkeyOvernet.ml Sun Feb 5 13:17:40 2006
@@ -1861,19 +1861,6 @@
| _ -> true) !overnet_searches
end
-let _ =
- CommonWeb.add_redirector_info Proto.redirector_section (fun buf ->
- update_buckets ();
- let peers = get_any_peers 32 in
- buf_int buf (List.length peers);
- List.iter (fun p ->
- buf_ip buf p.peer_ip;
- buf_int16 buf p.peer_port;
- buf_int16 buf p.peer_tcpport;
- )
- peers;
- )
-
let cancel_recover_file file =
begin
(* reset the Hashtbls and Fifos *)
Index: mldonkey/src/networks/donkey/donkeyServers.ml
diff -u mldonkey/src/networks/donkey/donkeyServers.ml:1.51
mldonkey/src/networks/donkey/donkeyServers.ml:1.52
--- mldonkey/src/networks/donkey/donkeyServers.ml:1.51 Mon Jan 16 16:05:14 2006
+++ mldonkey/src/networks/donkey/donkeyServers.ml Sun Feb 5 13:17:40 2006
@@ -875,13 +875,6 @@
open LittleEndian
let _ =
- CommonWeb.add_redirector_info "DKSV" (fun buf ->
- buf_list (fun buf s ->
- buf_ip buf s.server_ip;
- buf_int16 buf s.server_port;
- ) buf (connected_servers ())
- );
-
server_ops.op_server_sort <- ( fun s ->
(3600 * s.server_score) + connection_last_conn s.server_connection_control
)