X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/a3d09832c69a1b261d0e1f1fc61d4b14ddd5f4a4..2de3a27ab75415237de96d2539e86b959ad0a9d0:/print-ip.c

diff --git a/print-ip.c b/print-ip.c
index e43f6e29..e1085e96 100644
--- a/print-ip.c
+++ b/print-ip.c
@@ -19,24 +19,23 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: IP printer */
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
+#include "netdissect.h"
 #include "addrtoname.h"
-#include "interface.h"
-#include "extract.h"			/* must come after interface.h */
+#include "extract.h"
 
 #include "ip.h"
 #include "ipproto.h"
 
-static const char tstr[] = "[|ip]";
 
 static const struct tok ip_option_values[] = {
     { IPOPT_EOL, "EOL" },
@@ -54,27 +53,34 @@ static const struct tok ip_option_values[] = {
 /*
  * print the recorded route in an IP RR, LSRR or SSRR option.
  */
-static void
-ip_printroute(register const u_char *cp, u_int length)
+static int
+ip_printroute(netdissect_options *ndo,
+              const u_char *cp, u_int length)
 {
-	register u_int ptr;
-	register u_int len;
+	u_int ptr;
+	u_int len;
 
 	if (length < 3) {
-		printf(" [bad length %u]", length);
-		return;
+		ND_PRINT(" [bad length %u]", length);
+		return (0);
 	}
 	if ((length + 1) & 3)
-		printf(" [bad length %u]", length);
-	ptr = cp[2] - 1;
+		ND_PRINT(" [bad length %u]", length);
+	ND_TCHECK_1(cp + 2);
+	ptr = EXTRACT_U_1(cp + 2) - 1;
 	if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)
-		printf(" [bad ptr %u]", cp[2]);
+		ND_PRINT(" [bad ptr %u]", EXTRACT_U_1(cp + 2));
 
 	for (len = 3; len < length; len += 4) {
-		printf(" %s", ipaddr_string(&cp[len]));
-                if (ptr > len)
-                        printf(",");
+		ND_TCHECK_4(cp + len);
+		ND_PRINT(" %s", ipaddr_string(ndo, cp + len));
+		if (ptr > len)
+			ND_PRINT(",");
 	}
+	return (0);
+
+trunc:
+	return (-1);
 }
 
 /*
@@ -84,107 +90,115 @@ ip_printroute(register const u_char *cp, u_int length)
  * This is used for UDP and TCP pseudo-header in the checksum
  * calculation.
  */
-static u_int32_t
-ip_finddst(const struct ip *ip)
+static uint32_t
+ip_finddst(netdissect_options *ndo,
+           const struct ip *ip)
 {
-	int length;
-	int len;
+	u_int length;
+	u_int len;
 	const u_char *cp;
-	u_int32_t retval;
 
 	cp = (const u_char *)(ip + 1);
-	length = (IP_HL(ip) << 2) - sizeof(struct ip);
+	length = IP_HL(ip) * 4;
+	if (length < sizeof(struct ip))
+		goto trunc;
+	length -= sizeof(struct ip);
 
-	for (; length > 0; cp += len, length -= len) {
+	for (; length != 0; cp += len, length -= len) {
 		int tt;
 
-		TCHECK(*cp);
-		tt = *cp;
+		ND_TCHECK_1(cp);
+		tt = EXTRACT_U_1(cp);
 		if (tt == IPOPT_EOL)
 			break;
 		else if (tt == IPOPT_NOP)
 			len = 1;
 		else {
-			TCHECK(cp[1]);
-			len = cp[1];
+			ND_TCHECK_1(cp + 1);
+			len = EXTRACT_U_1(cp + 1);
 			if (len < 2)
 				break;
 		}
-		TCHECK2(*cp, len);
+		if (length < len)
+			goto trunc;
+		ND_TCHECK_LEN(cp, len);
 		switch (tt) {
 
 		case IPOPT_SSRR:
 		case IPOPT_LSRR:
 			if (len < 7)
 				break;
-			UNALIGNED_MEMCPY(&retval, cp + len - 4, 4);
-			return retval;
+			return (EXTRACT_IPV4_TO_NETWORK_ORDER(cp + len - 4));
 		}
 	}
 trunc:
-	UNALIGNED_MEMCPY(&retval, &ip->ip_dst.s_addr, sizeof(u_int32_t));
-	return retval;
+	return (EXTRACT_IPV4_TO_NETWORK_ORDER(ip->ip_dst));
 }
 
 /*
  * Compute a V4-style checksum by building a pseudoheader.
  */
-int
-nextproto4_cksum(const struct ip *ip, const u_int8_t *data,
-		 u_int len, u_int covlen, u_int next_proto)
+uint16_t
+nextproto4_cksum(netdissect_options *ndo,
+                 const struct ip *ip, const uint8_t *data,
+                 u_int len, u_int covlen, u_int next_proto)
 {
 	struct phdr {
-		u_int32_t src;
-		u_int32_t dst;
+		uint32_t src;
+		uint32_t dst;
 		u_char mbz;
 		u_char proto;
-		u_int16_t len;
+		uint16_t len;
 	} ph;
 	struct cksum_vec vec[2];
 
 	/* pseudo-header.. */
-	ph.len = htons((u_int16_t)len);
+	ph.len = htons((uint16_t)len);
 	ph.mbz = 0;
 	ph.proto = next_proto;
-	UNALIGNED_MEMCPY(&ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));
+	ph.src = EXTRACT_IPV4_TO_NETWORK_ORDER(ip->ip_src);
 	if (IP_HL(ip) == 5)
-		UNALIGNED_MEMCPY(&ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+		ph.dst = EXTRACT_IPV4_TO_NETWORK_ORDER(ip->ip_dst);
 	else
-		ph.dst = ip_finddst(ip);
+		ph.dst = ip_finddst(ndo, ip);
 
-	vec[0].ptr = (const u_int8_t *)(void *)&ph;
+	vec[0].ptr = (const uint8_t *)(void *)&ph;
 	vec[0].len = sizeof(ph);
 	vec[1].ptr = data;
 	vec[1].len = covlen;
 	return (in_cksum(vec, 2));
 }
 
-static void
-ip_printts(register const u_char *cp, u_int length)
+static int
+ip_printts(netdissect_options *ndo,
+           const u_char *cp, u_int length)
 {
-	register u_int ptr;
-	register u_int len;
-	int hoplen;
+	u_int ptr;
+	u_int len;
+	u_int hoplen;
 	const char *type;
 
 	if (length < 4) {
-		printf("[bad length %u]", length);
-		return;
+		ND_PRINT("[bad length %u]", length);
+		return (0);
 	}
-	printf(" TS{");
-	hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
+	ND_PRINT(" TS{");
+	ND_TCHECK_1(cp + 3);
+	hoplen = ((EXTRACT_U_1(cp + 3) & 0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
 	if ((length - 4) & (hoplen-1))
-		printf("[bad length %u]", length);
-	ptr = cp[2] - 1;
+		ND_PRINT("[bad length %u]", length);
+	ND_TCHECK_1(cp + 2);
+	ptr = EXTRACT_U_1(cp + 2) - 1;
 	len = 0;
 	if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
-		printf("[bad ptr %u]", cp[2]);
-	switch (cp[3]&0xF) {
+		ND_PRINT("[bad ptr %u]", EXTRACT_U_1(cp + 2));
+	ND_TCHECK_1(cp + 3);
+	switch (EXTRACT_U_1(cp + 3)&0xF) {
 	case IPOPT_TS_TSONLY:
-		printf("TSONLY");
+		ND_PRINT("TSONLY");
 		break;
 	case IPOPT_TS_TSANDADDR:
-		printf("TS+ADDR");
+		ND_PRINT("TS+ADDR");
 		break;
 	/*
 	 * prespecified should really be 3, but some ones might send 2
@@ -193,13 +207,13 @@ ip_printts(register const u_char *cp, u_int length)
 	 */
 
 	case 2:
-		printf("PRESPEC2.0");
+		ND_PRINT("PRESPEC2.0");
 		break;
 	case 3:			/* IPOPT_TS_PRESPEC */
-		printf("PRESPEC");
+		ND_PRINT("PRESPEC");
 		break;
 	default:
-		printf("[bad ts type %d]", cp[3]&0xF);
+		ND_PRINT("[bad ts type %u]", EXTRACT_U_1(cp + 3)&0xF);
 		goto done;
 	}
 
@@ -207,83 +221,92 @@ ip_printts(register const u_char *cp, u_int length)
 	for (len = 4; len < length; len += hoplen) {
 		if (ptr == len)
 			type = " ^ ";
-		printf("%s%d@%s", type, EXTRACT_32BITS(&cp[len+hoplen-4]),
-		       hoplen!=8 ? "" : ipaddr_string(&cp[len]));
+		ND_TCHECK_LEN(cp + len, hoplen);
+		ND_PRINT("%s%u@%s", type, EXTRACT_BE_U_4(cp + len + hoplen - 4),
+			  hoplen!=8 ? "" : ipaddr_string(ndo, cp + len));
 		type = " ";
 	}
 
 done:
-	printf("%s", ptr == len ? " ^ " : "");
+	ND_PRINT("%s", ptr == len ? " ^ " : "");
 
-	if (cp[3]>>4)
-		printf(" [%d hops not recorded]} ", cp[3]>>4);
+	if (EXTRACT_U_1(cp + 3) >> 4)
+		ND_PRINT(" [%u hops not recorded]} ", EXTRACT_U_1(cp + 3)>>4);
 	else
-		printf("}");
+		ND_PRINT("}");
+	return (0);
+
+trunc:
+	return (-1);
 }
 
 /*
  * print IP options.
+   If truncated return -1, else 0.
  */
-static void
-ip_optprint(register const u_char *cp, u_int length)
+static int
+ip_optprint(netdissect_options *ndo,
+            const u_char *cp, u_int length)
 {
-	register u_int option_len;
+	u_int option_len;
 	const char *sep = "";
 
 	for (; length > 0; cp += option_len, length -= option_len) {
 		u_int option_code;
 
-		printf("%s", sep);
+		ND_PRINT("%s", sep);
 		sep = ",";
 
-		TCHECK(*cp);
-		option_code = *cp;
+		ND_TCHECK_1(cp);
+		option_code = EXTRACT_U_1(cp);
 
-                printf("%s",
-                        tok2str(ip_option_values,"unknown %u",option_code));
+		ND_PRINT("%s",
+		          tok2str(ip_option_values,"unknown %u",option_code));
 
 		if (option_code == IPOPT_NOP ||
                     option_code == IPOPT_EOL)
 			option_len = 1;
 
 		else {
-			TCHECK(cp[1]);
-			option_len = cp[1];
+			ND_TCHECK_1(cp + 1);
+			option_len = EXTRACT_U_1(cp + 1);
 			if (option_len < 2) {
-		                printf(" [bad length %u]", option_len);
-				return;
+				ND_PRINT(" [bad length %u]", option_len);
+				return 0;
 			}
 		}
 
 		if (option_len > length) {
-	                printf(" [bad length %u]", option_len);
-			return;
+			ND_PRINT(" [bad length %u]", option_len);
+			return 0;
 		}
 
-                TCHECK2(*cp, option_len);
+		ND_TCHECK_LEN(cp, option_len);
 
 		switch (option_code) {
 		case IPOPT_EOL:
-			return;
+			return 0;
 
 		case IPOPT_TS:
-			ip_printts(cp, option_len);
+			if (ip_printts(ndo, cp, option_len) == -1)
+				goto trunc;
 			break;
 
 		case IPOPT_RR:       /* fall through */
 		case IPOPT_SSRR:
 		case IPOPT_LSRR:
-			ip_printroute(cp, option_len);
+			if (ip_printroute(ndo, cp, option_len) == -1)
+				goto trunc;
 			break;
 
 		case IPOPT_RA:
 			if (option_len < 4) {
-				printf(" [bad length %u]", option_len);
+				ND_PRINT(" [bad length %u]", option_len);
 				break;
 			}
-                        TCHECK(cp[3]);
-                        if (EXTRACT_16BITS(&cp[2]) != 0)
-                            printf(" value %u", EXTRACT_16BITS(&cp[2]));
+			ND_TCHECK_1(cp + 3);
+			if (EXTRACT_BE_U_2(cp + 2) != 0)
+				ND_PRINT(" value %u", EXTRACT_BE_U_2(cp + 2));
 			break;
 
 		case IPOPT_NOP:       /* nothing to print - fall through */
@@ -292,10 +315,10 @@ ip_optprint(register const u_char *cp, u_int length)
 			break;
 		}
 	}
-	return;
+	return 0;
 
 trunc:
-	printf("%s", tstr);
+	return -1;
 }
 
 #define IP_RES 0x8000
@@ -319,15 +342,19 @@ static void
 ip_print_demux(netdissect_options *ndo,
 	       struct ip_print_demux_state *ipds)
 {
-	struct protoent *proto;
-	struct cksum_vec vec[1];
+	const char *p_name;
 
 again:
 	switch (ipds->nh) {
 
 	case IPPROTO_AH:
-		ipds->nh = *ipds->cp;
-		ipds->advance = ah_print(gndo, ipds->cp);
+		if (!ND_TTEST_1(ipds->cp)) {
+			ndo->ndo_protocol = "ah";
+			nd_print_trunc(ndo);
+			break;
+		}
+		ipds->nh = EXTRACT_U_1(ipds->cp);
+		ipds->advance = ah_print(ndo, ipds->cp);
 		if (ipds->advance <= 0)
 			break;
 		ipds->cp += ipds->advance;
@@ -336,7 +363,7 @@ again:
 
 	case IPPROTO_ESP:
 	{
-		int enh, padlen;
+		u_int enh, padlen;
 		ipds->advance = esp_print(ndo, ipds->cp, ipds->len,
 				    (const u_char *)ipds->ip,
 				    &enh, &padlen);
@@ -350,18 +377,18 @@ again:
 
 	case IPPROTO_IPCOMP:
 	{
-		int enh;
-		ipds->advance = ipcomp_print(ndo, ipds->cp, &enh);
-		if (ipds->advance <= 0)
-			break;
-		ipds->cp += ipds->advance;
-		ipds->len -= ipds->advance;
-		ipds->nh = enh & 0xff;
-		goto again;
+		ipcomp_print(ndo, ipds->cp);
+		/*
+		 * Either this has decompressed the payload and
+		 * printed it, in which case there's nothing more
+		 * to do, or it hasn't, in which case there's
+		 * nothing more to do.
+		 */
+		break;
 	}
 
 	case IPPROTO_SCTP:
-		sctp_print(ipds->cp, (const u_char *)ipds->ip, ipds->len);
+		sctp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len);
 		break;
 
 	case IPPROTO_DCCP:
@@ -370,7 +397,7 @@ again:
 
 	case IPPROTO_TCP:
 		/* pass on the MF bit plus the offset to detect fragments */
-		tcp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,
+		tcp_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip,
 			  ipds->off & (IP_MF|IP_OFFMASK));
 		break;
 
@@ -408,7 +435,7 @@ again:
 		break;
 
 	case IPPROTO_ND:
-		ND_PRINT((ndo, " nd %d", ipds->len));
+		ND_PRINT(" nd %u", ipds->len);
 		break;
 
 	case IPPROTO_EGP:
@@ -416,7 +443,7 @@ again:
 		break;
 
 	case IPPROTO_OSPF:
-		ospf_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
+		ospf_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
 		break;
 
 	case IPPROTO_IGMP:
@@ -426,21 +453,19 @@ again:
 	case IPPROTO_IPV4:
 		/* DVMRP multicast tunnel (ip-in-ip encapsulation) */
 		ip_print(ndo, ipds->cp, ipds->len);
-		if (! vflag) {
-			ND_PRINT((ndo, " (ipip-proto-4)"));
+		if (! ndo->ndo_vflag) {
+			ND_PRINT(" (ipip-proto-4)");
 			return;
 		}
 		break;
 
-#ifdef INET6
 	case IPPROTO_IPV6:
 		/* ip6-in-ip encapsulation */
 		ip6_print(ndo, ipds->cp, ipds->len);
 		break;
-#endif /*INET6*/
 
 	case IPPROTO_RSVP:
-		rsvp_print(ipds->cp, ipds->len);
+		rsvp_print(ndo, ipds->cp, ipds->len);
 		break;
 
 	case IPPROTO_GRE:
@@ -453,25 +478,25 @@ again:
 		break;
 
 	case IPPROTO_PIM:
-		vec[0].ptr = ipds->cp;
-		vec[0].len = ipds->len;
-		pim_print(ipds->cp, ipds->len, in_cksum(vec, 1));
+		pim_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
 		break;
 
 	case IPPROTO_VRRP:
-		if (packettype == PT_CARP) {
-			if (vflag)
-				(void)printf("carp %s > %s: ",
-					     ipaddr_string(&ipds->ip->ip_src),
-					     ipaddr_string(&ipds->ip->ip_dst));
-			carp_print(ndo, ipds->cp, ipds->len, ipds->ip->ip_ttl);
+		if (ndo->ndo_packettype == PT_CARP) {
+			if (ndo->ndo_vflag)
+				ND_PRINT("carp %s > %s: ",
+					     ipaddr_string(ndo, ipds->ip->ip_src),
+					     ipaddr_string(ndo, ipds->ip->ip_dst));
+			carp_print(ndo, ipds->cp, ipds->len,
+				EXTRACT_U_1(ipds->ip->ip_ttl));
 		} else {
-			if (vflag)
-				(void)printf("vrrp %s > %s: ",
-					     ipaddr_string(&ipds->ip->ip_src),
-					     ipaddr_string(&ipds->ip->ip_dst));
+			if (ndo->ndo_vflag)
+				ND_PRINT("vrrp %s > %s: ",
+					     ipaddr_string(ndo, ipds->ip->ip_src),
+					     ipaddr_string(ndo, ipds->ip->ip_dst));
 			vrrp_print(ndo, ipds->cp, ipds->len,
-				(const u_char *)ipds->ip, ipds->ip->ip_ttl);
+				(const u_char *)ipds->ip,
+				EXTRACT_U_1(ipds->ip->ip_ttl));
 		}
 		break;
 
@@ -480,17 +505,17 @@ again:
 		break;
 
 	default:
-		if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL)
-			ND_PRINT((ndo, " %s", proto->p_name));
+		if (ndo->ndo_nflag==0 && (p_name = netdb_protoname(ipds->nh)) != NULL)
+			ND_PRINT(" %s", p_name);
 		else
-			ND_PRINT((ndo, " ip-proto-%d", ipds->nh));
-		ND_PRINT((ndo, " %d", ipds->len));
+			ND_PRINT(" ip-proto-%u", ipds->nh);
+		ND_PRINT(" %u", ipds->len);
 		break;
 	}
 }
 
 void
-ip_print_inner(netdissect_options *ndo,
+ip_inner_print(netdissect_options *ndo,
 	       const u_char *bp,
 	       u_int length, u_int nh,
 	       const u_char *bp2)
@@ -521,40 +546,44 @@ ip_print(netdissect_options *ndo,
 	const u_char *ipend;
 	u_int hlen;
 	struct cksum_vec vec[1];
-	u_int16_t sum, ip_sum;
-	struct protoent *proto;
+	uint8_t ip_tos, ip_ttl, ip_proto;
+	uint16_t sum, ip_sum;
+	const char *p_name;
+	int truncated = 0;
 
+	ndo->ndo_protocol = "ip";
 	ipds->ip = (const struct ip *)bp;
-	if (IP_V(ipds->ip) != 4) { /* print version if != 4 */
-	    printf("IP%u ", IP_V(ipds->ip));
+	ND_TCHECK_1(ipds->ip->ip_vhl);
+	if (IP_V(ipds->ip) != 4) { /* print version and fail if != 4 */
 	    if (IP_V(ipds->ip) == 6)
-		printf(", wrong link-layer encapsulation");
+	      ND_PRINT("IP6, wrong link-layer encapsulation");
+	    else
+	      ND_PRINT("IP%u", IP_V(ipds->ip));
+	    nd_print_invalid(ndo);
+	    return;
 	}
-        else if (!eflag)
-	    printf("IP ");
+	if (!ndo->ndo_eflag)
+		ND_PRINT("IP ");
 
-	if ((u_char *)(ipds->ip + 1) > ndo->ndo_snapend) {
-		printf("%s", tstr);
-		return;
-	}
+	ND_TCHECK_SIZE(ipds->ip);
 	if (length < sizeof (struct ip)) {
-		(void)printf("truncated-ip %u", length);
+		ND_PRINT("truncated-ip %u", length);
 		return;
 	}
 	hlen = IP_HL(ipds->ip) * 4;
 	if (hlen < sizeof (struct ip)) {
-		(void)printf("bad-hlen %u", hlen);
+		ND_PRINT("bad-hlen %u", hlen);
 		return;
 	}
 
-	ipds->len = EXTRACT_16BITS(&ipds->ip->ip_len);
+	ipds->len = EXTRACT_BE_U_2(ipds->ip->ip_len);
 	if (length < ipds->len)
-		(void)printf("truncated-ip - %u bytes missing! ",
+		ND_PRINT("truncated-ip - %u bytes missing! ",
 			ipds->len - length);
 	if (ipds->len < hlen) {
 #ifdef GUESS_TSO
             if (ipds->len) {
-                (void)printf("bad-len %u", ipds->len);
+                ND_PRINT("bad-len %u", ipds->len);
                 return;
             }
             else {
@@ -562,7 +591,7 @@ ip_print(netdissect_options *ndo,
                 ipds->len = length;
             }
 #else
-            (void)printf("bad-len %u", ipds->len);
+            ND_PRINT("bad-len %u", ipds->len);
             return;
 #endif /* GUESS_TSO */
 	}
@@ -576,60 +605,78 @@ ip_print(netdissect_options *ndo,
 
 	ipds->len -= hlen;
 
-	ipds->off = EXTRACT_16BITS(&ipds->ip->ip_off);
+	ipds->off = EXTRACT_BE_U_2(ipds->ip->ip_off);
+
+        ip_proto = EXTRACT_U_1(ipds->ip->ip_p);
 
-        if (vflag) {
-            (void)printf("(tos 0x%x", (int)ipds->ip->ip_tos);
+        if (ndo->ndo_vflag) {
+            ip_tos = EXTRACT_U_1(ipds->ip->ip_tos);
+            ND_PRINT("(tos 0x%x", ip_tos);
             /* ECN bits */
-            if (ipds->ip->ip_tos & 0x03) {
-                switch (ipds->ip->ip_tos & 0x03) {
-                case 1:
-                    (void)printf(",ECT(1)");
-                    break;
-                case 2:
-                    (void)printf(",ECT(0)");
-                    break;
-                case 3:
-                    (void)printf(",CE");
-                }
+            switch (ip_tos & 0x03) {
+
+            case 0:
+                break;
+
+            case 1:
+                ND_PRINT(",ECT(1)");
+                break;
+
+            case 2:
+                ND_PRINT(",ECT(0)");
+                break;
+
+            case 3:
+                ND_PRINT(",CE");
+                break;
             }
 
-            if (ipds->ip->ip_ttl >= 1)
-                (void)printf(", ttl %u", ipds->ip->ip_ttl);
+            ip_ttl = EXTRACT_U_1(ipds->ip->ip_ttl);
+            if (ip_ttl >= 1)
+                ND_PRINT(", ttl %u", ip_ttl);
 
 	    /*
 	     * for the firewall guys, print id, offset.
              * On all but the last stick a "+" in the flags portion.
 	     * For unfragmented datagrams, note the don't fragment flag.
 	     */
-
-	    (void)printf(", id %u, offset %u, flags [%s], proto %s (%u)",
-                         EXTRACT_16BITS(&ipds->ip->ip_id),
+	    ND_PRINT(", id %u, offset %u, flags [%s], proto %s (%u)",
+                         EXTRACT_BE_U_2(ipds->ip->ip_id),
                          (ipds->off & 0x1fff) * 8,
                          bittok2str(ip_frag_values, "none", ipds->off&0xe000),
-                         tok2str(ipproto_values,"unknown",ipds->ip->ip_p),
-                         ipds->ip->ip_p);
+                         tok2str(ipproto_values, "unknown", ip_proto),
+                         ip_proto);
 
-            (void)printf(", length %u", EXTRACT_16BITS(&ipds->ip->ip_len));
+            ND_PRINT(", length %u", EXTRACT_BE_U_2(ipds->ip->ip_len));
 
             if ((hlen - sizeof(struct ip)) > 0) {
-                printf(", options (");
-                ip_optprint((u_char *)(ipds->ip + 1), hlen - sizeof(struct ip));
-                printf(")");
+                ND_PRINT(", options (");
+                if (ip_optprint(ndo, (const u_char *)(ipds->ip + 1),
+                    hlen - sizeof(struct ip)) == -1) {
+                        ND_PRINT(" [truncated-option]");
+			truncated = 1;
+                }
+                ND_PRINT(")");
             }
 
-	    if (!Kflag && (u_char *)ipds->ip + hlen <= ndo->ndo_snapend) {
-	        vec[0].ptr = (const u_int8_t *)(void *)ipds->ip;
+	    if (!ndo->ndo_Kflag && (const u_char *)ipds->ip + hlen <= ndo->ndo_snapend) {
+	        vec[0].ptr = (const uint8_t *)(const void *)ipds->ip;
 	        vec[0].len = hlen;
 	        sum = in_cksum(vec, 1);
 		if (sum != 0) {
-		    ip_sum = EXTRACT_16BITS(&ipds->ip->ip_sum);
-		    (void)printf(", bad cksum %x (->%x)!", ip_sum,
+		    ip_sum = EXTRACT_BE_U_2(ipds->ip->ip_sum);
+		    ND_PRINT(", bad cksum %x (->%x)!", ip_sum,
 			     in_cksum_shouldbe(ip_sum, sum));
 		}
 	    }
 
-            printf(")\n    ");
+	    ND_PRINT(")\n    ");
+	    if (truncated) {
+		ND_PRINT("%s > %s: ",
+			 ipaddr_string(ndo, ipds->ip->ip_src),
+			 ipaddr_string(ndo, ipds->ip->ip_dst));
+		goto trunc;
+	    }
 	}
 
 	/*
@@ -638,65 +685,66 @@ ip_print(netdissect_options *ndo,
 	 */
 	if ((ipds->off & 0x1fff) == 0) {
 		ipds->cp = (const u_char *)ipds->ip + hlen;
-		ipds->nh = ipds->ip->ip_p;
+		ipds->nh = EXTRACT_U_1(ipds->ip->ip_p);
 
 		if (ipds->nh != IPPROTO_TCP && ipds->nh != IPPROTO_UDP &&
 		    ipds->nh != IPPROTO_SCTP && ipds->nh != IPPROTO_DCCP) {
-			(void)printf("%s > %s: ",
-				     ipaddr_string(&ipds->ip->ip_src),
-				     ipaddr_string(&ipds->ip->ip_dst));
+			ND_PRINT("%s > %s: ",
+				     ipaddr_string(ndo, ipds->ip->ip_src),
+				     ipaddr_string(ndo, ipds->ip->ip_dst));
 		}
 		ip_print_demux(ndo, ipds);
 	} else {
-	    /* Ultra quiet now means that all this stuff should be suppressed */
-	    if (qflag > 1) return;
+		/*
+		 * Ultra quiet now means that all this stuff should be
+		 * suppressed.
+		 */
+		if (ndo->ndo_qflag > 1)
+			return;
 
-	    /*
-	     * if this isn't the first frag, we're missing the
-	     * next level protocol header.  print the ip addr
-	     * and the protocol.
-	     */
-	    if (ipds->off & 0x1fff) {
-	        (void)printf("%s > %s:", ipaddr_string(&ipds->ip->ip_src),
-			     ipaddr_string(&ipds->ip->ip_dst));
-		if (!ndo->ndo_nflag && (proto = getprotobynumber(ipds->ip->ip_p)) != NULL)
-		    (void)printf(" %s", proto->p_name);
+		/*
+		 * This isn't the first frag, so we're missing the
+		 * next level protocol header.  print the ip addr
+		 * and the protocol.
+		 */
+		ND_PRINT("%s > %s:", ipaddr_string(ndo, ipds->ip->ip_src),
+		          ipaddr_string(ndo, ipds->ip->ip_dst));
+		if (!ndo->ndo_nflag && (p_name = netdb_protoname(ip_proto)) != NULL)
+			ND_PRINT(" %s", p_name);
 		else
-		    (void)printf(" ip-proto-%d", ipds->ip->ip_p);
-	    }
+			ND_PRINT(" ip-proto-%u", ip_proto);
 	}
+	return;
+
+trunc:
+	nd_print_trunc(ndo);
+	return;
 }
 
 void
-ipN_print(netdissect_options *ndo, register const u_char *bp, register u_int length)
+ipN_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
-	struct ip hdr;
-
-	if (length < 4) {
-		(void)printf("truncated-ip %d", length);
+	ndo->ndo_protocol = "ipN";
+	if (length < 1) {
+		ND_PRINT("truncated-ip %u", length);
 		return;
 	}
-	memcpy (&hdr, bp, 4);
-	switch (IP_V(&hdr)) {
-	case 4:
-		ip_print (ndo, bp, length);
-		return;
-#ifdef INET6
-	case 6:
-		ip6_print (ndo, bp, length);
-		return;
-#endif
+
+	ND_TCHECK_1(bp);
+	switch (EXTRACT_U_1(bp) & 0xF0) {
+	case 0x40:
+		ip_print(ndo, bp, length);
+		break;
+	case 0x60:
+		ip6_print(ndo, bp, length);
+		break;
 	default:
-		(void)printf("unknown ip %d", IP_V(&hdr));
-		return;
+		ND_PRINT("unknown ip %u", (EXTRACT_U_1(bp) & 0xF0) >> 4);
+		break;
 	}
-}
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
-
+	return;
 
+trunc:
+	nd_print_trunc(ndo);
+	return;
+}