nftables: add additional --numeric level

Personally, I like seeing ports and IPs numerically, but prefer protocols
to be shown by name.  As such, add a third --numeric level which will
show protocols by number, splitting them out from ports.

  -n/--numeric                  When specified once, show network addresses numerically.
                                When specified twice, also show Internet services,
                                user IDs and group IDs numerically.
                                When specified thrice, also show protocols numerically.

Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/nftables.h b/include/nftables.h
index ec21d37f428c741800af2cb497dc20c3feb5782b..12f3c49232a924a82721603e395407338f0ca7c9 100644 (file)
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -8,6 +8,7 @@
 enum numeric_level {
        NUMERIC_NONE,
        NUMERIC_ADDR,
+       NUMERIC_PORT,
        NUMERIC_ALL,
 };
 

diff --git a/src/datatype.c b/src/datatype.c
index 932acc7d0793e6c6c82b8e1bf2f9ecedb006ad56..3eec931be38227e4bfe4d388de9731c421502f1b 100644 (file)
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -502,7 +502,7 @@ static void inet_service_type_print(const struct expr *expr)
        sin.sin_port = mpz_get_be16(expr->value);
        err = getnameinfo((struct sockaddr *)&sin, sizeof(sin), NULL, 0,
                          buf, sizeof(buf),
-                         numeric_output < NUMERIC_ALL ? 0 : NI_NUMERICSERV);
+                         numeric_output < NUMERIC_PORT ? 0 : NI_NUMERICSERV);
        if (err != 0) {
                getnameinfo((struct sockaddr *)&sin, sizeof(sin), NULL,
                            0, buf, sizeof(buf), NI_NUMERICSERV);

diff --git a/src/main.c b/src/main.c
index 48d4e038a642716aa52d0b528ee9990c7f5e4259..1a40b9eed7342555c0ecd5867c45aee668d6b98b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -104,8 +104,9 @@ static void show_help(const char *name)
 "  -i/--interactive            Read input from interactive CLI\n"
 "\n"
 "  -n/--numeric                        When specified once, show network addresses numerically.\n"
-"                              When specified twice, also show Internet protocols,\n"
-"                              Internet services, user IDs and group IDs numerically.\n"
+"                              When specified twice, also show Internet services,\n"
+"                              user IDs and group IDs numerically.\n"
+"                              When specified thrice, also show protocols numerically.\n"
 "  -a/--handle                 Output rule handle.\n"
 "  -I/--includepath <directory>        Add <directory> to the paths searched for include files.\n"
 #ifdef DEBUG