diff options
| -rw-r--r-- | src/datatype.c | 2 | ||||
| -rw-r--r-- | src/meta.c | 28 | ||||
| -rw-r--r-- | src/proto.c | 16 | ||||
| -rw-r--r-- | tests/regression/any/ct.t | 3 |
4 files changed, 5 insertions, 44 deletions
diff --git a/src/datatype.c b/src/datatype.c index 7c9c3d48..1ace3fa7 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -280,8 +280,6 @@ static struct error_record *integer_type_parse(const struct expr *sym, if (gmp_sscanf(sym->identifier, "%Zu%n", v, &len) != 1 || (int)strlen(sym->identifier) != len) { mpz_clear(v); - if (sym->dtype != &integer_type) - return NULL; return error(&sym->location, "Could not parse %s", sym->dtype->desc); } @@ -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; 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) \ diff --git a/tests/regression/any/ct.t b/tests/regression/any/ct.t index 79674ee7..09f72ed0 100644 --- a/tests/regression/any/ct.t +++ b/tests/regression/any/ct.t @@ -14,6 +14,7 @@ ct state {new,established, related, untracked};ok ct state invalid drop;ok ct state established accept;ok ct state 8;ok;ct state new +ct state xxx;fail ct direction original;ok ct direction != original;ok @@ -21,12 +22,14 @@ ct direction reply;ok ct direction != reply;ok ct direction {reply, original};ok - ct direction != {reply, original};ok +ct direction xxx;fail ct status expected;ok ct status != expected;ok ct status seen-reply;ok ct status != seen-reply;ok ct status {expected, seen-reply, assured, confirmed, dying};ok +ct status xxx;fail # SYMBOL("snat", IPS_SRC_NAT) # SYMBOL("dnat", IPS_DST_NAT) |