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/setter.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'src/conntrack/setter.c') diff --git a/src/conntrack/setter.c b/src/conntrack/setter.c index 62be3e6..52a2aab 100644 --- a/src/conntrack/setter.c +++ b/src/conntrack/setter.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. @@ -210,6 +210,11 @@ static void set_attr_status(struct nf_conntrack *ct, const void *value) ct->status = *((u_int32_t *) value); } +static void set_attr_id(struct nf_conntrack *ct, const void *value) +{ + ct->id = *((u_int32_t *) value); +} + static void set_attr_master_ipv4_src(struct nf_conntrack *ct, const void *value) { ct->tuple[__DIR_MASTER].src.v4 = *((u_int32_t *) value); @@ -280,6 +285,8 @@ static void set_attr_repl_off_aft(struct nf_conntrack *ct, const void *value) ct->tuple[__DIR_REPL].natseq.offset_after = *((u_int32_t *) value); } +static void set_attr_do_nothing(struct nf_conntrack *ct, const void *value) {} + set_attr set_attr_array[] = { [ATTR_ORIG_IPV4_SRC] = set_attr_orig_ipv4_src, [ATTR_ORIG_IPV4_DST] = set_attr_orig_ipv4_dst, @@ -307,6 +314,12 @@ set_attr set_attr_array[] = { [ATTR_DNAT_PORT] = set_attr_dnat_port, [ATTR_TIMEOUT] = set_attr_timeout, [ATTR_MARK] = set_attr_mark, + [ATTR_ORIG_COUNTER_PACKETS] = set_attr_do_nothing, + [ATTR_REPL_COUNTER_PACKETS] = set_attr_do_nothing, + [ATTR_ORIG_COUNTER_BYTES] = set_attr_do_nothing, + [ATTR_REPL_COUNTER_BYTES] = set_attr_do_nothing, + [ATTR_USE] = set_attr_do_nothing, + [ATTR_ID] = set_attr_id, [ATTR_STATUS] = set_attr_status, [ATTR_TCP_FLAGS_ORIG] = set_attr_tcp_flags_orig, [ATTR_TCP_FLAGS_REPL] = set_attr_tcp_flags_repl, -- cgit v1.2.3