Skip to contentSkip to conversation

nft: don't resolve hostnames by default

PATCH Superseded Arturo Borrero Gonzalez 1 participant 1 message Oct 18, 2014 netfilter

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nft: don't resolve hostnames by default

This patch changes the behaviour of nft to don't translate IP addresses to hostnames when printing rules.

So, the behaviour of '-n' ends like this:
<no -n given> show IP addresses numerically
-n translate IP addresses to names
-nn show Internet services and uid/gid numerically
-nnn show protocols numerically

---
 doc/nft.xml    |    2 +-
 src/datatype.c |    4 ++--
 src/main.c     |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
doc/nft.xml +1 -1
index cec5ef3..8f4642b 100644
@@ -101,7 +101,7 @@ vi:ts=4 sw=4
 					<para>
 						Numeric output: Addresses and other information
 						that might need network traffic to resolve to symbolic names
-						are shown numerically. When used twice, internet services
+						are translated. When used twice, internet services
 						and UIDs/GIDs are also shown numerically. When used thrice,
 						protocol numbers are also shown numerically.
 					</para>
src/datatype.c +2 -2
index 8ad211c..4ff08c1 100644
@@ -379,7 +379,7 @@ static void ipaddr_type_print(const struct expr *expr)
 	sin.sin_addr.s_addr = mpz_get_be32(expr->value);
 	err = getnameinfo((struct sockaddr *)&sin, sizeof(sin), buf,
 			  sizeof(buf), NULL, 0,
-			  numeric_output ? NI_NUMERICHOST : 0);
+			  numeric_output ? 0 : NI_NUMERICHOST);
 	if (err != 0) {
 		getnameinfo((struct sockaddr *)&sin, sizeof(sin), buf,
 			    sizeof(buf), NULL, 0, NI_NUMERICHOST);
@@ -437,7 +437,7 @@ static void ip6addr_type_print(const struct expr *expr)
 
 	err = getnameinfo((struct sockaddr *)&sin6, sizeof(sin6), buf,
 			  sizeof(buf), NULL, 0,
-			  numeric_output ? NI_NUMERICHOST : 0);
+			  numeric_output ? 0 : NI_NUMERICHOST);
 	if (err != 0) {
 		getnameinfo((struct sockaddr *)&sin6, sizeof(sin6), buf,
 			    sizeof(buf), NULL, 0, NI_NUMERICHOST);
src/main.c +2 -2
index 3607bd5..ced627d 100644
@@ -105,8 +105,8 @@ static void show_help(const char *name)
 "  -f/--file <filename>		Read input from <filename>\n"
 "  -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 services,\n"
+"  -n/--numeric			When specified once, translate network addresses to names.\n"
+"  				When specified twice, 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"