[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: |
Wed, 11 Jan 2006 18:53:30 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Branch:
Changes by: spiralvoice <address@hidden> 06/01/11 18:53:30
Modified files:
distrib : ChangeLog
src/daemon/common: commonInteractive.ml commonServer.ml
src/networks/donkey: donkeyComplexOptions.ml
donkeyComplexOptions.mli donkeyGlobals.ml
donkeyInteractive.ml donkeyMain.ml
donkeyServers.ml
Log message:
patch #4781
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.667&tr2=1.668&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonServer.ml.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyComplexOptions.ml.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyComplexOptions.mli.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.667 mldonkey/distrib/ChangeLog:1.668
--- mldonkey/distrib/ChangeLog:1.667 Wed Jan 11 18:49:18 2006
+++ mldonkey/distrib/ChangeLog Wed Jan 11 18:53:29 2006
@@ -15,6 +15,7 @@
=========
2006/01/11
+4781: Disconnect connected server before removing
4782: Configure: Replace AC_CHECK_FILE with "test -d" to allow cross-compile
2006/01/09
Index: mldonkey/src/daemon/common/commonInteractive.ml
diff -u mldonkey/src/daemon/common/commonInteractive.ml:1.61
mldonkey/src/daemon/common/commonInteractive.ml:1.62
--- mldonkey/src/daemon/common/commonInteractive.ml:1.61 Mon Jan 9
00:25:58 2006
+++ mldonkey/src/daemon/common/commonInteractive.ml Wed Jan 11 18:53:29 2006
@@ -32,7 +32,6 @@
open CommonServer
open CommonNetwork
open CommonOptions
-open CommonTypes
open CommonFile
open CommonGlobals
open CommonSearch
@@ -336,13 +335,18 @@
lprintf_nl "[cInt] Exception in file_add: %s" (Printexc2.to_string e)
let server_remove server =
+ begin
+ match server_state server with
+ NotConnected _ -> ()
+ | _ -> server_disconnect server
+ end;
try
let impl = as_server_impl server in
if impl.impl_server_state <> RemovedHost then begin
set_server_state server RemovedHost;
(try impl.impl_server_ops.op_server_remove impl.impl_server_val
with _ -> ());
- servers =:= Intmap.remove (server_num server) !!servers;
+ servers =:= Intmap.remove (server_num server) !!servers
end
with e ->
lprintf_nl "[cInt] Exception in server_remove: %s" (Printexc2.to_string
e)
Index: mldonkey/src/daemon/common/commonServer.ml
diff -u mldonkey/src/daemon/common/commonServer.ml:1.21
mldonkey/src/daemon/common/commonServer.ml:1.22
--- mldonkey/src/daemon/common/commonServer.ml:1.21 Mon Oct 10 16:22:24 2005
+++ mldonkey/src/daemon/common/commonServer.ml Wed Jan 11 18:53:30 2006
@@ -105,7 +105,6 @@
)
let server_must_update s =
-(* lprintf "server_must_update ?\n"; *)
let impl = as_server_impl s in
if impl.impl_server_update <> 0 then
CommonEvent.add_event (Server_info_event s);
@@ -117,7 +116,6 @@
begin
impl.impl_server_update <- - impl.impl_server_update;
CommonEvent.add_event (Server_info_event s);
-(* lprintf "server_must_update YES\n"; *)
end
let server_update_num impl =
@@ -246,10 +244,6 @@
let impl = as_server_impl c in
impl.impl_server_state
-let server_num c =
- let impl = as_server_impl c in
- impl.impl_server_num
-
let set_server_state c state =
let impl = as_server_impl c in
if impl.impl_server_state <> state then begin
@@ -290,25 +284,6 @@
let servers_by_num = ()
-(*
-type server_info = {
- server_num : int;
- server_network : int;
-
- mutable server_ip : Ip.t;
- mutable server_port : int;
- mutable server_score : int;
- mutable server_tags : CommonTypes.tag list;
- mutable server_nusers : int;
- mutable server_nfiles : int;
- mutable server_state : host_state;
- mutable server_name : string;
- mutable server_description : string;
- mutable server_users : int list option;
- }
- *)
-
-
let server_banner s o =
let buf = o.conn_buf in
let info = server_info s in
Index: mldonkey/src/networks/donkey/donkeyComplexOptions.ml
diff -u mldonkey/src/networks/donkey/donkeyComplexOptions.ml:1.41
mldonkey/src/networks/donkey/donkeyComplexOptions.ml:1.42
--- mldonkey/src/networks/donkey/donkeyComplexOptions.ml:1.41 Sat Dec 24
02:36:09 2005
+++ mldonkey/src/networks/donkey/donkeyComplexOptions.ml Wed Jan 11
18:53:30 2006
@@ -598,12 +598,6 @@
with _ ->
ignore (DonkeyGlobals.new_server ip port !!initial_score)
-let remove_server ip port =
- try
- let _ = DonkeyGlobals.find_server ip port in
- DonkeyGlobals.remove_server ip port
- with _ -> ()
-
let config_files_loaded = ref false
let load _ =
Index: mldonkey/src/networks/donkey/donkeyComplexOptions.mli
diff -u mldonkey/src/networks/donkey/donkeyComplexOptions.mli:1.9
mldonkey/src/networks/donkey/donkeyComplexOptions.mli:1.10
--- mldonkey/src/networks/donkey/donkeyComplexOptions.mli:1.9 Mon Nov 7
20:11:42 2005
+++ mldonkey/src/networks/donkey/donkeyComplexOptions.mli Wed Jan 11
18:53:30 2006
@@ -24,8 +24,6 @@
val check_add_server : Ip.t -> int -> DonkeyTypes.server
val safe_add_server : Ip.t -> int -> unit
-val remove_server : Ip.t -> int -> unit
-
val known_shared_files : DonkeyTypes.shared_file_info
list Options.option_record
Index: mldonkey/src/networks/donkey/donkeyGlobals.ml
diff -u mldonkey/src/networks/donkey/donkeyGlobals.ml:1.68
mldonkey/src/networks/donkey/donkeyGlobals.ml:1.69
--- mldonkey/src/networks/donkey/donkeyGlobals.ml:1.68 Mon Jan 9 00:25:58 2006
+++ mldonkey/src/networks/donkey/donkeyGlobals.ml Wed Jan 11 18:53:30 2006
@@ -512,8 +512,7 @@
NoConnection -> ()
| ConnectionWaiting token -> cancel_token token
| Connection sock ->
- TcpBufferedSocket.shutdown sock Closed_by_user);
- server_remove (as_server s.server_server)
+ TcpBufferedSocket.shutdown sock Closed_by_user)
with _ -> ()
let dummy_client =
Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.82
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.83
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.82 Mon Jan 9
00:25:58 2006
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml Wed Jan 11 18:53:30 2006
@@ -1165,15 +1165,6 @@
network.op_network_connect_servers <- (fun _ ->
force_check_server_connections true )
-let disconnect_server s r =
- match s.server_sock with
- NoConnection -> ()
- | ConnectionWaiting token ->
- cancel_token token;
- s.server_sock <- NoConnection
- | Connection sock ->
- TcpBufferedSocket.shutdown sock r
-
let ip_of_server_cid s =
match s.server_cid with
None -> Ip.null
@@ -1181,7 +1172,7 @@
let _ =
server_ops.op_server_remove <- (fun s ->
- DonkeyComplexOptions.remove_server s.server_ip s.server_port
+ DonkeyGlobals.remove_server s.server_ip s.server_port
);
server_ops.op_server_connect <- connect_server;
server_ops.op_server_disconnect <- (fun s ->
Index: mldonkey/src/networks/donkey/donkeyMain.ml
diff -u mldonkey/src/networks/donkey/donkeyMain.ml:1.43
mldonkey/src/networks/donkey/donkeyMain.ml:1.44
--- mldonkey/src/networks/donkey/donkeyMain.ml:1.43 Mon Jan 9 00:25:59 2006
+++ mldonkey/src/networks/donkey/donkeyMain.ml Wed Jan 11 18:53:30 2006
@@ -102,7 +102,7 @@
is_enabled := false;
enabler := false;
if !!enable_donkey then enable_donkey =:= false;
- Hashtbl2.safe_iter (fun s -> disconnect_server s Closed_by_user)
+ Hashtbl2.safe_iter (fun s -> DonkeyServers.disconnect_server s
Closed_by_user)
servers_by_key;
H.iter (fun c -> DonkeyClient.disconnect_client c Closed_by_user)
clients_by_kind;
Index: mldonkey/src/networks/donkey/donkeyServers.ml
diff -u mldonkey/src/networks/donkey/donkeyServers.ml:1.46
mldonkey/src/networks/donkey/donkeyServers.ml:1.47
--- mldonkey/src/networks/donkey/donkeyServers.ml:1.46 Sun Dec 18 14:50:38 2005
+++ mldonkey/src/networks/donkey/donkeyServers.ml Wed Jan 11 18:53:30 2006
@@ -229,10 +229,6 @@
| Connection sock ->
decr nservers;
TcpBufferedSocket.close sock reason;
- (*
- lprintf "%s:%d CLOSED received by server\n"
- (Ip.to_string s.server_ip) s.server_port;
- *)
connection_failed (s.server_connection_control);
s.server_sock <- NoConnection;
s.server_score <- s.server_score - 1;
@@ -644,7 +640,7 @@
end;
List.iter (fun s ->
- remove_server s.server_ip s.server_port
+ DonkeyGlobals.remove_server s.server_ip s.server_port
) !to_remove;
if !to_remove <> [] || !verbose then
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., (continued)
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/01
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/02
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/03
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/04
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/04
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/04
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/06
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/07
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/08
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/08
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...,
mldonkey-commits <=
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/11
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/16
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/18
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/18
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/29
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/29
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/29