diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2009-08-05 18:13:11 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2009-08-05 18:13:11 +0200 |
| commit | 8e4dacaed17701cb1891b962bb856e0e8cfbb5c8 (patch) | |
| tree | 78d2f85ee04280407f81f000ac6ecf0554a560cd /include | |
| parent | 80fcb7b40823fed288e253c4a798eb4ee405102c (diff) | |
| parent | efebafa0021f36f4547b7fcc47620274f333e001 (diff) | |
Merge branch 'stable'
Conflicts:
extensions/libxt_conntrack.c
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/xt_conntrack.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h index 8f534527..21b222e6 100644 --- a/include/linux/netfilter/xt_conntrack.h +++ b/include/linux/netfilter/xt_conntrack.h @@ -81,4 +81,17 @@ struct xt_conntrack_mtinfo1 { u_int8_t state_mask, status_mask; }; +struct xt_conntrack_mtinfo2 { + 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; + __be16 origsrc_port, origdst_port; + __be16 replsrc_port, repldst_port; + __u16 match_flags, invert_flags; + __u16 state_mask, status_mask; +}; + #endif /*_XT_CONNTRACK_H*/ |