Pablo Neira Ayuso says: ==================== The following patchset contain updates for your net-next tree, they are: * Fix (for just added) connlabel dependencies, from Florian Westphal. * Add aliasing support for conntrack, thus users can either use -m state or -m conntrack from iptables while using the same kernel module, from Jozsef Kadlecsik. * Some code refactoring for the CT target to merge common code in revision 0 and 1, from myself. * Add aliasing support for CT, based on patch from Jozsef Kadlecsik. * Add one mutex per nfnetlink subsystem, from myself. * Improved logging for packets that are dropped by helpers, from myself. ====================
Showing the changes to include/uapi/linux (2 of 25 files). Show all
Unified · Split
| @@ -3,7 +3,11 @@ · 2 unmodified lines | |||
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | 5 | ||
| 6 | #define XT_CT_NOTRACK 0x1 | 6 | enum { |
| 7 | XT_CT_NOTRACK = 1 << 0, | ||
| 8 | XT_CT_NOTRACK_ALIAS = 1 << 1, | ||
| 9 | XT_CT_MASK = XT_CT_NOTRACK | XT_CT_NOTRACK_ALIAS, | ||
| 10 | }; | ||
| 7 | 11 | ||
| 8 | struct xt_ct_target_info { | 12 | struct xt_ct_target_info { |
| 9 | __u16 flags; | 13 | __u16 flags; |
| @@ -31,6 +31,7 @@ enum { · 30 unmodified lines | |||
| 31 | XT_CONNTRACK_REPLSRC_PORT = 1 << 10, | 31 | XT_CONNTRACK_REPLSRC_PORT = 1 << 10, |
| 32 | XT_CONNTRACK_REPLDST_PORT = 1 << 11, | 32 | XT_CONNTRACK_REPLDST_PORT = 1 << 11, |
| 33 | XT_CONNTRACK_DIRECTION = 1 << 12, | 33 | XT_CONNTRACK_DIRECTION = 1 << 12, |
| 34 | XT_CONNTRACK_STATE_ALIAS = 1 << 13, | ||
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| 36 | struct xt_conntrack_mtinfo1 { | 37 | struct xt_conntrack_mtinfo1 { |