ct: use nftables sysconf location for connlabel configuration
Florian Westphal
maintainerPATCH 1/1 ct: use nftables sysconf location for connlabel configuration
Instead of using /etc/xtables use the nftables syconfdir. Also update error message to tell which label failed translation and which config file was used for this:
nft add filter input ct label foo
<cmdline>:1:27-29: Error: /etc/nftables/connlabel.conf: could not parse conntrack label "foo"
--- src/Makefile.am | 2 ++ src/ct.c | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
src/Makefile.am +2 -0
@@ -27,6 +27,8 @@ parser_bison.o scanner.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-decl BUILT_SOURCES = parser_bison.h +ct.o: AM_CFLAGS += -DCONNLABEL_PATH="\"${sysconfdir}/\"" + nft_SOURCES = main.c \ rule.c \ statement.c \
src/ct.c +5 -2
@@ -29,6 +29,8 @@#include <utils.h> #include <statement.h> +#define CONNLABEL_CONF CONNLABEL_PATH "connlabel.conf" +static const struct symbol_table ct_state_tbl = { .symbols = {SYMBOL ("invalid" ,NF_CT_STATE_INVALID_BIT ),
@@ -128,7 +130,8 @@ static struct error_record *ct_label_type_parse(const struct expr *sym, dtype = sym->dtype;if (s->identifier ==NULL ) -return error (&sym->location,"Could not parse %s" , dtype->desc); +return error (&sym->location,"%s: could not parse %s \"%s\"" ,CONNLABEL_CONF , + dtype->desc, sym->identifier);if (s->value >=CT_LABEL_BIT_SIZE ) return error(&sym->location, "%s: out of range (%u max)",
@@ -158,7 +161,7 @@ static const struct datatype ct_label_type = {static void __init ct_label_table_init (void ) { - ct_label_tbl =rt_symbol_table_init ("/etc/xtables/connlabel.conf" ); + ct_label_tbl =rt_symbol_table_init (CONNLABEL_CONF ); }#ifndef NF_CT_HELPER_NAME_LEN
Signature · 1 line
2.7.3
Pablo Neira Ayuso
maintainerQuoted 19 lines · Florian Westphal
Instead of using
/etc/xtablesuse the nftables syconfdir. Also update error message to tell which label failed translation and which config file was used for this:nft add filter input ct label foo
<cmdline>:1:27-29: Error:/etc/nftables/connlabel.conf: could not parse conntrack label "foo"Suggested-by Pablo Neira Ayuso <[email protected]>Signed-off-by Florian Westphal <[email protected]>--- src/Makefile.am | 2 ++ src/ct.c | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-)src/Makefile.am +0
-0
src/Makefile.am parser_bison.o scanner.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-decl · line 30
Quoted 4 lines
src/Makefile.am +1
-0@@ -27,6 +27,8 @@ parser_bison.o scanner.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-decl BUILT_SOURCES = parser_bison.h +ct.o: AM_CFLAGS += -DCONNLABEL_PATH="\"${sysconfdir}/\""
I think we can simplify this by using DEFAULT_INCLUDE_PATH.
See patch attached, it applies on top of this one. Feel free to collapse them.
src/Makefile.am +0 -2
@@ -27,8 +27,6 @@ parser_bison.o scanner.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-decl BUILT_SOURCES = parser_bison.h -ct.o: AM_CFLAGS += -DCONNLABEL_PATH="\"${sysconfdir}/\"" - nft_SOURCES = main.c \ rule.c \ statement.c \
src/ct.c +3 -3
@@ -29,7 +29,7 @@#include <utils.h> #include <statement.h> -#define CONNLABEL_CONF CONNLABEL_PATH "connlabel.conf" +#define CONNLABEL_CONF DEFAULT_INCLUDE_PATH "connlabel.conf"static const struct symbol_table ct_state_tbl = { .symbols = {
@@ -130,8 +130,8 @@ static struct error_record *ct_label_type_parse(const struct expr *sym, dtype = sym->dtype;if (s->identifier ==NULL ) -return error (&sym->location,"%s: could not parse %s \"%s\"" ,CONNLABEL_CONF , - dtype->desc, sym->identifier); +return error (&sym->location,"%s: could not parse %s \"%s\"" , +CONNLABEL_CONF , dtype->desc, sym->identifier);if (s->value >=CT_LABEL_BIT_SIZE ) return error(&sym->location, "%s: out of range (%u max)",
Florian Westphal
maintainerQuoted 21 lines · Pablo Neira Ayuso
Quoted 20 lines · Florian Westphal
Instead of using
/etc/xtablesuse the nftables syconfdir. Also update error message to tell which label failed translation and which config file was used for this:nft add filter input ct label foo
<cmdline>:1:27-29: Error:/etc/nftables/connlabel.conf: could not parse conntrack label "foo"Suggested-by Pablo Neira Ayuso <[email protected]>Signed-off-by Florian Westphal <[email protected]>--- src/Makefile.am | 2 ++ src/ct.c | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-)src/Makefile.am +0
-0@@ -27,6 +27,8 @@ parser_bison.o scanner.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-decl
Quoted 8 lines
src/Makefile.am parser_bison.o scanner.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-decl
Quoted 3 lines
src/Makefile.am +1
-0BUILT_SOURCES = parser_bison.h +ct.o: AM_CFLAGS += -DCONNLABEL_PATH="\"${sysconfdir}/\""I think we can simplify this by using
DEFAULT_INCLUDE_PATH.See patch attached, it applies on top of this one. Feel free to collapse them.
Okay, I pushed it to nftables.git (with your patch collapsed).