diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2010-01-31 22:42:52 +0100 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2010-02-01 01:17:29 +0100 |
commit | 350661a6eb089f3e54e67e022db9e16ea280499f (patch) | |
tree | e6857b58f535bab42e2381f7fbb027f4cc9aa63a /extensions/libxt_conntrack.c | |
parent | 028ad9ec6d5c27c107c9a7a316617cbe366abb0f (diff) |
includes: header updates
Update the shipped Linux kernel headers from 2.6.33-rc6, as
iptables's ipt_ECN.h for example references ipt_DSCP.h, which no
longer exists.
Since a number of old code pieces have been removed in the kernel in
that fashion, the structs for older versions are moved into the .c
file, to keep header updating simple.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'extensions/libxt_conntrack.c')
-rw-r--r-- | extensions/libxt_conntrack.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c index 5ca734d2..e8225e6d 100644 --- a/extensions/libxt_conntrack.c +++ b/extensions/libxt_conntrack.c @@ -22,6 +22,39 @@ #include <linux/netfilter/nf_conntrack_common.h> #include <arpa/inet.h> +struct ip_conntrack_old_tuple { + struct { + __be32 ip; + union { + __u16 all; + } u; + } src; + + struct { + __be32 ip; + union { + __u16 all; + } u; + + /* The protocol. */ + __u16 protonum; + } dst; +}; + +struct xt_conntrack_info { + unsigned int statemask, statusmask; + + struct ip_conntrack_old_tuple tuple[IP_CT_DIR_MAX]; + struct in_addr sipmsk[IP_CT_DIR_MAX], dipmsk[IP_CT_DIR_MAX]; + + unsigned long expires_min, expires_max; + + /* Flags word */ + u_int8_t flags; + /* Inverse flags */ + u_int8_t invflags; +}; + static void conntrack_mt_help(void) { printf( |