Raw IPv4/IPv6: Add ipv4_if_print() and ipv6_if_print() printers

With this change tcpdump prints errors when an IPv6 packet is in a
LINKTYPE_IPV4 file and when an IPv4 packet is in a LINKTYPE_IPV6 file.

Update the printer summary.

And some test files printed with or without '-e'.

Update the linktype of hoobr_rt6_print.pcap from "Raw IPv4" to
"Raw IPv6" to keep test validity for packet #3.
Update 2 test outputs.

Author: fxlb

netdissect.h

@@ -561,6 +561,8 @@ extern void ieee802_15_4_tap_if_print IF_PRINTER_ARGS;
 extern void ipfc_if_print IF_PRINTER_ARGS;
 extern void ipnet_if_print IF_PRINTER_ARGS;
 extern void ipoib_if_print IF_PRINTER_ARGS;
+extern void ipv4_if_print IF_PRINTER_ARGS;
+extern void ipv6_if_print IF_PRINTER_ARGS;
 extern void juniper_atm1_if_print IF_PRINTER_ARGS;
 extern void juniper_atm2_if_print IF_PRINTER_ARGS;
 extern void juniper_chdlc_if_print IF_PRINTER_ARGS;

print-raw.c

@@ -19,7 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* \summary: Raw IP printer */
+/* \summary: Raw IPv4/IPv6 printer and similar */
 
 #include <config.h>
 
@@ -63,3 +63,33 @@ raw_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 		break;
 	}
 }
+
+/*
+ * The DLT_IPV4 packet has no header. It contains a raw IPv4 packet.
+ */
+
+void
+ipv4_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
+{
+	ndo->ndo_protocol = "ip";
+	ndo->ndo_ll_hdr_len += 0;
+
+	if (ndo->ndo_eflag)
+		ND_PRINT("IP ");
+	ip_print(ndo, p, h->len);
+}
+
+/*
+ * The DLT_IPV6 packet has no header. It contains a raw IPv6 packet.
+ */
+
+void
+ipv6_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
+{
+	ndo->ndo_protocol = "ip6";
+	ndo->ndo_ll_hdr_len += 0;
+
+	if (ndo->ndo_eflag)
+		ND_PRINT("IP6 ");
+	ip6_print(ndo, p, h->len);
+}

print.c

@@ -205,10 +205,10 @@ static const struct printer printers[] = {
 #endif
 	{ raw_if_print,		DLT_RAW },
 #ifdef DLT_IPV4
-	{ raw_if_print,		DLT_IPV4 },
+	{ ipv4_if_print,	DLT_IPV4 },
 #endif
 #ifdef DLT_IPV6
-	{ raw_if_print,		DLT_IPV6 },
+	{ ipv6_if_print,	DLT_IPV6 },
 #endif
 #ifdef DLT_SLIP_BSDOS
 	{ sl_bsdos_if_print,	DLT_SLIP_BSDOS },

tests/LINKTYPE_IPV4_invalid-e.out

@@ -0,0 +1 @@
+    1  2025-07-09 06:00:34.349949 IP  [version 6 != 4] (invalid)

tests/LINKTYPE_IPV4_invalid.out

@@ -0,0 +1 @@
+    1  2025-07-09 06:00:34.349949 IP  [version 6 != 4] (invalid)

tests/LINKTYPE_IPV4_invalid.pcap

@@ -0,0 +1 @@
+    1  2025-07-09 05:59:39.284233 IP6  [version 4 != 6] (invalid)

tests/LINKTYPE_IPV6_invalid-e.out

@@ -0,0 +1 @@
+    1  2025-07-09 05:59:39.284233 IP6  [version 4 != 6] (invalid)

tests/LINKTYPE_IPV6_invalid.out

@@ -1039,4 +1039,7 @@ 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
-
+LINKTYPE_IPV4_invalid LINKTYPE_IPV4_invalid.pcap LINKTYPE_IPV4_invalid.out
+LINKTYPE_IPV4_invalid-e LINKTYPE_IPV4_invalid.pcap LINKTYPE_IPV4_invalid-e.out -e
+LINKTYPE_IPV6_invalid LINKTYPE_IPV6_invalid.pcap LINKTYPE_IPV6_invalid.out
+LINKTYPE_IPV6_invalid-e LINKTYPE_IPV6_invalid.pcap LINKTYPE_IPV6_invalid-e.out -e