From b848ff5de4e974dd9e471fc0888ea990a86e34af Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 28 Nov 2014 21:20:59 +0100 Subject: datatype: relax datatype check in integer_type_parse() Otherwise parsing with basetypes doesn't work. Now nft displays an error when the symbolic constant is not correct: :1:29-31: Error: Could not parse conntrack state add rule test test ct state xxx accept ^^^ Use .sym_tbl instead and default on the symbol_constant_parse() function from the ethertype and pkttype, this simplifies the code and (more importantly) it avoids a breakage after the change in integer_type_parse(). Signed-off-by: Pablo Neira Ayuso --- src/proto.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'src/proto.c') diff --git a/src/proto.c b/src/proto.c index 6eb4bb24..7dc7b3e2 100644 --- a/src/proto.c +++ b/src/proto.c @@ -751,20 +751,6 @@ static const struct symbol_table ethertype_tbl = { }, }; -static struct error_record *ethertype_parse(const struct expr *sym, - struct expr **res) -{ - struct error_record *erec; - - *res = NULL; - erec = sym->dtype->basetype->parse(sym, res); - if (erec != NULL) - return erec; - if (*res) - return NULL; - return symbolic_constant_parse(sym, ðertype_tbl, res); -} - static void ethertype_print(const struct expr *expr) { return symbolic_constant_print(ðertype_tbl, expr); @@ -779,7 +765,7 @@ const struct datatype ethertype_type = { .basetype = &integer_type, .basefmt = "0x%.4Zx", .print = ethertype_print, - .parse = ethertype_parse, + .sym_tbl = ðertype_tbl, }; #define ETHHDR_TEMPLATE(__name, __dtype, __member) \ -- cgit v1.2.3