diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2021-11-27 03:34:33 +0200 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2021-12-31 02:07:13 +0200 |
| commit | 9ba6ee4e25da40f5c7dab5f261e8eace8111fe9d (patch) | |
| tree | 12cd85dd62d6dd6f02180d161fc9b3af8c6efacf /package/network/utils/nftables | |
| parent | 2e1206ad236c16096ce39a3b494d55dc11b6ead1 (diff) | |
| download | upstream-9ba6ee4e25da40f5c7dab5f261e8eace8111fe9d.tar.gz upstream-9ba6ee4e25da40f5c7dab5f261e8eace8111fe9d.tar.bz2 upstream-9ba6ee4e25da40f5c7dab5f261e8eace8111fe9d.zip | |
nftables: allow quoted string in flowtable_expr_member
This is required to be able to use flow offloading on devices with
ifnames that start with a digit, like 6in4-wan6.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'package/network/utils/nftables')
| -rw-r--r-- | package/network/utils/nftables/Makefile | 2 | ||||
| -rw-r--r-- | package/network/utils/nftables/patches/001-parser-allow-quoted-string-in-flowtable_expr_member.patch | 44 |
2 files changed, 45 insertions, 1 deletions
diff --git a/package/network/utils/nftables/Makefile b/package/network/utils/nftables/Makefile index 86f2136966..346b6e1c22 100644 --- a/package/network/utils/nftables/Makefile +++ b/package/network/utils/nftables/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nftables PKG_VERSION:=1.0.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files diff --git a/package/network/utils/nftables/patches/001-parser-allow-quoted-string-in-flowtable_expr_member.patch b/package/network/utils/nftables/patches/001-parser-allow-quoted-string-in-flowtable_expr_member.patch new file mode 100644 index 0000000000..3090adec25 --- /dev/null +++ b/package/network/utils/nftables/patches/001-parser-allow-quoted-string-in-flowtable_expr_member.patch @@ -0,0 +1,44 @@ +From 07af4429241c9832a613cb8620331ac54257d9df Mon Sep 17 00:00:00 2001 +From: Stijn Tintel <stijn@linux-ipv6.be> +Date: Tue, 21 Dec 2021 12:40:25 +0200 +Subject: [PATCH] parser: allow quoted string in flowtable_expr_member + +Devices with interface names starting with a digit can not be configured +in flowtables. Trying to do so throws the following error: + +Error: syntax error, unexpected number, expecting comma or '}' +devices = { eth0, 6in4-wan6 }; + +This is however a perfectly valid interface name. Solve the issue by +allowing the use of quoted strings. + +Suggested-by: Jo-Philipp Wich <jo@mein.io> +Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- + src/parser_bison.y | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/parser_bison.y b/src/parser_bison.y +index 16607bb7..1136ab91 100644 +--- a/src/parser_bison.y ++++ b/src/parser_bison.y +@@ -2151,7 +2151,14 @@ flowtable_list_expr : flowtable_expr_member + | flowtable_list_expr COMMA opt_newline + ; + +-flowtable_expr_member : STRING ++flowtable_expr_member : QUOTED_STRING ++ { ++ $$ = constant_expr_alloc(&@$, &string_type, ++ BYTEORDER_HOST_ENDIAN, ++ strlen($1) * BITS_PER_BYTE, $1); ++ xfree($1); ++ } ++ | STRING + { + $$ = constant_expr_alloc(&@$, &string_type, + BYTEORDER_HOST_ENDIAN, +-- +2.33.1 + |