From d167a7b1f5307c73a39b5a209e0f9bc54cd2d989 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org" Date: Sat, 8 Dec 2007 18:37:19 +0000 Subject: Add support for conntrack master setup --- include/internal.h | 3 ++- include/libnetfilter_conntrack/libnetfilter_conntrack.h | 10 +++++++++- include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/internal.h b/include/internal.h index cf2d7a1..1cda181 100644 --- a/include/internal.h +++ b/include/internal.h @@ -90,7 +90,8 @@ struct __nfct_tuple { #define __DIR_ORIG 0 #define __DIR_REPL 1 -#define __DIR_MAX __DIR_REPL+1 +#define __DIR_MASTER 2 +#define __DIR_MAX __DIR_MASTER+1 union __nfct_protoinfo { struct { diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h index 54c98b3..3b572aa 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h @@ -101,7 +101,15 @@ enum nf_conntrack_attr { ATTR_TCP_FLAGS_ORIG, /* u8 bits */ ATTR_TCP_FLAGS_REPL, /* u8 bits */ ATTR_TCP_MASK_ORIG, /* u8 bits */ - ATTR_TCP_MASK_REPL, /* u8 bits */ + ATTR_TCP_MASK_REPL = 36, /* u8 bits */ + ATTR_MASTER_IPV4_SRC, /* u32 bits */ + ATTR_MASTER_IPV4_DST, /* u32 bits */ + ATTR_MASTER_IPV6_SRC, /* u128 bits */ + ATTR_MASTER_IPV6_DST = 40, /* u128 bits */ + ATTR_MASTER_PORT_SRC, /* u16 bits */ + ATTR_MASTER_PORT_DST, /* u16 bits */ + ATTR_MASTER_L3PROTO, /* u8 bits */ + ATTR_MASTER_L4PROTO = 44, /* u8 bits */ ATTR_MAX }; diff --git a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h index 71baee1..ef9d0a6 100644 --- a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +++ b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h @@ -40,6 +40,7 @@ enum ctattr_type { CTA_USE, CTA_ID, CTA_NAT_DST, + CTA_TUPLE_MASTER, __CTA_MAX }; #define CTA_MAX (__CTA_MAX - 1) -- cgit v1.2.3