diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-20 00:06:15 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-20 00:06:15 -0800 |
commit | a07aa004c8d814a975b1a68afdb7baaa8f1b91d5 (patch) | |
tree | 652edc2dce9732a64780b9e332034b6567631a8b /include/linux/netfilter/xt_conntrack.h | |
parent | net_sched: cleanups (diff) | |
parent | netfilter: xtables: remove extraneous header that slipped in (diff) | |
download | linux-dev-a07aa004c8d814a975b1a68afdb7baaa8f1b91d5.tar.xz linux-dev-a07aa004c8d814a975b1a68afdb7baaa8f1b91d5.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'include/linux/netfilter/xt_conntrack.h')
-rw-r--r-- | include/linux/netfilter/xt_conntrack.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h index 54f47a2f6152..74b904d8f99c 100644 --- a/include/linux/netfilter/xt_conntrack.h +++ b/include/linux/netfilter/xt_conntrack.h @@ -58,4 +58,19 @@ struct xt_conntrack_mtinfo2 { __u16 state_mask, status_mask; }; +struct xt_conntrack_mtinfo3 { + union nf_inet_addr origsrc_addr, origsrc_mask; + union nf_inet_addr origdst_addr, origdst_mask; + union nf_inet_addr replsrc_addr, replsrc_mask; + union nf_inet_addr repldst_addr, repldst_mask; + __u32 expires_min, expires_max; + __u16 l4proto; + __u16 origsrc_port, origdst_port; + __u16 replsrc_port, repldst_port; + __u16 match_flags, invert_flags; + __u16 state_mask, status_mask; + __u16 origsrc_port_high, origdst_port_high; + __u16 replsrc_port_high, repldst_port_high; +}; + #endif /*_XT_CONNTRACK_H*/ |