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/meta.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'src/meta.c') diff --git a/src/meta.c b/src/meta.c index 61dc5cf0..9c1ea582 100644 --- a/src/meta.c +++ b/src/meta.c @@ -312,32 +312,6 @@ static void pkttype_type_print(const struct expr *expr) return symbolic_constant_print(&pkttype_type_tbl, expr); } -static struct error_record *pkttype_type_parse(const struct expr *sym, - struct expr **res) -{ - struct error_record *erec; - const struct symbolic_constant *s; - - for (s = pkttype_type_tbl.symbols; s->identifier != NULL; s++) { - if (!strcmp(sym->identifier, s->identifier)) { - *res = constant_expr_alloc(&sym->location, sym->dtype, - sym->dtype->byteorder, - sym->dtype->size, - &s->value); - return NULL; - } - } - - *res = NULL; - erec = sym->dtype->basetype->parse(sym, res); - if (erec != NULL) - return erec; - if (*res) - return NULL; - - return symbolic_constant_parse(sym, &pkttype_type_tbl, res); -} - static const struct datatype pkttype_type = { .type = TYPE_PKTTYPE, .name = "pkt_type", @@ -346,7 +320,7 @@ static const struct datatype pkttype_type = { .size = BITS_PER_BYTE, .basetype = &integer_type, .print = pkttype_type_print, - .parse = pkttype_type_parse, + .sym_tbl = &pkttype_type_tbl, }; static struct symbol_table *devgroup_tbl; -- cgit v1.2.3