[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/... |
Date: |
Mon, 20 Nov 2006 22:48:43 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 06/11/20 22:48:43
Modified files:
distrib : ChangeLog
src/networks/donkey: donkeyGlobals.ml donkeyInteractive.ml
donkeyOptions.ml
Log message:
patch #5568
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1104&r2=1.1105
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.137&r2=1.138
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOptions.ml?cvsroot=mldonkey&r1=1.54&r2=1.55
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1104
retrieving revision 1.1105
diff -u -b -r1.1104 -r1.1105
--- distrib/ChangeLog 20 Nov 2006 22:34:40 -0000 1.1104
+++ distrib/ChangeLog 20 Nov 2006 22:48:42 -0000 1.1105
@@ -15,6 +15,7 @@
=========
2006/11/20
+5568: EDK: Support CIDR and IP ranges in server_black_list (pango)
5574: allowed_ips: Fix list usage when 0.0.0.0/0 is part of the list (pango)
5570: Some log messages in gettext module (Schlumpf)
5569: HTML: Fix display bug in server list after js popups
Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- src/networks/donkey/donkeyGlobals.ml 14 Nov 2006 18:42:59 -0000
1.105
+++ src/networks/donkey/donkeyGlobals.ml 20 Nov 2006 22:48:43 -0000
1.106
@@ -462,7 +462,10 @@
let is_black_address ip port =
!!black_list && not (low_id ip) && (
(* lprintf "is black ="; *)
- not (Ip.reachable ip) || (Ip.matches ip !!server_black_list) ||
+ not (Ip.reachable ip) ||
+ (match Ip_set.match_ip !server_black_list_set ip with
+ | Some br -> true
+ | None -> false) ||
(List.mem port !!port_black_list) ||
(match !Ip.banned ip with
None -> false
Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- src/networks/donkey/donkeyInteractive.ml 15 Nov 2006 12:34:30 -0000
1.137
+++ src/networks/donkey/donkeyInteractive.ml 20 Nov 2006 22:48:43 -0000
1.138
@@ -815,11 +815,11 @@
"bs", Arg_multiple (fun args o ->
List.iter (fun arg ->
- let ip = Ip.of_string arg in
- server_black_list =:= ip :: !!server_black_list;
+ let range = Ip.range_of_string arg in
+ server_black_list =:= range :: !!server_black_list;
) args;
"done"
- ), "<ip1> <ip2> ... :\t\t\tadd these IPs to the servers black list";
+ ), "<range1> <range2> ... :\t\t\tadd these IPs to the servers black list
(can be single IPs, CIDR ranges or begin-end ranges)";
"port", Arg_one (fun arg o ->
donkey_port =:= int_of_string arg;
Index: src/networks/donkey/donkeyOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOptions.ml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- src/networks/donkey/donkeyOptions.ml 9 Oct 2006 16:17:19 -0000
1.54
+++ src/networks/donkey/donkeyOptions.ml 20 Nov 2006 22:48:43 -0000
1.55
@@ -57,9 +57,15 @@
BasicSocket.mini 5 !!max_connected_servers
let server_black_list = define_option donkey_section ["server_black_list"]
- "A list of server IP to remove from server list.
+ "A list of server IP to remove from server list. Can contain single IPs,
CIDR ranges, or begin-end ranges.
Servers on this list can't be added, and will eventually be removed"
- (list_option Ip.option) []
+ CommonOptions.ip_range_list_option []
+
+let server_black_list_set = ref Ip_set.BL_Empty
+
+let () =
+ option_hook server_black_list (fun _ ->
+ server_black_list_set := Ip_set.of_list !!server_black_list)
let force_high_id = define_option donkey_section ["force_high_id"]
"immediately close connection to servers that don't grant a High ID"
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/05
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/15
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/19
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...,
mldonkey-commits <=
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/21
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/26
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/26
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/26
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/28
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/28