[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: |
Thu, 12 Jan 2006 08:57:59 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Branch:
Changes by: spiralvoice <address@hidden> 06/01/12 08:57:58
Modified files:
distrib : ChangeLog
src/daemon/common: commonComplexOptions.ml commonOptions.ml
commonServer.ml guiDecoding.ml guiEncoding.ml
guiTypes.ml
src/daemon/driver: driverCommands.ml driverMain.ml
src/networks/bittorrent: bTInteractive.ml
src/networks/donkey: donkeyGlobals.ml donkeyInteractive.ml
donkeyServers.ml donkeyTypes.ml
src/networks/fileTP: fileTPInteractive.ml
src/networks/gnutella: gnutellaInteractive.ml
Log message:
patch #4787
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.669&tr2=1.670&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonComplexOptions.ml.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.118&tr2=1.119&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonServer.ml.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiDecoding.ml.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiEncoding.ml.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiTypes.ml.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.113&tr2=1.114&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverMain.ml.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyTypes.ml.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/fileTP/fileTPInteractive.ml.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/gnutella/gnutellaInteractive.ml.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.669 mldonkey/distrib/ChangeLog:1.670
--- mldonkey/distrib/ChangeLog:1.669 Wed Jan 11 19:12:34 2006
+++ mldonkey/distrib/ChangeLog Thu Jan 12 08:57:58 2006
@@ -14,6 +14,10 @@
ChangeLog
=========
+2006/01/12
+4787: EDK: Show server version (ported from Mulus - thx to Knocker),
+ disconnect blocked server after loading IP blocklist
+
2006/01/11
4790: Some logging stuff
4781: Disconnect connected server before removing
Index: mldonkey/src/daemon/common/commonComplexOptions.ml
diff -u mldonkey/src/daemon/common/commonComplexOptions.ml:1.44
mldonkey/src/daemon/common/commonComplexOptions.ml:1.45
--- mldonkey/src/daemon/common/commonComplexOptions.ml:1.44 Wed Jan 4
14:04:42 2006
+++ mldonkey/src/daemon/common/commonComplexOptions.ml Thu Jan 12 08:57:58 2006
@@ -1272,6 +1272,14 @@
Printf.bprintf buf "\\</table\\>\\</td\\>\\<tr\\>\\</table\\>\\</div\\>"
let _ =
+ option_hook ip_blocking (fun _ ->
+ (try
+ Ip_set.bl := if !!ip_blocking <> "" then
+ Ip_set.load !!ip_blocking
+ else Ip_set.bl_empty
+ with _ -> ());
+ CommonServer.check_blocked_servers ()
+ );
option_hook max_opened_connections (fun _ ->
if !verbose then lprintf_nl ()
"checking max_opened_connections = %d for validity"
!!max_opened_connections;
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.118
mldonkey/src/daemon/common/commonOptions.ml:1.119
--- mldonkey/src/daemon/common/commonOptions.ml:1.118 Mon Jan 9 00:25:58 2006
+++ mldonkey/src/daemon/common/commonOptions.ml Thu Jan 12 08:57:58 2006
@@ -816,8 +816,8 @@
IMPORTANT: Put the URL and the kind between quotes.
EXAMPLE:
web_infos = [
- (\"server.met\", 96,
\"http://www.primusnet.ch/users/komintern/ed2k/min/server.met\");
- (\"guarding.p2p\", 96,
\"http://homepage.ntlworld.com/tim.leonard1/guarding.p2p\");
+ (\"server.met\", 0, \"http://www.gruk.org/server.met.gz\");
+ (\"guarding.p2p\", 96, \"http://www.bluetack.co.uk/config/antip2p.txt\");
(\"ocl\", 24,
\"http://members.lycos.co.uk/appbyhp2/FlockHelpApp/contact-files/contact.ocl\");
(\"contact.dat\", 168, \"http://download.overnet.org/contact.dat\");
]
@@ -853,13 +853,6 @@
option_hook ip_blocking_descriptions (fun _ ->
Ip_set.store_blocking_descriptions := !!ip_blocking_descriptions
);
- option_hook ip_blocking (fun _ ->
- try
- Ip_set.bl := if !!ip_blocking <> "" then
- Ip_set.load !!ip_blocking
- else Ip_set.bl_empty
- with _ -> ()
- );
option_hook geoip_dat (fun _ ->
try
Geoip.init !!geoip_dat;
Index: mldonkey/src/daemon/common/commonServer.ml
diff -u mldonkey/src/daemon/common/commonServer.ml:1.23
mldonkey/src/daemon/common/commonServer.ml:1.24
--- mldonkey/src/daemon/common/commonServer.ml:1.23 Wed Jan 11 19:12:35 2006
+++ mldonkey/src/daemon/common/commonServer.ml Thu Jan 12 08:57:58 2006
@@ -294,6 +294,25 @@
let servers_by_num = ()
+let check_blocked_servers () =
+ try
+ server_iter (fun s ->
+ if server_blocked s then
+ begin
+ let impl = as_server_impl s in
+ let info = server_info s in
+ (match impl.impl_server_state with
+ NotConnected _ -> ()
+ | _ -> server_disconnect s;
+ lprintf_nl () "Disconnected server %s (%s:%d), IP is now blocked"
+ info.G.server_name
+ (Ip.string_of_addr info.G.server_addr)
+ info.G.server_port);
+ end;
+ server_must_update s)
+ with e ->
+ lprintf_nl () "Exception in check_blocked_servers: %s"
(Printexc2.to_string e)
+
let server_banner s o =
let buf = o.conn_buf in
let info = server_info s in
@@ -305,7 +324,7 @@
( "1", "srh", "Server number", "#" ) ;
( "0", "srh", "Connect|Disconnect", "C/D" ) ;
( "0", "srh", "Remove", "Rem" ) ;
- ( "0", "srh", "Preferred", "P" ) ;
+ ( "0", "srh", "Preferred", "P" ) ;
( "0", "srh", "[Hi]gh or [Lo]w ID", "ID" ) ;
( "0", "srh", "Network name", "Network" ) ;
( "0", "srh", "Connection status", "Status" ) ;
@@ -313,6 +332,7 @@
( "1", "srh ar", "Number of connected users", "Users" ) ;
( "1", "srh ar br", "Number of files indexed on server",
"Files" ) ;
( "0", "srh", "Server name", "Name" ) ;
+ ( "0", "srh", "Server version", "Version" ) ;
( "0", "srh", "Server details", "Details" ) ]
let server_print s o =
@@ -343,6 +363,7 @@
\\<td class=\\\"sr ar\\\"\\>%Ld\\</td\\>
\\<td class=\\\"sr ar br\\\"\\>%Ld\\</td\\>
\\<td class=\\\"sr\\\"\\>%s\\</td\\>
+ \\<td class=\\\"sr\\\"\\>%s\\</td\\>
\\<td width=\\\"100%%\\\" class=\\\"sr\\\"\\>%s\\</td\\>\\</tr\\>\n"
(html_mods_cntr ())
(
@@ -355,20 +376,21 @@
| _ -> "")
)
snum
- (if server_blocked s then
- Printf.sprintf "\\<TD class=\\\"srb\\\"----\\</TD\\>"
- else
+ (
+ if server_blocked s && (match impl.impl_server_state with
+ NotConnected _ -> true
+ | _ -> false) then "\\<td
class=\\\"srb\\\"\\>blk\\</td\\>" else
Printf.sprintf
"\\<TD class=\\\"srb\\\" onMouseOver=\\\"mOvr(this);\\\"
onMouseOut=\\\"mOut(this);\\\" title=\\\"Connect|Disconnect\\\"
onClick=\\\"parent.fstatus.location.href='submit?q=%s+%d'\\\"\\>%s\\</TD\\>"
- (match impl.impl_server_state with
- NotConnected _ -> "c"
- | _ -> "x")
- snum
- (match impl.impl_server_state with
- NotConnected _ -> "Conn"
- | _ -> "Disc")
+ (match impl.impl_server_state with
+ NotConnected _ -> "c"
+ | _ -> "x")
+ snum
+ (match impl.impl_server_state with
+ NotConnected _ -> "Conn"
+ | _ -> "Disc")
)
(
Printf.sprintf
@@ -423,10 +445,10 @@
else "\\>"
)
n.network_name
- (if server_blocked s then
- "IP blocked"
- else
- (string_of_connection_state impl.impl_server_state))
+ (match impl.impl_server_state with
+ NotConnected _ -> if server_blocked s then "IP blocked"
+ else (string_of_connection_state
impl.impl_server_state)
+ | _ -> (string_of_connection_state impl.impl_server_state))
(Ip.string_of_addr info.G.server_addr)
(Printf.sprintf "%s%s"
(string_of_int info.G.server_port)
@@ -435,6 +457,7 @@
info.G.server_nusers
info.G.server_nfiles
info.G.server_name
+ info.G.server_version
info.G.server_description
end
Index: mldonkey/src/daemon/common/guiDecoding.ml
diff -u mldonkey/src/daemon/common/guiDecoding.ml:1.50
mldonkey/src/daemon/common/guiDecoding.ml:1.51
--- mldonkey/src/daemon/common/guiDecoding.ml:1.50 Mon Jan 9 00:22:35 2006
+++ mldonkey/src/daemon/common/guiDecoding.ml Thu Jan 12 08:57:58 2006
@@ -693,6 +693,7 @@
server_banner = "";
server_users = None;
server_preferred = preferred;
+ server_version = "";
}, pos
let get_client_type s pos =
Index: mldonkey/src/daemon/common/guiEncoding.ml
diff -u mldonkey/src/daemon/common/guiEncoding.ml:1.48
mldonkey/src/daemon/common/guiEncoding.ml:1.49
--- mldonkey/src/daemon/common/guiEncoding.ml:1.48 Mon Jan 9 00:22:35 2006
+++ mldonkey/src/daemon/common/guiEncoding.ml Thu Jan 12 08:57:58 2006
@@ -617,7 +617,10 @@
buf_int64_28 proto buf s.server_nusers;
buf_int64_28 proto buf s.server_nfiles;
buf_host_state proto buf s.server_state;
- buf_string buf s.server_name;
+ if s.server_version = "" then
+ buf_string buf s.server_name
+ else
+ buf_string buf (Printf.sprintf "%s (%s)" s.server_name s.server_version);
buf_string buf s.server_description;
if proto > 28 then
buf_bool buf s.server_preferred
Index: mldonkey/src/daemon/common/guiTypes.ml
diff -u mldonkey/src/daemon/common/guiTypes.ml:1.24
mldonkey/src/daemon/common/guiTypes.ml:1.25
--- mldonkey/src/daemon/common/guiTypes.ml:1.24 Mon Jan 2 12:08:14 2006
+++ mldonkey/src/daemon/common/guiTypes.ml Thu Jan 12 08:57:58 2006
@@ -172,6 +172,7 @@
mutable server_users : int list option;
mutable server_banner : string;
mutable server_preferred : bool;
+ mutable server_version : string;
}
type room_info = {
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.113
mldonkey/src/daemon/driver/driverCommands.ml:1.114
--- mldonkey/src/daemon/driver/driverCommands.ml:1.113 Mon Jan 9 00:22:35 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml Thu Jan 12 08:57:58 2006
@@ -1740,7 +1740,9 @@
strings_of_option allow_browse_share;
strings_of_option auto_commit;
strings_of_option create_dir_mask;
- strings_of_option create_file_sparse;
+ strings_of_option create_file_sparse;
+ strings_of_option ip_blocking;
+ strings_of_option ip_blocking_descriptions;
strings_of_option log_file;
strings_of_option log_file_size;
strings_of_option log_size;
Index: mldonkey/src/daemon/driver/driverMain.ml
diff -u mldonkey/src/daemon/driver/driverMain.ml:1.88
mldonkey/src/daemon/driver/driverMain.ml:1.89
--- mldonkey/src/daemon/driver/driverMain.ml:1.88 Wed Jan 11 19:12:35 2006
+++ mldonkey/src/daemon/driver/driverMain.ml Thu Jan 12 08:57:58 2006
@@ -170,8 +170,9 @@
close_in ic
);
CommonWeb.add_web_kind "guarding.p2p" (fun _ filename ->
- Ip_set.bl := Ip_set.load filename
+ Ip_set.bl := Ip_set.load filename;
(* Ip_set.bl := Ip_set.load_merge !Ip_set.bl filename *)
+ CommonServer.check_blocked_servers ()
)
Index: mldonkey/src/networks/bittorrent/bTInteractive.ml
diff -u mldonkey/src/networks/bittorrent/bTInteractive.ml:1.75
mldonkey/src/networks/bittorrent/bTInteractive.ml:1.76
--- mldonkey/src/networks/bittorrent/bTInteractive.ml:1.75 Fri Jan 6
22:23:09 2006
+++ mldonkey/src/networks/bittorrent/bTInteractive.ml Thu Jan 12 08:57:58 2006
@@ -981,6 +981,7 @@
network.op_network_parse_url <- op_network_parse_url;
network.op_network_share <- (fun fullname codedname size -> ());
network.op_network_forget_search <- (fun s -> ());
+ network.op_network_connect_servers <- (fun s -> ());
network.op_network_search <- (fun ss buf -> ());
network.op_network_download <- (fun r -> dummy_file);
network.op_network_recover_temp <- (fun s -> ());
Index: mldonkey/src/networks/donkey/donkeyGlobals.ml
diff -u mldonkey/src/networks/donkey/donkeyGlobals.ml:1.69
mldonkey/src/networks/donkey/donkeyGlobals.ml:1.70
--- mldonkey/src/networks/donkey/donkeyGlobals.ml:1.69 Wed Jan 11 18:53:30 2006
+++ mldonkey/src/networks/donkey/donkeyGlobals.ml Thu Jan 12 08:57:58 2006
@@ -473,6 +473,7 @@
server_max_users = 0;
server_name = "";
server_description = "";
+ server_version = "";
server_banner = "";
server_users = [];
server_master = false;
Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.83
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.84
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.83 Wed Jan 11
18:53:30 2006
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml Thu Jan 12 08:57:58 2006
@@ -1090,6 +1090,7 @@
P.server_banner = s.server_banner;
P.server_users = None;
P.server_preferred = s.server_preferred;
+ P.server_version = s.server_version;
}
else raise Not_found
)
@@ -1161,10 +1162,6 @@
client_ops.op_client_debug <- (fun c debug ->
c.client_debug <- debug)
-let _ =
- network.op_network_connect_servers <- (fun _ ->
- force_check_server_connections true )
-
let ip_of_server_cid s =
match s.server_cid with
None -> Ip.null
Index: mldonkey/src/networks/donkey/donkeyServers.ml
diff -u mldonkey/src/networks/donkey/donkeyServers.ml:1.47
mldonkey/src/networks/donkey/donkeyServers.ml:1.48
--- mldonkey/src/networks/donkey/donkeyServers.ml:1.47 Wed Jan 11 18:53:30 2006
+++ mldonkey/src/networks/donkey/donkeyServers.ml Thu Jan 12 08:57:58 2006
@@ -289,6 +289,14 @@
end
| M.MessageReq msg ->
+
+ (try
+ let prefix = String.sub msg 0 15 in
+ if prefix = "server version " then begin
+ s.server_version <- String.sub msg 15 4;
+ end;
+ with _-> ());
+
if !last_message_sender <> server_num s then begin
let server_header = Printf.sprintf "\n+-- From server %s [%s:%d]
------"
s.server_name (Ip.to_string s.server_ip) s.server_port in
@@ -766,8 +774,6 @@
let make_master s =
(* normal servers don't have our SHARE, so send list if it becomes a
master *)
do_if_connected s.server_sock (fun sock ->
- if !verbose then
- lprintf_nl () "master servers: new master: %s, sending shared files"
(Ip.to_string s.server_ip);
s.server_master <- true;
incr nmasters;
Index: mldonkey/src/networks/donkey/donkeyTypes.ml
diff -u mldonkey/src/networks/donkey/donkeyTypes.ml:1.35
mldonkey/src/networks/donkey/donkeyTypes.ml:1.36
--- mldonkey/src/networks/donkey/donkeyTypes.ml:1.35 Mon Jan 9 00:22:35 2006
+++ mldonkey/src/networks/donkey/donkeyTypes.ml Thu Jan 12 08:57:58 2006
@@ -548,6 +548,7 @@
mutable server_max_users : int;
mutable server_name : string;
mutable server_description : string;
+ mutable server_version : string;
mutable server_banner : string;
mutable server_users: user list;
mutable server_next_udp : int;
Index: mldonkey/src/networks/fileTP/fileTPInteractive.ml
diff -u mldonkey/src/networks/fileTP/fileTPInteractive.ml:1.27
mldonkey/src/networks/fileTP/fileTPInteractive.ml:1.28
--- mldonkey/src/networks/fileTP/fileTPInteractive.ml:1.27 Wed Jan 11
19:12:35 2006
+++ mldonkey/src/networks/fileTP/fileTPInteractive.ml Thu Jan 12 08:57:58 2006
@@ -475,12 +475,10 @@
let _ =
CommonNetwork.register_commands commands;
- (* Shut up "Network.share not implemented by FileTP" *)
network.op_network_share <- (fun fullname codedname size -> ());
- (* Same with Network.search and Network.forget_search... *)
network.op_network_search <- (fun ss buf -> ());
network.op_network_download <- (fun r -> dummy_file);
file_ops.op_file_commit <- (fun file new_name -> ());
network.op_network_forget_search <- (fun s -> ());
- (* and Network.recover_temp *)
+ network.op_network_connect_servers <- (fun s -> ());
network.op_network_recover_temp <- (fun s -> ())
Index: mldonkey/src/networks/gnutella/gnutellaInteractive.ml
diff -u mldonkey/src/networks/gnutella/gnutellaInteractive.ml:1.47
mldonkey/src/networks/gnutella/gnutellaInteractive.ml:1.48
--- mldonkey/src/networks/gnutella/gnutellaInteractive.ml:1.47 Mon Jan 9
00:22:35 2006
+++ mldonkey/src/networks/gnutella/gnutellaInteractive.ml Thu Jan 12
08:57:58 2006
@@ -336,6 +336,7 @@
P.server_users = None;
P.server_banner = "";
P.server_preferred = false;
+ P.server_version = "";
} else
raise Not_found
);
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., (continued)
- [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, 2006/01/11
- [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 <=
- [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