summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kadlec/emailAddress=kadlec@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kadlec/emailAddress=kadlec@netfilter.org>2005-10-28 19:21:38 +0000
committer/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kadlec/emailAddress=kadlec@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kadlec/emailAddress=kadlec@netfilter.org>2005-10-28 19:21:38 +0000
commit6619d0f978ca0748293f98952b74ebef81ebd6b1 (patch)
treea4d3515633378613486a1a4094f1abc7d384c407
parentf08fd20fb6a2ea4afb92c904dc6852bf01118f95 (diff)
Manpage extended with a few words to explain iptree type of sets
and timing out entries.
-rw-r--r--ChangeLog8
-rw-r--r--Makefile2
-rw-r--r--ipset.86
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 50ae5ed..d76ded8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
+2.2.6
+ - memory allocation in iptree is changed to GFP_ATOMIC because
+ we hold a lock (bug reported by Radek Hladik)
+ - compatibility fix: __nocast is not defined in all 2.6 branches
+ (problem reported by Ming-Ching Tiew)
+ - manpage corrections
+
2.2.5
- garbage collector of iptree type of sets is fixed: flushing
sets/removing kernel module could corrupt the timer
- new ipporthash type added
- manpage fixes and corrections
+
2.2.4
- half-fixed memory allocation bug in iphash and nethash finally
completely fixed (bug reported by Nikolai Malykh)
diff --git a/Makefile b/Makefile
index 970da6c..5f4623f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ifndef KERNEL_DIR
KERNEL_DIR=/usr/src/linux
endif
-IPSET_VERSION:=2.2.5
+IPSET_VERSION:=2.2.6
PREFIX:=/usr/local
LIBDIR:=$(PREFIX)/lib
diff --git a/ipset.8 b/ipset.8
index 3dcef3c..89a86ce 100644
--- a/ipset.8
+++ b/ipset.8
@@ -412,8 +412,10 @@ Options to use when creating an iptree set:
.BR "--timeout " value
The timeout value for the entries in seconds (default 0)
.P
-When adding an IP address to a set, one may add it with a specific timeout
-value using the syntax
+If a set was created with a nonzero valued
+.B "--timeout"
+parameter then one may add IP addresses to the set with a specific
+timeout value using the syntax
.I IP%timeout-value.
.SH GENERAL RESTRICTIONS
Setnames starting with colon (:) cannot be defined. Zero valued set