From c89a0801d07740eff531412fe35ea2c9faad82b0 Mon Sep 17 00:00:00 2001 From: Elise Lennion Date: Fri, 9 Dec 2016 22:35:13 -0200 Subject: 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 Fixes: ccc5da470e76 ("datatype: Replace getnameinfo() by internal lookup table") Signed-off-by: Elise Lennion Signed-off-by: Pablo Neira Ayuso --- src/datatype.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'src/datatype.c') 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) -- cgit v1.2.3