misc improvements and cleaning
cover misc improvements and cleaning
Hello Pablo,
Here's a small patchset. This is a series of patches on nftables which appear to be needed when I've play a bit with it.
Patchset statistics:
files/nftables/bridge-filter | 6 +++--- files/nftables/ipv4-filter | 6 +++--- files/nftables/ipv4-mangle | 6 +----- files/nftables/ipv4-nat | 6 ++++++ files/nftables/ipv4-raw | 6 ------ files/nftables/ipv4-security | 7 ------- files/nftables/ipv6-filter | 6 +++--- files/nftables/ipv6-mangle | 6 +----- files/nftables/ipv6-nat | 6 ++++++ files/nftables/ipv6-raw | 6 ------ files/nftables/ipv6-security | 7 ------- src/netlink_linearize.c | 4 ++++ src/rule.c | 20 +++++++++++++++++++- 13 files changed, 46 insertions(+), 46 deletions(-)
BR,
--
Eric
PATCH 1/4 nat: add mandatory family attribute
NFT_EXPR_NAT_FAMILY is a mandatory attribute for NAT rules and it was not set by nftables.
--- src/netlink_linearize.c | 4 ++++ 1 file changed, 4 insertions(+)
src/netlink_linearize.c +4 -0
@@ -572,10 +572,14 @@ static void netlink_gen_nat_stmt(struct netlink_linearize_ctx *ctx,enum nft_registers amin_reg, amax_reg;enum nft_registers pmin_reg, pmax_reg;int registers =0 ; +int family; nle =alloc_nft_expr ("nat" );nft_rule_expr_set_u32 (nle,NFT_EXPR_NAT_TYPE , stmt->nat.type); + family =nft_rule_attr_get_u32 (ctx->nlr,NFT_RULE_ATTR_FAMILY ); +nft_rule_expr_set_u32 (nle,NFT_EXPR_NAT_FAMILY , family); +if (stmt->nat.addr) { amin_reg =get_register (ctx); registers++;
Signature · 1 line
1.8.4.rc3
PATCH 2/4 Suppress non working examples.
In reply to Eric Leblond--- files/nftables/ipv4-raw | 6 ------ files/nftables/ipv4-security | 7 ------- files/nftables/ipv6-raw | 6 ------ files/nftables/ipv6-security | 7 ------- 4 files changed, 26 deletions(-) delete mode 100644 files/nftables/ipv4-raw delete mode 100644 files/nftables/ipv4-security delete mode 100644 files/nftables/ipv6-raw delete mode 100644 files/nftables/ipv6-security
files/nftables/ipv4-raw deleted +0 -6
@@ -1,6 +0,0 @@ -#! nft -f - -table raw { - chain prerouting { hook NF_INET_PRE_ROUTING -300; } - chain output { hook NF_INET_LOCAL_OUT -300; } -}
files/nftables/ipv4-security deleted +0 -7
@@ -1,7 +0,0 @@ -#! nft -f - -table security { - chain input { hook NF_INET_LOCAL_IN 50; } - chain forward { hook NF_INET_FORWARD 50; } - chain output { hook NF_INET_LOCAL_OUT 50; } -}
files/nftables/ipv6-raw deleted +0 -6
@@ -1,6 +0,0 @@ -#! nft -f - -table ip6 raw { - chain prerouting { hook NF_INET_PRE_ROUTING -2147483647; } - chain output { hook NF_INET_LOCAL_OUT -2147483647; } -}
files/nftables/ipv6-security deleted +0 -7
@@ -1,7 +0,0 @@ -#! nft -f - -table ip6 security { - chain input { hook NF_INET_LOCAL_IN 50; } - chain forward { hook NF_INET_FORWARD 50; } - chain output { hook NF_INET_LOCAL_OUT 50; } -}
Signature · 1 line
1.8.4.rc3
PATCH 3/4 Update chain creation format.
In reply to Eric Leblondtype keyword is now mandatory when creating a new chain. This patc halso implement the change required following the usage of human notation in hook.
It also suppressed non currently supported mangle chains.
--- files/nftables/bridge-filter | 6 +++--- files/nftables/ipv4-filter | 6 +++--- files/nftables/ipv4-mangle | 6 +----- files/nftables/ipv4-nat | 6 ++++++ files/nftables/ipv6-filter | 6 +++--- files/nftables/ipv6-mangle | 6 +----- files/nftables/ipv6-nat | 6 ++++++ 7 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 files/nftables/ipv4-nat create mode 100644 files/nftables/ipv6-nat
files/nftables/bridge-filter +3 -3
@@ -1,7 +1,7 @@ #! nft -f table bridge filter { - chain input { hook NF_INET_LOCAL_IN -200; } - chain forward { hook NF_INET_FORWARD -200; } - chain output { hook NF_INET_LOCAL_OUT 200; } + chain input { table filter hook input priority -200; } + chain forward { table filter hook forward priority -200; } + chain output { table filter hook output priority 200; } }
files/nftables/ipv4-filter +3 -3
@@ -1,7 +1,7 @@ #! nft -f table filter { - chain input { hook NF_INET_LOCAL_IN 0; } - chain forward { hook NF_INET_FORWARD 0; } - chain output { hook NF_INET_LOCAL_OUT 0; } + chain input { type filter hook input priority 0; } + chain forward { type filter hook forward priority 0; } + chain output { type filter hook output priority 0; } }
files/nftables/ipv4-mangle +1 -5
@@ -1,9 +1,5 @@ #! nft -f table mangle { - chain prerouting { hook NF_INET_PRE_ROUTING -150; } - chain input { hook NF_INET_LOCAL_IN -150; } - chain forward { hook NF_INET_FORWARD -150; } - chain output { hook NF_INET_LOCAL_OUT -150; } - chain postrouting { hook NF_INET_POST_ROUTING -150; } + chain output { type route hook output priority -150; } }
files/nftables/ipv4-nat new file +6 -0
@@ -0,0 +1,6 @@ +#! nft -f + +table nat { + chain prerouting { type nat hook prerouting priority -150; } + chain postrouting { type nat hook postrouting priority -150; } +}
files/nftables/ipv6-filter +3 -3
@@ -1,7 +1,7 @@ #! nft -f table ip6 filter { - chain input { hook NF_INET_LOCAL_IN 0; } - chain forward { hook NF_INET_FORWARD 0; } - chain output { hook NF_INET_LOCAL_OUT 0; } + chain input { type filter hook input priority 0; } + chain forward { type filter hook forward priority 0; } + chain output { type filter hook output priority 0; } }
files/nftables/ipv6-mangle +1 -5
@@ -1,9 +1,5 @@ #! nft -f table ip6 mangle { - chain prerouting { hook NF_INET_PRE_ROUTING -150; } - chain input { hook NF_INET_LOCAL_IN -150; } - chain forward { hook NF_INET_FORWARD -150; } - chain output { hook NF_INET_LOCAL_OUT -150; } - chain postrouting { hook NF_INET_POST_ROUTING -150; } + chain output { type route hook output priority -150; } }
files/nftables/ipv6-nat new file +6 -0
@@ -0,0 +1,6 @@ +#! nft -f + +table ip6 nat { + chain prerouting { type nat hook prerouting priority -150; } + chain postrouting { type nat hook postrouting priority -150; } +}
Signature · 1 line
1.8.4.rc3
Florian Westphal
maintainerRe: [nftables PATCH 3/4] Update chain creation format.
Quoted 9 lines · Eric Leblond
type keyword is now mandatory when creating a new chain. This patc halso implement the change required following the usage of human notation in hook.
files/nftables/bridge-filter +0
-0
files/nftables/bridge-filter line 7
Quoted 10 lines
files/nftables/bridge-filter +3
-3@@ -1,7 +1,7 @@ #! nft -f table bridge filter { - chain input { hook NF_INET_LOCAL_IN -200; } - chain forward { hook NF_INET_FORWARD -200; } - chain output { hook NF_INET_LOCAL_OUT 200; } + chain input { table filter hook input priority -200; } + chain forward { table filter hook forward priority -200; } + chain output { table filter hook output priority 200; } }
Did you mean 'type filter' instead of 'table' here?
Re: [nftables PATCH 3/4] Update chain creation format.
Hi,
Quoted 12 lines · Florian Westphal
Quoted 11 lines · Eric Leblond
type keyword is now mandatory when creating a new chain. This patc halso implement the change required following the usage of human notation in hook.
files/nftables/bridge-filter +0
-0@@ -1,7 +1,7 @@ #! nft -f
Quoted 10 lines
files/nftables/bridge-filter line 7
Quoted 8 lines
files/nftables/bridge-filter +3
-3table bridge filter { - chain input { hook NF_INET_LOCAL_IN -200; } - chain forward { hook NF_INET_FORWARD -200; } - chain output { hook NF_INET_LOCAL_OUT 200; } + chain input { table filter hook input priority -200; } + chain forward { table filter hook forward priority -200; } + chain output { table filter hook output priority 200; } }Did you mean 'type filter' instead of 'table' here?
Argh! (Banging head on the desk) Yes, good catch.
BR,
--
Eric
PATCH 4/4 display family in table listing.
In reply to Eric LeblondAs family was not displayed in table listing, it was not possible to restore an ipv6 table saved via 'nft list table ip6 TABLE'.
--- src/rule.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
src/rule.c +19 -1
@@ -269,6 +269,23 @@ struct chain *chain_lookup(const struct table *table, const struct handle *h)return NULL ; } +static const char *family2str (unsigned int family) +{ +switch (family) { +case NFPROTO_IPV4 : +return "ip" ; +case NFPROTO_IPV6 : +return "ip6" ; +case NFPROTO_ARP : +return "arp" ; +case NFPROTO_BRIDGE : +return "bridge" ; +default : +break ; + } +return "unknown" ; +} +static const char *hooknum2str (unsigned int family,unsigned int hooknum) {switch (family) {
@@ -371,8 +388,9 @@ static void table_print(const struct table *table)struct chain *chain;struct set *set;const char *delim ="" ; +const char *family =family2str (table->handle.family); -printf ("table %s {\n" , table->handle.table); +printf ("table %s %s {\n" , family, table->handle.table);list_for_each_entry (set, &table->sets, list) {if (set->flags &SET_F_ANONYMOUS )continue ;
Signature · 1 line
1.8.4.rc3
Quoted 4 lines · Eric Leblond
Hello Pablo,
Here's a small patchset. This is a series of patches on nftables which appear to be needed when I've play a bit with it.
Applied, I have mangled the one that Florian spotted the mistake. Thanks.