[netfilter-cvslog] r4395 - trunk/ipset

[kadlec at netfilter.org]

Author: kadlec at netfilter.org
Date: 2005-10-28 21:21:38 +0200 (Fri, 28 Oct 2005)
New Revision: 4395

Modified:
   trunk/ipset/ChangeLog
   trunk/ipset/Makefile
   trunk/ipset/ipset.8
Log:
Manpage extended with a few words to explain iptree type of sets
and timing out entries.


Modified: trunk/ipset/ChangeLog
===================================================================
--- trunk/ipset/ChangeLog	2005-10-28 00:41:23 UTC (rev 4394)
+++ trunk/ipset/ChangeLog	2005-10-28 19:21:38 UTC (rev 4395)
@@ -1,3 +1,10 @@
+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
@@ -3,4 +10,5 @@
  - new ipporthash type added
  - manpage fixes and corrections
+
 2.2.4
  - half-fixed memory allocation bug in iphash and nethash finally

Modified: trunk/ipset/Makefile
===================================================================
--- trunk/ipset/Makefile	2005-10-28 00:41:23 UTC (rev 4394)
+++ trunk/ipset/Makefile	2005-10-28 19:21:38 UTC (rev 4395)
@@ -8,7 +8,7 @@
 KERNEL_DIR=/usr/src/linux
 endif
 
-IPSET_VERSION:=2.2.5
+IPSET_VERSION:=2.2.6
 
 PREFIX:=/usr/local
 LIBDIR:=$(PREFIX)/lib

Modified: trunk/ipset/ipset.8
===================================================================
--- trunk/ipset/ipset.8	2005-10-28 00:41:23 UTC (rev 4394)
+++ trunk/ipset/ipset.8	2005-10-28 19:21:38 UTC (rev 4395)
@@ -412,8 +412,10 @@
 .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