diff options
| author | Elise Lennion <elise.lennion@gmail.com> | 2016-12-09 22:35:13 -0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-12-10 14:12:31 +0100 |
| commit | c89a0801d07740eff531412fe35ea2c9faad82b0 (patch) | |
| tree | e045033ff863ac25f9bf00fc663d31ea872197b4 | |
| parent | 23b760a774cf12dd18fb68a84d502662ae6eebd8 (diff) | |
datatype: Display pre-defined inet_service values in host byte order
nft describe displays, to the user, which values are available for a selector,
then the values should be in host byte order.
Variable size was replaced by len to better match the common pattern.
Reported-by: Pablo Neira Ayuso <pablo@netfilter.org>
Fixes: ccc5da470e76 ("datatype: Replace getnameinfo() by internal lookup table")
Signed-off-by: Elise Lennion <elise.lennion@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | include/datatype.h | 3 | ||||
| -rw-r--r-- | src/datatype.c | 26 | ||||
| -rw-r--r-- | src/expression.c | 3 |
3 files changed, 26 insertions, 6 deletions
diff --git a/include/datatype.h b/include/datatype.h index d4fe817b..a7db1df4 100644 --- a/include/datatype.h +++ b/include/datatype.h @@ -191,7 +191,8 @@ extern struct error_record *symbolic_constant_parse(const struct expr *sym, extern void symbolic_constant_print(const struct symbol_table *tbl, const struct expr *expr, bool quotes); extern void symbol_table_print(const struct symbol_table *tbl, - const struct datatype *dtype); + const struct datatype *dtype, + enum byteorder byteorder); extern struct symbol_table *rt_symbol_table_init(const char *filename); extern void rt_symbol_table_free(struct symbol_table *tbl); diff --git a/src/datatype.c b/src/datatype.c index b5d73bc0..5600efcc 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -180,15 +180,33 @@ void symbolic_constant_print(const struct symbol_table *tbl, printf("%s", s->identifier); } +static void switch_byteorder(void *data, unsigned int len) +{ + mpz_t op; + + mpz_init(op); + mpz_import_data(op, data, BYTEORDER_BIG_ENDIAN, len); + mpz_export_data(data, op, BYTEORDER_HOST_ENDIAN, len); + mpz_clear(op); +} + void symbol_table_print(const struct symbol_table *tbl, - const struct datatype *dtype) + const struct datatype *dtype, + enum byteorder byteorder) { const struct symbolic_constant *s; - unsigned int size = 2 * dtype->size / BITS_PER_BYTE; + unsigned int len = dtype->size / BITS_PER_BYTE; + uint64_t value; + + for (s = tbl->symbols; s->identifier != NULL; s++) { + value = s->value; + + if (byteorder == BYTEORDER_BIG_ENDIAN) + switch_byteorder(&value, len); - for (s = tbl->symbols; s->identifier != NULL; s++) printf("\t%-30s\t0x%.*" PRIx64 "\n", - s->identifier, size, s->value); + s->identifier, 2 * len, value); + } } static void invalid_type_print(const struct expr *expr) diff --git a/src/expression.c b/src/expression.c index a10af5d3..2aada77d 100644 --- a/src/expression.c +++ b/src/expression.c @@ -115,7 +115,8 @@ void expr_describe(const struct expr *expr) if (expr->dtype->sym_tbl != NULL) { printf("\npre-defined symbolic constants:\n"); - symbol_table_print(expr->dtype->sym_tbl, expr->dtype); + symbol_table_print(expr->dtype->sym_tbl, expr->dtype, + expr->byteorder); } } |