Conflicts: net/netfilter/nf_conntrack_proto_tcp.c The conflict had to do with overlapping changes dealing with fixing the use of an "s32" to hold the value returned by NAT_OFFSET(). Pablo Neira Ayuso says: ==================== The following batch contains Netfilter/IPVS updates for your net-next tree. More specifically, they are: * Trivial typo fix in xt_addrtype, from Phil Oester. * Remove net_ratelimit in the conntrack logging for consistency with other logging subsystem, from Patrick McHardy. * Remove unneeded includes from the recently added xt_connlabel support, from Florian Westphal. * Allow to update conntracks via nfqueue, don't need NFQA_CFG_F_CONNTRACK for this, from Florian Westphal. * Remove tproxy core, now that we have socket early demux, from Florian Westphal. * A couple of patches to refactor conntrack event reporting to save a good bunch of lines, from Florian Westphal. * Fix missing locking in NAT sequence adjustment, it did not manifested in any known bug so far, from Patrick McHardy. * Change sequence number adjustment variable to 32 bits, to delay the possible early overflow in long standing connections, also from Patrick. * Comestic cleanups for IPVS, from Dragos Foianu. * Fix possible null dereference in IPVS in the SH scheduler, from Daniel Borkmann. * Allow to attach conntrack expectations via nfqueue. Before this patch, you had to use ctnetlink instead, thus, we save the conntrack lookup. * Export xt_rpfilter and xt_HMARK header files, from Nicolas Dichtel. ====================
Showing the changes to include/uapi/linux (4 of 32 files). Show all
Unified · Split
| @@ -22,6 +22,7 @@ header-y += xt_CONNMARK.h · 21 unmodified lines | ||
| 22 | 22 | header-y += xt_CONNSECMARK.h |
| 23 | 23 | header-y += xt_CT.h |
| 24 | 24 | header-y += xt_DSCP.h |
| 25 | +header-y += xt_HMARK.h | |
| 25 | 26 | header-y += xt_IDLETIMER.h |
| 26 | 27 | header-y += xt_LED.h |
| 27 | 28 | header-y += xt_LOG.h |
| @@ -68,6 +69,7 @@ header-y += xt_quota.h · 40 unmodified lines | ||
| 68 | 69 | header-y += xt_rateest.h |
| 69 | 70 | header-y += xt_realm.h |
| 70 | 71 | header-y += xt_recent.h |
| 72 | +header-y += xt_rpfilter.h | |
| 71 | 73 | header-y += xt_sctp.h |
| 72 | 74 | header-y += xt_set.h |
| 73 | 75 | header-y += xt_socket.h |
| @@ -46,6 +46,7 @@ enum nfqnl_attr_type { · 45 unmodified lines | ||
| 46 | 46 | NFQA_CT_INFO, /* enum ip_conntrack_info */ |
| 47 | 47 | NFQA_CAP_LEN, /* __u32 length of captured packet */ |
| 48 | 48 | NFQA_SKB_INFO, /* __u32 skb meta information */ |
| 49 | + NFQA_EXP, /* nf_conntrack_netlink.h */ | |
| 49 | 50 | |
| 50 | 51 | __NFQA_MAX |
| 51 | 52 | }; |
| @@ -0,0 +1,50 @@ | ||
| 1 | +#ifndef XT_HMARK_H_ | |
| 2 | +#define XT_HMARK_H_ | |
| 3 | + | |
| 4 | +#include <linux/types.h> | |
| 5 | + | |
| 6 | +enum { | |
| 7 | + XT_HMARK_SADDR_MASK, | |
| 8 | + XT_HMARK_DADDR_MASK, | |
| 9 | + XT_HMARK_SPI, | |
| 10 | + XT_HMARK_SPI_MASK, | |
| 11 | + XT_HMARK_SPORT, | |
| 12 | + XT_HMARK_DPORT, | |
| 13 | + XT_HMARK_SPORT_MASK, | |
| 14 | + XT_HMARK_DPORT_MASK, | |
| 15 | + XT_HMARK_PROTO_MASK, | |
| 16 | + XT_HMARK_RND, | |
| 17 | + XT_HMARK_MODULUS, | |
| 18 | + XT_HMARK_OFFSET, | |
| 19 | + XT_HMARK_CT, | |
| 20 | + XT_HMARK_METHOD_L3, | |
| 21 | + XT_HMARK_METHOD_L3_4, | |
| 22 | +}; | |
| 23 | +#define XT_HMARK_FLAG(flag) (1 << flag) | |
| 24 | + | |
| 25 | +union hmark_ports { | |
| 26 | + struct { | |
| 27 | + __u16 src; | |
| 28 | + __u16 dst; | |
| 29 | + } p16; | |
| 30 | + struct { | |
| 31 | + __be16 src; | |
| 32 | + __be16 dst; | |
| 33 | + } b16; | |
| 34 | + __u32 v32; | |
| 35 | + __be32 b32; | |
| 36 | +}; | |
| 37 | + | |
| 38 | +struct xt_hmark_info { | |
| 39 | + union nf_inet_addr src_mask; | |
| 40 | + union nf_inet_addr dst_mask; | |
| 41 | + union hmark_ports port_mask; | |
| 42 | + union hmark_ports port_set; | |
| 43 | + __u32 flags; | |
| 44 | + __u16 proto_mask; | |
| 45 | + __u32 hashrnd; | |
| 46 | + __u32 hmodulus; | |
| 47 | + __u32 hoffset; /* Mark offset to start from */ | |
| 48 | +}; | |
| 49 | + | |
| 50 | +#endif /* XT_HMARK_H_ */ | |
| @@ -0,0 +1,23 @@ | ||
| 1 | +#ifndef _XT_RPATH_H | |
| 2 | +#define _XT_RPATH_H | |
| 3 | + | |
| 4 | +#include <linux/types.h> | |
| 5 | + | |
| 6 | +enum { | |
| 7 | + XT_RPFILTER_LOOSE = 1 << 0, | |
| 8 | + XT_RPFILTER_VALID_MARK = 1 << 1, | |
| 9 | + XT_RPFILTER_ACCEPT_LOCAL = 1 << 2, | |
| 10 | + XT_RPFILTER_INVERT = 1 << 3, | |
| 11 | +#ifdef __KERNEL__ | |
| 12 | + XT_RPFILTER_OPTION_MASK = XT_RPFILTER_LOOSE | | |
| 13 | + XT_RPFILTER_VALID_MARK | | |
| 14 | + XT_RPFILTER_ACCEPT_LOCAL | | |
| 15 | + XT_RPFILTER_INVERT, | |
| 16 | +#endif | |
| 17 | +}; | |
| 18 | + | |
| 19 | +struct xt_rpfilter_info { | |
| 20 | + __u8 flags; | |
| 21 | +}; | |
| 22 | + | |
| 23 | +#endif | |