From 8b14339d6d26c5ff0ab176edba9bcfb0fa7526e1 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org" Date: Mon, 17 Dec 2007 00:55:40 +0000 Subject: - add support for secmark - fix typo s/test_but/test_bit/ --- include/internal.h | 1 + include/libnetfilter_conntrack/libnetfilter_conntrack.h | 1 + include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h | 11 +++++++++++ 3 files changed, 13 insertions(+) (limited to 'include') diff --git a/include/internal.h b/include/internal.h index 0e7d9ae..dea49e3 100644 --- a/include/internal.h +++ b/include/internal.h @@ -118,6 +118,7 @@ struct nf_conntrack { u_int32_t timeout; u_int32_t mark; + u_int32_t secmark; u_int32_t status; u_int32_t use; u_int32_t id; diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h index 3b572aa..b977082 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h @@ -110,6 +110,7 @@ enum nf_conntrack_attr { ATTR_MASTER_PORT_DST, /* u16 bits */ ATTR_MASTER_L3PROTO, /* u8 bits */ ATTR_MASTER_L4PROTO = 44, /* u8 bits */ + ATTR_SECMARK, /* u32 bits */ ATTR_MAX }; diff --git a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h index ef9d0a6..7f0fe96 100644 --- a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +++ b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h @@ -41,6 +41,9 @@ enum ctattr_type { CTA_ID, CTA_NAT_DST, CTA_TUPLE_MASTER, + CTA_NAT_SEQ_ADJ_ORIG, + CTA_NAT_SEQ_ADJ_REPLY, + CTA_SECMARK, __CTA_MAX }; #define CTA_MAX (__CTA_MAX - 1) @@ -123,6 +126,14 @@ enum ctattr_protonat { }; #define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1) +enum ctattr_natseq { + CTA_NAT_SEQ_CORRECTION_POS, + CTA_NAT_SEQ_OFFSET_BEFORE, + CTA_NAT_SEQ_OFFSET_AFTER, + __CTA_NAT_SEQ_MAX +}; +#define CTA_NAT_SEQ_MAX (__CTA_NAT_SEQ_MAX - 1) + enum ctattr_expect { CTA_EXPECT_UNSPEC, CTA_EXPECT_MASTER, -- cgit v1.2.3