Raw: Avoid printing ambiguous "ip:" with -e option

fxlb · fxlb · commit e23ac838c441 · 2025-07-09T06:19:46.000Z
Print "IP" or "IP6".

Also update an error message.

Add some LINKTYPE_RAW, LINKTYPE_IPV4, LINKTYPE_IPV6 tests printed
  with or without '-e'.

Update 3 test outputs.
diff --git a/print-raw.c b/print-raw.c
@@ -39,8 +39,6 @@ raw_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 {
 	ndo->ndo_protocol = "raw";
 	ndo->ndo_ll_hdr_len += 0;
-	if (ndo->ndo_eflag)
-		ND_PRINT("ip: ");
 
 	if (h->len < 1) {
 		ND_PRINT("truncated-ip %u", h->len);
@@ -50,13 +48,18 @@ raw_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 	u_char ipver = IP_V((const struct ip *)p);
 	switch (ipver) {
 	case 4:
+		if (ndo->ndo_eflag)
+			ND_PRINT("IP ");
 		ip_print(ndo, p, h->len);
 		break;
 	case 6:
+		if (ndo->ndo_eflag)
+			ND_PRINT("IP6 ");
 		ip6_print(ndo, p, h->len);
 		break;
 	default:
-		ND_PRINT("unknown ip %u", ipver);
+		ND_PRINT("IP%u", ipver);
+		nd_print_invalid(ndo);
 		break;
 	}
 }
diff --git a/tests/LINKTYPE_IPV4-e.out b/tests/LINKTYPE_IPV4-e.out
@@ -0,0 +1 @@
+    1  2025-07-08 17:59:32.592885 IP 192.168.1.100.12345 > 9.9.9.9.53: 4660+ A? example.com. (29)
diff --git a/tests/LINKTYPE_IPV4.out b/tests/LINKTYPE_IPV4.out
@@ -0,0 +1 @@
+    1  2025-07-08 17:59:32.592885 IP 192.168.1.100.12345 > 9.9.9.9.53: 4660+ A? example.com. (29)
diff --git a/tests/LINKTYPE_IPV4.pcap b/tests/LINKTYPE_IPV4.pcap
diff --git a/tests/LINKTYPE_IPV6-e.out b/tests/LINKTYPE_IPV6-e.out
@@ -0,0 +1 @@
+    1  2025-07-08 17:59:26.204450 IP6 2001:db8::1.12345 > 2620:fe::9.53: 4660+ A? example.com. (29)
diff --git a/tests/LINKTYPE_IPV6.out b/tests/LINKTYPE_IPV6.out
@@ -0,0 +1 @@
+    1  2025-07-08 17:59:26.204450 IP6 2001:db8::1.12345 > 2620:fe::9.53: 4660+ A? example.com. (29)
diff --git a/tests/LINKTYPE_IPV6.pcap b/tests/LINKTYPE_IPV6.pcap
diff --git a/tests/LINKTYPE_RAW_ipv4-e.out b/tests/LINKTYPE_RAW_ipv4-e.out
@@ -0,0 +1 @@
+    1  2025-07-08 17:59:11.951226 IP 192.168.1.100.12345 > 9.9.9.9.53: 4660+ A? example.com. (29)
diff --git a/tests/LINKTYPE_RAW_ipv4.out b/tests/LINKTYPE_RAW_ipv4.out
@@ -0,0 +1 @@
+    1  2025-07-08 17:59:11.951226 IP 192.168.1.100.12345 > 9.9.9.9.53: 4660+ A? example.com. (29)
diff --git a/tests/LINKTYPE_RAW_ipv4.pcap b/tests/LINKTYPE_RAW_ipv4.pcap
diff --git a/tests/LINKTYPE_RAW_ipv6-e.out b/tests/LINKTYPE_RAW_ipv6-e.out
@@ -0,0 +1 @@
+    1  2025-07-08 17:59:17.215270 IP6 2001:db8::1.12345 > 2620:fe::9.53: 4660+ A? example.com. (29)
diff --git a/tests/LINKTYPE_RAW_ipv6.out b/tests/LINKTYPE_RAW_ipv6.out
@@ -0,0 +1 @@
+    1  2025-07-08 17:59:17.215270 IP6 2001:db8::1.12345 > 2620:fe::9.53: 4660+ A? example.com. (29)
diff --git a/tests/LINKTYPE_RAW_ipv6.pcap b/tests/LINKTYPE_RAW_ipv6.pcap
diff --git a/tests/TESTLIST b/tests/TESTLIST
@@ -1029,3 +1029,14 @@ LINKTYPE_USER2_PKTAP LINKTYPE_USER2_PKTAP.pcap LINKTYPE_USER2_PKTAP.out
 LINKTYPE_USER2_PKTAP-e LINKTYPE_USER2_PKTAP.pcap LINKTYPE_USER2_PKTAP-e.out -e
 LINKTYPE_PKTAP LINKTYPE_PKTAP.pcap LINKTYPE_PKTAP.out
 LINKTYPE_PKTAP-e LINKTYPE_PKTAP.pcap LINKTYPE_PKTAP-e.out -e
+
+# LINKTYPE_RAW, LINKTYPE_IPV4, LINKTYPE_IPV6
+LINKTYPE_RAW_ipv4 LINKTYPE_RAW_ipv4.pcap LINKTYPE_RAW_ipv4.out
+LINKTYPE_RAW_ipv4-e LINKTYPE_RAW_ipv4.pcap LINKTYPE_RAW_ipv4-e.out -e
+LINKTYPE_RAW_ipv6 LINKTYPE_RAW_ipv6.pcap LINKTYPE_RAW_ipv6.out
+LINKTYPE_RAW_ipv6-e LINKTYPE_RAW_ipv6.pcap LINKTYPE_RAW_ipv6-e.out -e
+LINKTYPE_IPV4 LINKTYPE_IPV4.pcap LINKTYPE_IPV4.out
+LINKTYPE_IPV4-e LINKTYPE_IPV4.pcap LINKTYPE_IPV4-e.out -e
+LINKTYPE_IPV6 LINKTYPE_IPV6.pcap LINKTYPE_IPV6.out
+LINKTYPE_IPV6-e LINKTYPE_IPV6.pcap LINKTYPE_IPV6-e.out -e
+
diff --git a/tests/beep-oobr.out b/tests/beep-oobr.out
@@ -1,2 +1,2 @@
-    1  1995-08-15 05:27:12.999999 unknown ip 3
+    1  1995-08-15 05:27:12.999999 IP3 (invalid)
     2  1995-08-15 05:27:12.999999 IP6 3030:3030:3030:3030:3030:3030:3030:3030.10288 > 3030:3030:3030:3030:3030:3030:3030:3030.12336: Flags [.Ue], seq 808464432:808476740, ack 808464432, win 12336, urg 12336, options [eol], length 12308 [remaining caplen(24) < header length(28)] [|tcp]
diff --git a/tests/heap-overflow-1.out b/tests/heap-overflow-1.out
@@ -1 +1 @@
-    1  1995-08-15 05:27:12.999999 unknown ip 3
+    1  1995-08-15 05:27:12.999999 IP3 (invalid)
diff --git a/tests/hoobr_rt6_print.out b/tests/hoobr_rt6_print.out
@@ -1,3 +1,3 @@
-    1  1995-08-15 05:27:12.999999 unknown ip 3
-    2  1995-08-15 05:27:12.999999 unknown ip 3
+    1  1995-08-15 05:27:12.999999 IP3 (invalid)
+    2  1995-08-15 05:27:12.999999 IP3 (invalid)
     3  1995-08-15 05:27:12.999999 IP6 3030:3030:3030:3030:3030:3030:3030:3030 > 3030:3030:3030:3030:3030:3030:3030:3030: RT6 [|rt6]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ 1 2025-07-08 17:59:32.592885 IP 192.168.1.100.12345 > 9.9.9.9.53: 4660+ A? example.com. (29)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ 1 2025-07-08 17:59:26.204450 IP6 2001:db8::1.12345 > 2620:fe::9.53: 4660+ A? example.com. (29)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ 1 2025-07-08 17:59:11.951226 IP 192.168.1.100.12345 > 9.9.9.9.53: 4660+ A? example.com. (29)`