Pablo Neira Ayuso says: ==================== Netfilter/IPVS updates for net-next The following patchset contains Netfilter updates for net-next: 1) Remove the broute pseudo hook, implement this from the bridge prerouting hook instead. Now broute becomes real table in ebtables, from Florian Westphal. This also includes a size reduction patch for the bridge control buffer area via squashing boolean into bitfields and a selftest. 2) Add OS passive fingerprint version matching, from Fernando Fernandez. 3) Support for gue encapsulation for IPVS, from Jacky Hu. 4) Add support for NAT to the inet family, from Florian Westphal. This includes support for masquerade, redirect and nat extensions. 5) Skip interface lookup in flowtable, use device in the dst object. 6) Add jiffies64_to_msecs() and use it, from Li RongQing. 7) Remove unused parameter in nf_tables_set_desc_parse(), from Colin Ian King. 8) Statify several functions, patches from YueHaibing and Florian Westphal. 9) Add an optimized version of nf_inet_addr_cmp(), from Li RongQing. 10) Merge route extension to core, also from Florian. 11) Use IS_ENABLED(CONFIG_NF_NAT) instead of NF_NAT_NEEDED, from Florian. 12) Merge ip/ip6 masquerade extensions, from Florian. This includes netdevice notifier unification. ====================
Showing the changes to include/uapi/linux (2 of 57 files). Show all
Unified · Split
| @@ -124,6 +124,13 @@ · 123 unmodified lines | ||
| 124 | 124 | |
| 125 | 125 | #define IP_VS_PEDATA_MAXLEN 255 |
| 126 | 126 | |
| 127 | +/* Tunnel types */ | |
| 128 | +enum { | |
| 129 | + IP_VS_CONN_F_TUNNEL_TYPE_IPIP = 0, /* IPIP */ | |
| 130 | + IP_VS_CONN_F_TUNNEL_TYPE_GUE, /* GUE */ | |
| 131 | + IP_VS_CONN_F_TUNNEL_TYPE_MAX, | |
| 132 | +}; | |
| 133 | + | |
| 127 | 134 | /* |
| 128 | 135 | * The struct ip_vs_service_user and struct ip_vs_dest_user are |
| 129 | 136 | * used to set IPVS rules through setsockopt. |
| @@ -392,6 +399,10 @@ enum { · 262 unmodified lines | ||
| 392 | 399 | |
| 393 | 400 | IPVS_DEST_ATTR_STATS64, /* nested attribute for dest stats */ |
| 394 | 401 | |
| 402 | + IPVS_DEST_ATTR_TUN_TYPE, /* tunnel type */ | |
| 403 | + | |
| 404 | + IPVS_DEST_ATTR_TUN_PORT, /* tunnel port */ | |
| 405 | + | |
| 395 | 406 | __IPVS_DEST_ATTR_MAX, |
| 396 | 407 | }; |
| 397 | 408 | |
| @@ -1522,15 +1522,21 @@ enum nft_flowtable_hook_attributes { · 1521 unmodified lines | ||
| 1522 | 1522 | * |
| 1523 | 1523 | * @NFTA_OSF_DREG: destination register (NLA_U32: nft_registers) |
| 1524 | 1524 | * @NFTA_OSF_TTL: Value of the TTL osf option (NLA_U8) |
| 1525 | + * @NFTA_OSF_FLAGS: flags (NLA_U32) | |
| 1525 | 1526 | */ |
| 1526 | 1527 | enum nft_osf_attributes { |
| 1527 | 1528 | NFTA_OSF_UNSPEC, |
| 1528 | 1529 | NFTA_OSF_DREG, |
| 1529 | 1530 | NFTA_OSF_TTL, |
| 1531 | + NFTA_OSF_FLAGS, | |
| 1530 | 1532 | __NFTA_OSF_MAX, |
| 1531 | 1533 | }; |
| 1532 | 1534 | #define NFTA_OSF_MAX (__NFTA_OSF_MAX - 1) |
| 1533 | 1535 | |
| 1536 | +enum nft_osf_flags { | |
| 1537 | + NFT_OSF_F_VERSION = (1 << 0), | |
| 1538 | +}; | |
| 1539 | + | |
| 1534 | 1540 | /** |
| 1535 | 1541 | * enum nft_device_attributes - nf_tables device netlink attributes |
| 1536 | 1542 | * |