From 8ee6d3dd791e01872695f708e73d734219b8fea9 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org" Date: Wed, 16 Apr 2008 14:46:17 +0000 Subject: - bump version to 0.0.92 - recover the ID support - add support for timeout comparison - ignore set operation for counters and use attributes - fix broken status comparison - statify several __snprintf functions --- src/conntrack/snprintf_default.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'src/conntrack/snprintf_default.c') diff --git a/src/conntrack/snprintf_default.c b/src/conntrack/snprintf_default.c index 5811290..e2573df 100644 --- a/src/conntrack/snprintf_default.c +++ b/src/conntrack/snprintf_default.c @@ -1,5 +1,5 @@ /* - * (C) 2006 by Pablo Neira Ayuso + * (C) 2006-2008 by Pablo Neira Ayuso * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. @@ -194,26 +194,28 @@ int __snprintf_counters(char *buf, (unsigned long long) ct->counters[dir].bytes)); } -int __snprintf_mark(char *buf, unsigned int len, const struct nf_conntrack *ct) +static int +__snprintf_mark(char *buf, unsigned int len, const struct nf_conntrack *ct) { return (snprintf(buf, len, "mark=%u ", ct->mark)); } -int __snprintf_secmark(char *buf, - unsigned int len, - const struct nf_conntrack *ct) +static int +__snprintf_secmark(char *buf, unsigned int len, const struct nf_conntrack *ct) { return (snprintf(buf, len, "secmark=%u ", ct->secmark)); } -int __snprintf_use(char *buf, unsigned int len, const struct nf_conntrack *ct) +static int +__snprintf_use(char *buf, unsigned int len, const struct nf_conntrack *ct) { return (snprintf(buf, len, "use=%u ", ct->use)); } -int __snprintf_id(char *buf, unsigned int len, u_int32_t id) +static int +__snprintf_id(char *buf, unsigned int len, const struct nf_conntrack *ct) { - return (snprintf(buf, len, "id=%u ", id)); + return (snprintf(buf, len, "id=%u ", ct->id)); } int __snprintf_conntrack_default(char *buf, @@ -307,6 +309,11 @@ int __snprintf_conntrack_default(char *buf, BUFFER_SIZE(ret, size, len, offset); } + if (flags & NFCT_OF_ID && test_bit(ATTR_ID, ct->set)) { + ret = __snprintf_id(buf+offset, len, ct); + BUFFER_SIZE(ret, size, len, offset); + } + /* Delete the last blank space */ size--; -- cgit v1.2.3