X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/32e24ead3b2a171e5f5eff50d7231c2514eda9b4..0f9428904ade10d6cf116e00b4bcc63e233b0a79:/print-pim.c

diff --git a/print-pim.c b/print-pim.c
index a8e0be01..5b1d61bc 100644
--- a/print-pim.c
+++ b/print-pim.c
@@ -147,25 +147,25 @@ pimv1_join_prune_print(netdissect_options *ndo,
 	u_int njp;
 
 	/* If it's a single group and a single source, use 1-line output. */
-	if (ND_TTEST_LEN(bp, 30) && EXTRACT_U_1(bp + 11) == 1 &&
-	    ((njoin = EXTRACT_BE_U_2(bp + 20)) + EXTRACT_BE_U_2(bp + 22)) == 1) {
+	if (ND_TTEST_LEN(bp, 30) && GET_U_1(bp + 11) == 1 &&
+	    ((njoin = GET_BE_U_2(bp + 20)) + GET_BE_U_2(bp + 22)) == 1) {
 		u_int hold;
 
 		ND_PRINT(" RPF %s ", ipaddr_string(ndo, bp));
-		hold = EXTRACT_BE_U_2(bp + 6);
+		hold = GET_BE_U_2(bp + 6);
 		if (hold != 180) {
 			ND_PRINT("Hold ");
 			unsigned_relts_print(ndo, hold);
 		}
 		ND_PRINT("%s (%s/%u, %s", njoin ? "Join" : "Prune",
-		ipaddr_string(ndo, bp + 26), EXTRACT_U_1(bp + 25) & 0x3f,
+		ipaddr_string(ndo, bp + 26), GET_U_1(bp + 25) & 0x3f,
 		ipaddr_string(ndo, bp + 12));
-		if (EXTRACT_BE_U_4(bp + 16) != 0xffffffff)
+		if (GET_BE_U_4(bp + 16) != 0xffffffff)
 			ND_PRINT("/%s", ipaddr_string(ndo, bp + 16));
 		ND_PRINT(") %s%s %s",
-		    (EXTRACT_U_1(bp + 24) & 0x01) ? "Sparse" : "Dense",
-		    (EXTRACT_U_1(bp + 25) & 0x80) ? " WC" : "",
-		    (EXTRACT_U_1(bp + 25) & 0x40) ? "RP" : "SPT");
+		    (GET_U_1(bp + 24) & 0x01) ? "Sparse" : "Dense",
+		    (GET_U_1(bp + 25) & 0x80) ? " WC" : "",
+		    (GET_U_1(bp + 25) & 0x40) ? "RP" : "SPT");
 		return;
 	}
 
@@ -183,7 +183,7 @@ pimv1_join_prune_print(netdissect_options *ndo,
 	if (ndo->ndo_vflag > 1)
 		ND_PRINT("\n");
 	ND_PRINT(" Hold time: ");
-	unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 2));
+	unsigned_relts_print(ndo, GET_BE_U_2(bp + 2));
 	if (ndo->ndo_vflag < 2)
 		return;
 	bp += 4;
@@ -192,7 +192,7 @@ pimv1_join_prune_print(netdissect_options *ndo,
 	if (len < 4)
 		goto trunc;
 	ND_TCHECK_4(bp);
-	ngroups = EXTRACT_U_1(bp + 3);
+	ngroups = GET_U_1(bp + 3);
 	bp += 4;
 	len -= 4;
 	while (ngroups != 0) {
@@ -209,15 +209,15 @@ pimv1_join_prune_print(netdissect_options *ndo,
 		if (len < 4)
 			goto trunc;
 		ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
-		if (EXTRACT_BE_U_4(bp) != 0xffffffff)
+		if (GET_BE_U_4(bp) != 0xffffffff)
 			ND_PRINT("/%s", ipaddr_string(ndo, bp));
 		bp += 4;
 		len -= 4;
 		if (len < 4)
 			goto trunc;
 		ND_TCHECK_4(bp);
-		njoin = EXTRACT_BE_U_2(bp);
-		nprune = EXTRACT_BE_U_2(bp + 2);
+		njoin = GET_BE_U_2(bp);
+		nprune = GET_BE_U_2(bp + 2);
 		ND_PRINT(" joined: %u pruned: %u", njoin, nprune);
 		bp += 4;
 		len -= 4;
@@ -232,11 +232,11 @@ pimv1_join_prune_print(netdissect_options *ndo,
 				goto trunc;
 			ND_TCHECK_6(bp);
 			ND_PRINT("\n\t%s %s%s%s%s/%u", type,
-			    (EXTRACT_U_1(bp) & 0x01) ? "Sparse " : "Dense ",
-			    (EXTRACT_U_1(bp + 1) & 0x80) ? "WC " : "",
-			    (EXTRACT_U_1(bp + 1) & 0x40) ? "RP " : "SPT ",
+			    (GET_U_1(bp) & 0x01) ? "Sparse " : "Dense ",
+			    (GET_U_1(bp + 1) & 0x80) ? "WC " : "",
+			    (GET_U_1(bp + 1) & 0x40) ? "RP " : "SPT ",
 			    ipaddr_string(ndo, bp + 2),
-			    EXTRACT_U_1(bp + 1) & 0x3f);
+			    GET_U_1(bp + 1) & 0x3f);
 			bp += 6;
 			len -= 6;
 		}
@@ -256,13 +256,13 @@ pimv1_print(netdissect_options *ndo,
 
 	ndo->ndo_protocol = "pimv1";
 	ND_TCHECK_1(bp + 1);
-	type = EXTRACT_U_1(bp + 1);
+	type = GET_U_1(bp + 1);
 
 	ND_PRINT(" %s", tok2str(pimv1_type_str, "[type %u]", type));
 	switch (type) {
 	case PIMV1_TYPE_QUERY:
 		if (ND_TTEST_1(bp + 8)) {
-			switch (EXTRACT_U_1(bp + 8) >> 4) {
+			switch (GET_U_1(bp + 8) >> 4) {
 			case 0:
 				ND_PRINT(" Dense-mode");
 				break;
@@ -273,14 +273,14 @@ pimv1_print(netdissect_options *ndo,
 				ND_PRINT(" Sparse-Dense-mode");
 				break;
 			default:
-				ND_PRINT(" mode-%u", EXTRACT_U_1(bp + 8) >> 4);
+				ND_PRINT(" mode-%u", GET_U_1(bp + 8) >> 4);
 				break;
 			}
 		}
 		if (ndo->ndo_vflag) {
 			ND_TCHECK_2(bp + 10);
 			ND_PRINT(" (Hold-time ");
-			unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 10));
+			unsigned_relts_print(ndo, GET_BE_U_2(bp + 10));
 			ND_PRINT(")");
 		}
 		break;
@@ -299,23 +299,23 @@ pimv1_print(netdissect_options *ndo,
 		if (ndo->ndo_vflag) {
 			ND_TCHECK_2(bp + 22);
 			ND_PRINT(" group %s", ipaddr_string(ndo, bp + 8));
-			if (EXTRACT_BE_U_4(bp + 12) != 0xffffffff)
+			if (GET_BE_U_4(bp + 12) != 0xffffffff)
 				ND_PRINT("/%s", ipaddr_string(ndo, bp + 12));
 			ND_PRINT(" RP %s hold ", ipaddr_string(ndo, bp + 16));
-			unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 22));
+			unsigned_relts_print(ndo, GET_BE_U_2(bp + 22));
 		}
 		break;
 	case PIMV1_TYPE_ASSERT:
 		ND_TCHECK_LEN(bp + 16, sizeof(nd_ipv4));
 		ND_PRINT(" for %s > %s", ipaddr_string(ndo, bp + 16),
 			  ipaddr_string(ndo, bp + 8));
-		if (EXTRACT_BE_U_4(bp + 12) != 0xffffffff)
+		if (GET_BE_U_4(bp + 12) != 0xffffffff)
 			ND_PRINT("/%s", ipaddr_string(ndo, bp + 12));
 		ND_TCHECK_4(bp + 24);
 		ND_PRINT(" %s pref %u metric %u",
-		    (EXTRACT_U_1(bp + 20) & 0x80) ? "RP-tree" : "SPT",
-		    EXTRACT_BE_U_4(bp + 20) & 0x7fffffff,
-		    EXTRACT_BE_U_4(bp + 24));
+		    (GET_U_1(bp + 20) & 0x80) ? "RP-tree" : "SPT",
+		    GET_BE_U_4(bp + 20) & 0x7fffffff,
+		    GET_BE_U_4(bp + 24));
 		break;
 	case PIMV1_TYPE_JOIN_PRUNE:
 	case PIMV1_TYPE_GRAFT:
@@ -328,8 +328,8 @@ pimv1_print(netdissect_options *ndo,
 		break;
 	}
 	ND_TCHECK_1(bp + 4);
-	if ((EXTRACT_U_1(bp + 4) >> 4) != 1)
-		ND_PRINT(" [v%u]", EXTRACT_U_1(bp + 4) >> 4);
+	if ((GET_U_1(bp + 4) >> 4) != 1)
+		ND_PRINT(" [v%u]", GET_U_1(bp + 4) >> 4);
 	return;
 
 trunc:
@@ -356,7 +356,7 @@ cisco_autorp_print(netdissect_options *ndo,
 		goto trunc;
 	ND_TCHECK_1(bp);
 	ND_PRINT(" auto-rp ");
-	type = EXTRACT_U_1(bp);
+	type = GET_U_1(bp);
 	switch (type) {
 	case 0x11:
 		ND_PRINT("candidate-advert");
@@ -370,13 +370,13 @@ cisco_autorp_print(netdissect_options *ndo,
 	}
 
 	ND_TCHECK_1(bp + 1);
-	numrps = EXTRACT_U_1(bp + 1);
+	numrps = GET_U_1(bp + 1);
 
 	ND_TCHECK_2(bp + 2);
 	ND_PRINT(" Hold ");
-	hold = EXTRACT_BE_U_2(bp + 2);
+	hold = GET_BE_U_2(bp + 2);
 	if (hold)
-		unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 2));
+		unsigned_relts_print(ndo, GET_BE_U_2(bp + 2));
 	else
 		ND_PRINT("FOREVER");
 
@@ -410,7 +410,7 @@ cisco_autorp_print(netdissect_options *ndo,
 		if (len < 1)
 			goto trunc;
 		ND_TCHECK_1(bp);
-		switch (EXTRACT_U_1(bp) & 0x3) {
+		switch (GET_U_1(bp) & 0x3) {
 		case 0: ND_PRINT(" PIMv?");
 			break;
 		case 1:	ND_PRINT(" PIMv1");
@@ -420,14 +420,14 @@ cisco_autorp_print(netdissect_options *ndo,
 		case 3:	ND_PRINT(" PIMv1+2");
 			break;
 		}
-		if (EXTRACT_U_1(bp) & 0xfc)
-			ND_PRINT(" [rsvd=0x%02x]", EXTRACT_U_1(bp) & 0xfc);
+		if (GET_U_1(bp) & 0xfc)
+			ND_PRINT(" [rsvd=0x%02x]", GET_U_1(bp) & 0xfc);
 		bp += 1;
 		len -= 1;
 		if (len < 1)
 			goto trunc;
 		ND_TCHECK_1(bp);
-		nentries = EXTRACT_U_1(bp);
+		nentries = GET_U_1(bp);
 		bp += 1;
 		len -= 1;
 		s = ' ';
@@ -435,13 +435,13 @@ cisco_autorp_print(netdissect_options *ndo,
 			if (len < 6)
 				goto trunc;
 			ND_TCHECK_6(bp);
-			ND_PRINT("%c%s%s/%u", s, EXTRACT_U_1(bp) & 1 ? "!" : "",
-			          ipaddr_string(ndo, bp + 2), EXTRACT_U_1(bp + 1));
-			if (EXTRACT_U_1(bp) & 0x02) {
+			ND_PRINT("%c%s%s/%u", s, GET_U_1(bp) & 1 ? "!" : "",
+			          ipaddr_string(ndo, bp + 2), GET_U_1(bp + 1));
+			if (GET_U_1(bp) & 0x02) {
 				ND_PRINT(" bidir");
 			}
-			if (EXTRACT_U_1(bp) & 0xfc) {
-				ND_PRINT("[rsvd=0x%02x]", EXTRACT_U_1(bp) & 0xfc);
+			if (GET_U_1(bp) & 0xfc) {
+				ND_PRINT("[rsvd=0x%02x]", GET_U_1(bp) & 0xfc);
 			}
 			s = ',';
 			bp += 6; len -= 6;
@@ -469,7 +469,7 @@ pim_print(netdissect_options *ndo,
 #endif
 
 	ND_TCHECK_1(pim->pim_typever);
-	pim_typever = EXTRACT_U_1(pim->pim_typever);
+	pim_typever = GET_U_1(pim->pim_typever);
 	switch (PIM_VER(pim_typever)) {
 	case 2:
 		if (!ndo->ndo_vflag) {
@@ -575,7 +575,7 @@ pimv2_addr_print(netdissect_options *ndo,
 		if (len < 2)
 			goto trunc;
 		ND_TCHECK_1(bp + 1);
-		switch (EXTRACT_U_1(bp)) {
+		switch (GET_U_1(bp)) {
 		case 1:
 			af = AF_INET;
 			addr_len = (u_int)sizeof(nd_ipv4);
@@ -587,7 +587,7 @@ pimv2_addr_print(netdissect_options *ndo,
 		default:
 			return -1;
 		}
-		if (EXTRACT_U_1(bp + 1) != 0)
+		if (GET_U_1(bp + 1) != 0)
 			return -1;
 		hdrlen = 2;
 	} else {
@@ -629,27 +629,28 @@ pimv2_addr_print(netdissect_options *ndo,
 		if (af == AF_INET) {
 			if (!silent) {
 				ND_PRINT("%s", ipaddr_string(ndo, bp + 2));
-				if (EXTRACT_U_1(bp + 1) != 32)
-					ND_PRINT("/%u", EXTRACT_U_1(bp + 1));
+				if (GET_U_1(bp + 1) != 32)
+					ND_PRINT("/%u", GET_U_1(bp + 1));
 			}
 		}
 		else if (af == AF_INET6) {
 			if (!silent) {
 				ND_PRINT("%s", ip6addr_string(ndo, bp + 2));
-				if (EXTRACT_U_1(bp + 1) != 128)
-					ND_PRINT("/%u", EXTRACT_U_1(bp + 1));
+				if (GET_U_1(bp + 1) != 128)
+					ND_PRINT("/%u", GET_U_1(bp + 1));
 			}
 		}
-		if (EXTRACT_U_1(bp) && !silent) {
+		if (GET_U_1(bp) && !silent) {
 			if (at == pimv2_group) {
-				ND_PRINT("(0x%02x)", EXTRACT_U_1(bp));
+				ND_PRINT("(0x%02x)", GET_U_1(bp));
 			} else {
 				ND_PRINT("(%s%s%s",
-					EXTRACT_U_1(bp) & 0x04 ? "S" : "",
-					EXTRACT_U_1(bp) & 0x02 ? "W" : "",
-					EXTRACT_U_1(bp) & 0x01 ? "R" : "");
-				if (EXTRACT_U_1(bp) & 0xf8) {
-					ND_PRINT("+0x%02x", EXTRACT_U_1(bp) & 0xf8);
+					GET_U_1(bp) & 0x04 ? "S" : "",
+					GET_U_1(bp) & 0x02 ? "W" : "",
+					GET_U_1(bp) & 0x01 ? "R" : "");
+				if (GET_U_1(bp) & 0xf8) {
+					ND_PRINT("+0x%02x",
+						 GET_U_1(bp) & 0xf8);
 				}
 				ND_PRINT(")");
 			}
@@ -712,16 +713,16 @@ pimv2_print(netdissect_options *ndo,
 	if (len < 2)
 		goto trunc;
 	ND_TCHECK_1(pim->pim_rsv);
-	pim_typever = EXTRACT_U_1(pim->pim_typever);
-	pimv2_addr_len = EXTRACT_U_1(pim->pim_rsv);
+	pim_typever = GET_U_1(pim->pim_typever);
+	pimv2_addr_len = GET_U_1(pim->pim_rsv);
 	if (pimv2_addr_len != 0)
 		ND_PRINT(", RFC2117-encoding");
 
 	if (len < 4)
 		goto trunc;
 	ND_TCHECK_2(pim->pim_cksum);
-	ND_PRINT(", cksum 0x%04x ", EXTRACT_BE_U_2(pim->pim_cksum));
-	if (EXTRACT_BE_U_2(pim->pim_cksum) == 0) {
+	ND_PRINT(", cksum 0x%04x ", GET_BE_U_2(pim->pim_cksum));
+	if (GET_BE_U_2(pim->pim_cksum) == 0) {
 		ND_PRINT("(unverified)");
 	} else {
 		if (PIM_TYPE(pim_typever) == PIMV2_TYPE_REGISTER) {
@@ -771,8 +772,8 @@ pimv2_print(netdissect_options *ndo,
 			if (len < 4)
 				goto trunc;
 			ND_TCHECK_4(bp);
-			otype = EXTRACT_BE_U_2(bp);
-			olen = EXTRACT_BE_U_2(bp + 2);
+			otype = GET_BE_U_2(bp);
+			olen = GET_BE_U_2(bp + 2);
 			ND_PRINT("\n\t  %s Option (%u), length %u, Value: ",
 			          tok2str(pimv2_hello_option_values, "Unknown", otype),
 			          otype,
@@ -789,7 +790,7 @@ pimv2_print(netdissect_options *ndo,
 					ND_PRINT("ERROR: Option Length != 2 Bytes (%u)", olen);
 				} else {
 					unsigned_relts_print(ndo,
-							     EXTRACT_BE_U_2(bp));
+							     GET_BE_U_2(bp));
 				}
 				break;
 
@@ -799,8 +800,8 @@ pimv2_print(netdissect_options *ndo,
 				} else {
 					char t_bit;
 					uint16_t lan_delay, override_interval;
-					lan_delay = EXTRACT_BE_U_2(bp);
-					override_interval = EXTRACT_BE_U_2(bp + 2);
+					lan_delay = GET_BE_U_2(bp);
+					override_interval = GET_BE_U_2(bp + 2);
 					t_bit = (lan_delay & 0x8000)? 1 : 0;
 					lan_delay &= ~0x8000;
 					ND_PRINT("\n\t    T-bit=%u, LAN delay %ums, Override interval %ums",
@@ -815,7 +816,7 @@ pimv2_print(netdissect_options *ndo,
 					ND_PRINT("Bi-Directional Capability (Old)");
 					break;
 				case 4:
-					ND_PRINT("%u", EXTRACT_BE_U_4(bp));
+					ND_PRINT("%u", GET_BE_U_4(bp));
 					break;
 				default:
 					ND_PRINT("ERROR: Option Length != 4 Bytes (%u)", olen);
@@ -827,7 +828,7 @@ pimv2_print(netdissect_options *ndo,
 				if (olen != 4) {
 					ND_PRINT("ERROR: Option Length != 4 Bytes (%u)", olen);
 				} else {
-					ND_PRINT("0x%08x", EXTRACT_BE_U_4(bp));
+					ND_PRINT("0x%08x", GET_BE_U_4(bp));
 				}
 				break;
 
@@ -835,14 +836,15 @@ pimv2_print(netdissect_options *ndo,
 				if (olen != 4) {
 					ND_PRINT("ERROR: Option Length != 4 Bytes (%u)", olen);
 				} else {
-					ND_PRINT("v%u", EXTRACT_U_1(bp));
-					if (EXTRACT_U_1(bp + 1) != 0) {
+					ND_PRINT("v%u", GET_U_1(bp));
+					if (GET_U_1(bp + 1) != 0) {
 						ND_PRINT(", interval ");
 						unsigned_relts_print(ndo,
-								     EXTRACT_U_1(bp + 1));
+								     GET_U_1(bp + 1));
 					}
-					if (EXTRACT_BE_U_2(bp + 2) != 0) {
-						ND_PRINT(" ?0x%04x?", EXTRACT_BE_U_2(bp + 2));
+					if (GET_BE_U_2(bp + 2) != 0) {
+						ND_PRINT(" ?0x%04x?",
+							 GET_BE_U_2(bp + 2));
 					}
 				}
 				break;
@@ -890,7 +892,7 @@ pimv2_print(netdissect_options *ndo,
 		ND_PRINT(", Flags [ %s ]\n\t",
 		          tok2str(pimv2_register_flag_values,
 		          "none",
-		          EXTRACT_BE_U_4(bp)));
+		          GET_BE_U_4(bp)));
 
 		bp += 4; len -= 4;
 		/* encapsulated multicast packet */
@@ -988,8 +990,8 @@ pimv2_print(netdissect_options *ndo,
 		if (len < 4)
 			goto trunc;
 		ND_TCHECK_4(bp);
-		ngroup = EXTRACT_U_1(bp + 1);
-		holdtime = EXTRACT_BE_U_2(bp + 2);
+		ngroup = GET_U_1(bp + 1);
+		holdtime = GET_BE_U_2(bp + 2);
 		ND_PRINT("\n\t  %u group(s)", ngroup);
 		if (PIM_TYPE(pim_typever) != 7) {	/*not for Graft-ACK*/
 			ND_PRINT(", holdtime: ");
@@ -1007,8 +1009,8 @@ pimv2_print(netdissect_options *ndo,
 			if (len < 4)
 				goto trunc;
 			ND_TCHECK_4(bp);
-			njoin = EXTRACT_BE_U_2(bp);
-			nprune = EXTRACT_BE_U_2(bp + 2);
+			njoin = GET_BE_U_2(bp);
+			nprune = GET_BE_U_2(bp + 2);
 			ND_PRINT(", joined sources: %u, pruned sources: %u", njoin, nprune);
 			bp += 4; len -= 4;
 			for (j = 0; j < njoin; j++) {
@@ -1035,17 +1037,17 @@ pimv2_print(netdissect_options *ndo,
 		if (len < 2)
 			goto trunc;
 		ND_TCHECK_2(bp);
-		ND_PRINT(" tag=%x", EXTRACT_BE_U_2(bp));
+		ND_PRINT(" tag=%x", GET_BE_U_2(bp));
 		bp += 2;
 		len -= 2;
 		if (len < 1)
 			goto trunc;
 		ND_TCHECK_1(bp);
-		ND_PRINT(" hashmlen=%u", EXTRACT_U_1(bp));
+		ND_PRINT(" hashmlen=%u", GET_U_1(bp));
 		if (len < 2)
 			goto trunc;
 		ND_TCHECK_1(bp + 2);
-		ND_PRINT(" BSRprio=%u", EXTRACT_U_1(bp + 1));
+		ND_PRINT(" BSRprio=%u", GET_U_1(bp + 1));
 		bp += 2;
 		len -= 2;
 
@@ -1068,11 +1070,11 @@ pimv2_print(netdissect_options *ndo,
 			if (len < 1)
 				goto trunc;
 			ND_TCHECK_1(bp);
-			ND_PRINT(" RPcnt=%u", EXTRACT_U_1(bp));
+			ND_PRINT(" RPcnt=%u", GET_U_1(bp));
 			if (len < 2)
 				goto trunc;
 			ND_TCHECK_1(bp + 1);
-			frpcnt = EXTRACT_U_1(bp + 1);
+			frpcnt = GET_U_1(bp + 1);
 			ND_PRINT(" FRPcnt=%u", frpcnt);
 			if (len < 4)
 				goto trunc;
@@ -1095,11 +1097,11 @@ pimv2_print(netdissect_options *ndo,
 				ND_TCHECK_2(bp);
 				ND_PRINT(",holdtime=");
 				unsigned_relts_print(ndo,
-						     EXTRACT_BE_U_2(bp));
+						     GET_BE_U_2(bp));
 				if (len < 3)
 					goto trunc;
 				ND_TCHECK_1(bp + 2);
-				ND_PRINT(",prio=%u", EXTRACT_U_1(bp + 2));
+				ND_PRINT(",prio=%u", GET_U_1(bp + 2));
 				if (len < 4)
 					goto trunc;
 				bp += 4;
@@ -1121,10 +1123,10 @@ pimv2_print(netdissect_options *ndo,
 		if (len < 8)
 			goto trunc;
 		ND_TCHECK_8(bp);
-		if (EXTRACT_U_1(bp) & 0x80)
+		if (GET_U_1(bp) & 0x80)
 			ND_PRINT(" RPT");
-		ND_PRINT(" pref=%u", EXTRACT_BE_U_4(bp) & 0x7fffffff);
-		ND_PRINT(" metric=%u", EXTRACT_BE_U_4(bp + 4));
+		ND_PRINT(" pref=%u", GET_BE_U_4(bp) & 0x7fffffff);
+		ND_PRINT(" metric=%u", GET_BE_U_4(bp + 4));
 		break;
 
 	case PIMV2_TYPE_CANDIDATE_RP:
@@ -1135,17 +1137,17 @@ pimv2_print(netdissect_options *ndo,
 		if (len < 1)
 			goto trunc;
 		ND_TCHECK_1(bp);
-		ND_PRINT(" prefix-cnt=%u", EXTRACT_U_1(bp));
-		pfxcnt = EXTRACT_U_1(bp);
+		ND_PRINT(" prefix-cnt=%u", GET_U_1(bp));
+		pfxcnt = GET_U_1(bp);
 		if (len < 2)
 			goto trunc;
 		ND_TCHECK_1(bp + 1);
-		ND_PRINT(" prio=%u", EXTRACT_U_1(bp + 1));
+		ND_PRINT(" prio=%u", GET_U_1(bp + 1));
 		if (len < 4)
 			goto trunc;
 		ND_TCHECK_2(bp + 2);
 		ND_PRINT(" holdtime=");
-		unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 2));
+		unsigned_relts_print(ndo, GET_BE_U_2(bp + 2));
 		bp += 4;
 		len -= 4;
 
@@ -1187,7 +1189,7 @@ pimv2_print(netdissect_options *ndo,
 			goto trunc;
 		ND_TCHECK_2(bp);
 		ND_PRINT(" TUNR ");
-		unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp));
+		unsigned_relts_print(ndo, GET_BE_U_2(bp));
 		break;