Merge ipN_print() into raw_if_print().

Reuse the existing IP_V() while at it.

Author: infrastation

netdissect.h

@@ -682,7 +682,6 @@ extern u_int ieee802_15_4_print(netdissect_options *, const u_char *, u_int);
 extern void igmp_print(netdissect_options *, const u_char *, u_int);
 extern void igrp_print(netdissect_options *, const u_char *, u_int);
 extern void ip6_print(netdissect_options *, const u_char *, u_int);
-extern void ipN_print(netdissect_options *, const u_char *, u_int);
 extern void ip_print(netdissect_options *, const u_char *, const u_int);
 extern void ipcomp_print(netdissect_options *, const u_char *);
 extern void ipx_netbios_print(netdissect_options *, const u_char *, u_int);

print-ip.c

@@ -506,25 +506,3 @@ ip_print(netdissect_options *ndo,
 invalid:
 	nd_print_invalid(ndo);
 }
-
-void
-ipN_print(netdissect_options *ndo, const u_char *bp, u_int length)
-{
-	ndo->ndo_protocol = "ipn";
-	if (length < 1) {
-		ND_PRINT("truncated-ip %u", length);
-		return;
-	}
-
-	switch (GET_U_1(bp) & 0xF0) {
-	case 0x40:
-		ip_print(ndo, bp, length);
-		break;
-	case 0x60:
-		ip6_print(ndo, bp, length);
-		break;
-	default:
-		ND_PRINT("unknown ip %u", (GET_U_1(bp) & 0xF0) >> 4);
-		break;
-	}
-}

print-raw.c

@@ -26,6 +26,9 @@
 #include "netdissect-stdinc.h"
 
 #include "netdissect.h"
+#include "extract.h"
+
+#include "ip.h"
 
 /*
  * The DLT_RAW packet has no header. It contains a raw IP packet.
@@ -39,5 +42,21 @@ raw_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 	if (ndo->ndo_eflag)
 		ND_PRINT("ip: ");
 
-	ipN_print(ndo, p, h->len);
+	if (h->len < 1) {
+		ND_PRINT("truncated-ip %u", h->len);
+		return;
+	}
+
+	u_char ipver = IP_V((const struct ip *)p);
+	switch (ipver) {
+	case 4:
+		ip_print(ndo, p, h->len);
+		break;
+	case 6:
+		ip6_print(ndo, p, h->len);
+		break;
+	default:
+		ND_PRINT("unknown ip %u", ipver);
+		break;
+	}
 }