From b24f4ac006dcc3f2c6a904af2f3eb02bd4d16ea2 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 7 Oct 2010 17:43:41 +0200 Subject: expect: add CTA_EXPECT_ZONE support We also remove the reference to CTA_EXPECT_QUEUENR with was not ever pushed into Linux kernel mainline. Signed-off-by: Pablo Neira Ayuso --- include/internal/object.h | 2 +- include/libnetfilter_conntrack/libnetfilter_conntrack.h | 1 + include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/internal/object.h b/include/internal/object.h index dda999a..a0c2b4e 100644 --- a/include/internal/object.h +++ b/include/internal/object.h @@ -257,7 +257,7 @@ struct nf_expect { struct nf_conntrack mask; u_int32_t timeout; u_int32_t id; - u_int16_t expectfn_queue_id; + u_int16_t zone; u_int32_t set[1]; }; diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h index f5c4273..710362c 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h @@ -495,6 +495,7 @@ enum nf_expect_attr { ATTR_EXP_EXPECTED, /* pointer to conntrack object */ ATTR_EXP_MASK, /* pointer to conntrack object */ ATTR_EXP_TIMEOUT, /* u32 bits */ + ATTR_EXP_ZONE, /* u16 bits */ ATTR_EXP_MAX }; diff --git a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h index 022b706..e17e0c5 100644 --- a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +++ b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h @@ -164,7 +164,7 @@ enum ctattr_expect { CTA_EXPECT_TIMEOUT, CTA_EXPECT_ID, CTA_EXPECT_HELP_NAME, - CTA_EXPECT_QUEUENR, + CTA_EXPECT_ZONE, __CTA_EXPECT_MAX }; #define CTA_EXPECT_MAX (__CTA_EXPECT_MAX - 1) -- cgit v1.2.3