]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
datatype: honor -nn option from inet_service_type_print()
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 30 Nov 2016 22:03:46 +0000 (23:03 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 30 Nov 2016 22:09:57 +0000 (23:09 +0100)
If -nn is passed, we have to display ports in numbers, not as a symbol.

Fixes: ccc5da470e76 ("datatype: Replace getnameinfo() by internal lookup table")
Reported-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/datatype.c

index c92f9276f838489c42f1d084ef18018b6206d563..b5d73bc045e22975ac653b847fa12c57dfe4e37d 100644 (file)
@@ -559,6 +559,10 @@ const struct datatype inet_protocol_type = {
 
 static void inet_service_type_print(const struct expr *expr)
 {
+       if (numeric_output >= NUMERIC_PORT) {
+               integer_type_print(expr);
+               return;
+       }
        symbolic_constant_print(&inet_service_tbl, expr, false);
 }