History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says: ==================== Netfilter/IPVS updates for net-next The following patchset contains Netfilter updates for net-next: 1) Support for rejecting packets from the prerouting chain, from Laura Garcia Liebana. 2) Remove useless assignment in pipapo, from Stefano Brivio. 3) On demand hook registration in IPVS, from Julian Anastasov. 4) Expire IPVS connection from process context to not overload timers, also from Julian. 5) Fallback to conntrack TCP tracker to handle connection reuse in IPVS, from Julian Anastasov. 6) Several patches to support for chain bindings. 7) Expose enum nft_chain_flags through UAPI. 8) Reject unsupported chain flags from the netlink control plane. ====================

David S. Miller committed 6 years ago

Commit e80a07b2 parents 3d07ae5 c1f79a212 files · +428 −89Browse files

Showing the changes to include/uapi/linux (1 of 12 files). Show all

Unified · Split

include/uapi/linux/netfilter/nf_tables.h+14−0
@@ -184,6 +184,15 @@ enum nft_table_attributes { · 183 unmodified lines
184};184};
185#define NFTA_TABLE_MAX (__NFTA_TABLE_MAX - 1)185#define NFTA_TABLE_MAX (__NFTA_TABLE_MAX - 1)
186 186
187enum nft_chain_flags {
188 NFT_CHAIN_BASE = (1 << 0),
189 NFT_CHAIN_HW_OFFLOAD = (1 << 1),
190 NFT_CHAIN_BINDING = (1 << 2),
191};
192#define NFT_CHAIN_FLAGS (NFT_CHAIN_BASE | \
193 NFT_CHAIN_HW_OFFLOAD | \
194 NFT_CHAIN_BINDING)
195
187/**196/**
188 * enum nft_chain_attributes - nf_tables chain netlink attributes197 * enum nft_chain_attributes - nf_tables chain netlink attributes
189 *198 *
@@ -196,6 +205,7 @@ enum nft_table_attributes { · 6 unmodified lines
196 * @NFTA_CHAIN_TYPE: type name of the string (NLA_NUL_STRING)205 * @NFTA_CHAIN_TYPE: type name of the string (NLA_NUL_STRING)
197 * @NFTA_CHAIN_COUNTERS: counter specification of the chain (NLA_NESTED: nft_counter_attributes)206 * @NFTA_CHAIN_COUNTERS: counter specification of the chain (NLA_NESTED: nft_counter_attributes)
198 * @NFTA_CHAIN_FLAGS: chain flags207 * @NFTA_CHAIN_FLAGS: chain flags
208 * @NFTA_CHAIN_ID: uniquely identifies a chain in a transaction (NLA_U32)
199 */209 */
200enum nft_chain_attributes {210enum nft_chain_attributes {
201 NFTA_CHAIN_UNSPEC,211 NFTA_CHAIN_UNSPEC,
@@ -209,6 +219,7 @@ enum nft_chain_attributes { · 7 unmodified lines
209 NFTA_CHAIN_COUNTERS,219 NFTA_CHAIN_COUNTERS,
210 NFTA_CHAIN_PAD,220 NFTA_CHAIN_PAD,
211 NFTA_CHAIN_FLAGS,221 NFTA_CHAIN_FLAGS,
222 NFTA_CHAIN_ID,
212 __NFTA_CHAIN_MAX223 __NFTA_CHAIN_MAX
213};224};
214#define NFTA_CHAIN_MAX (__NFTA_CHAIN_MAX - 1)225#define NFTA_CHAIN_MAX (__NFTA_CHAIN_MAX - 1)
@@ -238,6 +249,7 @@ enum nft_rule_attributes { · 23 unmodified lines
238 NFTA_RULE_PAD,249 NFTA_RULE_PAD,
239 NFTA_RULE_ID,250 NFTA_RULE_ID,
240 NFTA_RULE_POSITION_ID,251 NFTA_RULE_POSITION_ID,
252 NFTA_RULE_CHAIN_ID,
241 __NFTA_RULE_MAX253 __NFTA_RULE_MAX
242};254};
243#define NFTA_RULE_MAX (__NFTA_RULE_MAX - 1)255#define NFTA_RULE_MAX (__NFTA_RULE_MAX - 1)
@@ -468,11 +480,13 @@ enum nft_data_attributes { · 224 unmodified lines
468 *480 *
469 * @NFTA_VERDICT_CODE: nf_tables verdict (NLA_U32: enum nft_verdicts)481 * @NFTA_VERDICT_CODE: nf_tables verdict (NLA_U32: enum nft_verdicts)
470 * @NFTA_VERDICT_CHAIN: jump target chain name (NLA_STRING)482 * @NFTA_VERDICT_CHAIN: jump target chain name (NLA_STRING)
483 * @NFTA_VERDICT_CHAIN_ID: jump target chain ID (NLA_U32)
471 */484 */
472enum nft_verdict_attributes {485enum nft_verdict_attributes {
473 NFTA_VERDICT_UNSPEC,486 NFTA_VERDICT_UNSPEC,
474 NFTA_VERDICT_CODE,487 NFTA_VERDICT_CODE,
475 NFTA_VERDICT_CHAIN,488 NFTA_VERDICT_CHAIN,
489 NFTA_VERDICT_CHAIN_ID,
476 __NFTA_VERDICT_MAX490 __NFTA_VERDICT_MAX
477};491};
478#define NFTA_VERDICT_MAX (__NFTA_VERDICT_MAX - 1)492#define NFTA_VERDICT_MAX (__NFTA_VERDICT_MAX - 1)