[ANNOUNCE] conntrack-tools 1.2.0 release

[ANNOUNCE] conntrack-tools 1.2.0 release

[Pablo Neira Ayuso]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

Hi!

The Netfilter project proudly presents:

        conntrack-tools 1.2.0

This release is a major milestone that includes support for
expectation synchronization and the new nfct utility that, by now,
only supports the new cttimeout infrastructure.

See ChangeLog that comes attached to this email for more details.

You can download it from:

http://www.netfilter.org/projects/conntrack-tools/downloads.html
ftp://ftp.netfilter.org/pub/conntrack-tools/

Have fun!

[-- Attachment #2: changes-conntrack-tools-1.2.0.txt --]
[-- Type: text/plain, Size: 2152 bytes --]

Adrian Bridgett (1):
      src: manpage and help display improvements

Florian Westphal (1):
      conntrack: flush stdout for each expectation event, too

Pablo Neira Ayuso (34):
      conntrackd: generalize caching infrastructure
      conntrackd: generalize external handlers to prepare expectation support
      conntrackd: generalize/cleanup network message building/parsing
      conntrackd: generalize local handler actions
      conntrackd: simplify cache_get_extra function
      conntrackd: remove cache_data_get_object and replace by direct pointer
      conntrackd: constify ct parameter of ct_filter_* functions
      conntrackd: relax checkings in ct_filter_sanity_check
      conntrackd: minor cleanup for commit
      conntrackd: support for expectation synchronization
      doc: update conntrack-tools manual to detail expectation support
      conntrackd: fix expectation filtering if ExpectationSync On is used
      conntrack: add expectation support for `-o' option
      conntrackd: support `-i exp -x' and `-e exp -x' options
      conntrack: fix setting fixed-timeout status flag
      conntrackd: add support expectation class synchronization
      conntrackd: add NAT expectation support
      conntrackd: add support to synchronize helper name
      conntrackd: support expectfn synchronization for expectations
      conntrackd: fix parsing of expectation class, helper name and NAT
      conntrack: allow to filter by mark from kernel-space
      conntrackd: allow using lower/upper case in ExpectationSync
      doc: add ras, q.931 and h.245 to examples configuration file
      doc: fix example on how to filter events via iptables CT target
      icmp[v6]: --icmp[v6]-[type|code] are optional for updates and deletes
      src: integrate nfct into the conntrack-tools tree
      tests: add nfct tests for cttimeout
      build: bump version to 1.2.0
      nfct: fix compilation warning in cttimeout support
      build: update dependencies with libnetfilter_conntrack (>= 1.0.1)
      move qa directory to tests/conntrack/
      tests: conntrack: add run-test.sh script
      add nfct(8) manpage
      add README.nfct

Re: conntrack-tools 1.2.0 release

[Jan Engelhardt]

The following changes since commit 318756cd4df1cb7760bf32d3e1d3756c41d1858b:

  add README.nfct (2012-05-26 18:04:11 +0200)

are available in the git repository at:
  git://git.inai.de/conntrack-tools master

Jan Engelhardt (2):
      nfct-extensions/timeout: adjust for changed nfct_timeout_snprintf API
      Update .gitignore

 .gitignore                    |    1 +
 src/.gitignore                |    1 +
 src/nfct-extensions/timeout.c |    2 +-
 3 files changed, 3 insertions(+), 1 deletions(-)

[PATCH 1/2] nfct-extensions/timeout: adjust for changed nfct_timeout_snprintf API

[Jan Engelhardt]

Despite requiring libnetfilter_cttimeout >= 1.0.0, it did not
use the new API.

nfct-extensions/timeout.c: In function 'nfct_timeout_cb':
nfct-extensions/timeout.c:99:2: error: too few arguments to function
	'nfct_timeout_snprintf'
In file included from nfct-extensions/timeout.c:26:0:
/usr/include/libnetfilter_cttimeout-1.0.0/libnetfilter_cttimeout/
	libnetfilter_cttimeout.h:114:5: note: declared here

114: int nfct_timeout_snprintf(char *buf, size_t size,
	const struct nfct_timeout *, unsigned int type, unsigned int flags);

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
 src/nfct-extensions/timeout.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/nfct-extensions/timeout.c b/src/nfct-extensions/timeout.c
index a1a5c52..5b32023 100644
--- a/src/nfct-extensions/timeout.c
+++ b/src/nfct-extensions/timeout.c
@@ -96,7 +96,7 @@ static int nfct_timeout_cb(const struct nlmsghdr *nlh, void *data)
 		goto err_free;
 	}
 
-	nfct_timeout_snprintf(buf, sizeof(buf), t, 0);
+	nfct_timeout_snprintf(buf, sizeof(buf), t, NFCT_TIMEOUT_O_DEFAULT, 0);
 	printf("%s\n", buf);
 
 err_free:
-- 
1.7.7

[PATCH 2/2] Update .gitignore

[Jan Engelhardt]

---
 .gitignore     |    1 +
 src/.gitignore |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 928e44b..f7a5fc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .deps/
 .libs/
+.dirstamp
 Makefile
 Makefile.in
 *.o
diff --git a/src/.gitignore b/src/.gitignore
index 6e6763d..55a0d27 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,5 +1,6 @@
 /conntrack
 /conntrackd
+/nfct
 
 /read_config_lex.c
 /read_config_yy.c
-- 
1.7.7

Re: [PATCH 2/2] Update .gitignore

[Pablo Neira Ayuso]

Applied, thanks Jan.

On Sat, May 26, 2012 at 09:02:35PM +0200, Jan Engelhardt wrote:
> ---
>  .gitignore     |    1 +
>  src/.gitignore |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 928e44b..f7a5fc7 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,5 +1,6 @@
>  .deps/
>  .libs/
> +.dirstamp
>  Makefile
>  Makefile.in
>  *.o
> diff --git a/src/.gitignore b/src/.gitignore
> index 6e6763d..55a0d27 100644
> --- a/src/.gitignore
> +++ b/src/.gitignore
> @@ -1,5 +1,6 @@
>  /conntrack
>  /conntrackd
> +/nfct
>  
>  /read_config_lex.c
>  /read_config_yy.c
> -- 
> 1.7.7
> 

Re: [PATCH 1/2] nfct-extensions/timeout: adjust for changed nfct_timeout_snprintf API

[Pablo Neira Ayuso]

On Sat, May 26, 2012 at 09:02:34PM +0200, Jan Engelhardt wrote:
> Despite requiring libnetfilter_cttimeout >= 1.0.0, it did not
> use the new API.
> 
> nfct-extensions/timeout.c: In function 'nfct_timeout_cb':
> nfct-extensions/timeout.c:99:2: error: too few arguments to function
> 	'nfct_timeout_snprintf'
> In file included from nfct-extensions/timeout.c:26:0:
> /usr/include/libnetfilter_cttimeout-1.0.0/libnetfilter_cttimeout/
> 	libnetfilter_cttimeout.h:114:5: note: declared here
> 
> 114: int nfct_timeout_snprintf(char *buf, size_t size,
> 	const struct nfct_timeout *, unsigned int type, unsigned int flags);

We noticed at the same time.

It's fixed now, and conntrack-tools 1.2.1 is out. Thanks!

Re: [PATCH 1/2] nfct-extensions/timeout: adjust for changed nfct_timeout_snprintf API

[spiro]

remove me from this list and your lists
Sent via BlackBerry from T-Mobile

-----Original Message-----
From: Pablo Neira Ayuso <pablo@netfilter.org>
Sender: netfilter-announce-bounces@lists.netfilter.org
Date: Sat, 26 May 2012 22:21:05 
To: Jan Engelhardt<jengelh@inai.de>
Cc: <netdev@vger.kernel.org>; <netfilter@vger.kernel.org>; <netfilter-devel@vger.kernel.org>; <netfilter-announce@lists.netfilter.org>
Subject: Re: [PATCH 1/2] nfct-extensions/timeout: adjust for changed
	nfct_timeout_snprintf API

On Sat, May 26, 2012 at 09:02:34PM +0200, Jan Engelhardt wrote:
> Despite requiring libnetfilter_cttimeout >= 1.0.0, it did not
> use the new API.
> 
> nfct-extensions/timeout.c: In function 'nfct_timeout_cb':
> nfct-extensions/timeout.c:99:2: error: too few arguments to function
> 	'nfct_timeout_snprintf'
> In file included from nfct-extensions/timeout.c:26:0:
> /usr/include/libnetfilter_cttimeout-1.0.0/libnetfilter_cttimeout/
> 	libnetfilter_cttimeout.h:114:5: note: declared here
> 
> 114: int nfct_timeout_snprintf(char *buf, size_t size,
> 	const struct nfct_timeout *, unsigned int type, unsigned int flags);

We noticed at the same time.

It's fixed now, and conntrack-tools 1.2.1 is out. Thanks!

[PATCH 2/2] Update .gitignore

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
 .gitignore |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a83525b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+.deps/
+.libs/
+Makefile
+Makefile.in
+*.o
+*.la
+*.lo
+
+/aclocal.m4
+/autom4te.cache/
+/build-aux/
+/config.*
+/configure
+/libtool
+
+/doxygen.cfg
+/*.pc
+/stamp-h1
-- 
1.7.10.4