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

login
register
mail settings
Submitter Jan Engelhardt
Date May 26, 2012, 7:02 p.m.
Message ID <1338058955-5789-2-git-send-email-jengelh@inai.de>
Download mbox | patch
Permalink /patch/161503/
State Accepted
Headers show

Comments

Jan Engelhardt - May 26, 2012, 7:02 p.m.
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(-)
Pablo Neira - May 26, 2012, 8:21 p.m.
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!
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
spiro@snacorp.net - May 27, 2012, 2:35 a.m.
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

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: