permit -n flag to affect print-ip for protocol numbers

diff --git a/print-ip.c b/print-ip.c
index 1fa7aab0d6cae8830aa92c9f8ac3cf37dfb9d01a..c0c91888bdc3a6d30b3a81a150c6650b74fb8b40 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -661,7 +661,7 @@ ip_print(netdissect_options *ndo,
            if (ipds->off & 0x1fff) {
                (void)printf("%s > %s:", ipaddr_string(&ipds->ip->ip_src),
                             ipaddr_string(&ipds->ip->ip_dst));
-               if ((proto = getprotobynumber(ipds->ip->ip_p)) != NULL)
+               if (!ndo->ndo_nflag && (proto = getprotobynumber(ipds->ip->ip_p)) != NULL)
                    (void)printf(" %s", proto->p_name);
                else
                    (void)printf(" ip-proto-%d", ipds->ip->ip_p);

diff --git a/tests/TESTLIST b/tests/TESTLIST
index 028f57dad8b27e8c0df847c48017ef98eb3a19ea..d3a922eab66dd446a44859ffe957ea53a0b238b4 100644 (file)
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -11,7 +11,7 @@ esp2 08-sunrise-sunset-esp2.pcap esp2.out -t -E "[email protected] 3des-cbc-
 esp3 02-sunrise-sunset-esp.pcap esp1.out -t -E "3des-cbc-hmac96:0x4043434545464649494a4a4c4c4f4f515152525454575758"
 esp4 08-sunrise-sunset-esp2.pcap esp2.out -t -E "file esp-secrets.txt"
 esp5 08-sunrise-sunset-aes.pcap esp5.out -t -E "file esp-secrets.txt"
-espudp1 espudp1.pcap espudp1.out -t -E "file esp-secrets.txt"
+espudp1 espudp1.pcap                    espudp1.out -nnn -t -E "file esp-secrets.txt"
 
 # ISAKMP tests
 isakmp1 isakmp-delete-segfault.pcap isakmp1.out -t 

diff --git a/tests/espudp1.out b/tests/espudp1.out
index f754c1542e16fa24d7c9221436a3928123276287..db8eafb848de026ddda253b92b9ef17231358d4a 100644 (file)
--- a/tests/espudp1.out
+++ b/tests/espudp1.out
@@ -4,5 +4,5 @@ IP 192.1.2.23.4500 > 192.1.2.45.4500: UDP-encap: ESP(spi=0x12345678,seq=0x3), le
 IP 192.1.2.23.4500 > 192.1.2.45.4500: UDP-encap: ESP(spi=0x12345678,seq=0x4), length 116
 IP 192.1.2.23.4500 > 192.1.2.45.4500: UDP-encap: ESP(spi=0x12345678,seq=0x5), length 116
 IP 192.1.2.23.4500 > 192.1.2.45.4500: UDP-encap: ESP(spi=0x12345678,seq=0x6), length 116:  ip-proto-183 28
-IP 192.1.2.23.4500 > 192.1.2.45.4500: UDP-encap: ESP(spi=0x12345678,seq=0x7), length 116:  cpnx 34
+IP 192.1.2.23.4500 > 192.1.2.45.4500: UDP-encap: ESP(spi=0x12345678,seq=0x7), length 116:  ip-proto-72 34
 IP 192.1.2.23.4500 > 192.1.2.45.4500: UDP-encap: ESP(spi=0x12345678,seq=0x8), length 116:  ip-proto-224 59