[netfilter-cvslog] r6866 - in trunk/conntrack-tools: . src

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2007-06-07 20:47:43 +0200 (Thu, 07 Jun 2007)
New Revision: 6866

Modified:
   trunk/conntrack-tools/ChangeLog
   trunk/conntrack-tools/src/cache_iterators.c
Log:
commit phase: if conntrack exists, update it


Modified: trunk/conntrack-tools/ChangeLog
===================================================================
--- trunk/conntrack-tools/ChangeLog	2007-06-07 18:45:47 UTC (rev 6865)
+++ trunk/conntrack-tools/ChangeLog	2007-06-07 18:47:43 UTC (rev 6866)
@@ -10,6 +10,7 @@
 o remove confusing StripNAT parameter: NAT support enabled by default
 o relax event tracking: *_update callbacks use cache_update_force
 o use wraparound-aware functions after/before/between
+o commit phase: if conntrack exists, update it
 o lots of cleanups
 
 = conntrack =

Modified: trunk/conntrack-tools/src/cache_iterators.c
===================================================================
--- trunk/conntrack-tools/src/cache_iterators.c	2007-06-07 18:45:47 UTC (rev 6865)
+++ trunk/conntrack-tools/src/cache_iterators.c	2007-06-07 18:47:43 UTC (rev 6866)
@@ -112,7 +112,7 @@
 	nfct_set_attr_u32(ct, ATTR_TIMEOUT, CONFIG(commit_timeout));
 
         ret = nfct_build_query(STATE(subsys_dump),
-			       NFCT_Q_CREATE,
+			       NFCT_Q_CREATE_UPDATE,
 			       ct,
 			       nlh,
 			       sizeof(buf));