From: /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kadlec/emailAddress=kadlec@netfilter.org Date: Fri, 28 Oct 2005 19:21:38 +0000 (+0000) Subject: Manpage extended with a few words to explain iptree type of sets X-Git-Tag: v2.4.6~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6619d0f978ca0748293f98952b74ebef81ebd6b1;p=thirdparty%2Fipset.git Manpage extended with a few words to explain iptree type of sets and timing out entries. --- diff --git a/ChangeLog b/ChangeLog index 50ae5ed8..d76ded83 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 970da6cd..5f4623f5 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 3dcef3c0..89a86ce8 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