X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ee68aa36460d7efeca48747f33b7f2adc0900bfb..refs/heads/mcr-macro-update-1:/print-ospf6.c

diff --git a/print-ospf6.c b/print-ospf6.c
index c734b4d2..5e4f163d 100644
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -379,7 +379,7 @@ ospf6_print_ls_type(netdissect_options *ndo,
                ls_type & LS_TYPE_MASK,
                tok2str(ospf6_ls_scope_values, "Unknown", ls_type & LS_SCOPE_MASK),
                ls_type &0x8000 ? ", transitive" : "", /* U-bit */
-               ipaddr_string(ndo, (const u_char *)ls_stateid));
+               GET_IPADDR_STRING((const u_char *)ls_stateid));
 }
 
 static int
@@ -388,11 +388,9 @@ ospf6_print_lshdr(netdissect_options *ndo,
 {
 	if ((const u_char *)(lshp + 1) > dataend)
 		goto trunc;
-	ND_TCHECK_2(lshp->ls_type);
-	ND_TCHECK_4(lshp->ls_seq);
 
 	ND_PRINT("\n\t  Advertising Router %s, seq 0x%08x, age %us, length %u",
-               ipaddr_string(ndo, lshp->ls_router),
+               GET_IPADDR_STRING(lshp->ls_router),
                GET_BE_U_4(lshp->ls_seq),
                GET_BE_U_2(lshp->ls_age),
                GET_BE_U_2(lshp->ls_length)-(u_int)sizeof(struct lsa6_hdr));
@@ -428,7 +426,7 @@ ospf6_print_lsaprefix(netdissect_options *ndo,
 	ND_TCHECK_LEN(lsapp->lsa_p_prefix, wordlen * 4);
 	memset(prefix, 0, sizeof(prefix));
 	memcpy(prefix, lsapp->lsa_p_prefix, wordlen * 4);
-	ND_PRINT("\n\t\t%s/%u", ip6addr_string(ndo, prefix),
+	ND_PRINT("\n\t\t%s/%u", ip6addr_string(ndo, prefix), /* local buffer, not packet data; don't use GET_IP6ADDR_STRING() */
 		 GET_U_1(lsapp->lsa_p_len));
         if (GET_U_1(lsapp->lsa_p_opt)) {
             ND_PRINT(", Options [%s]",
@@ -472,7 +470,6 @@ ospf6_print_lsa(netdissect_options *ndo,
 
 	if (ospf6_print_lshdr(ndo, &lsap->ls_hdr, dataend))
 		return (1);
-	ND_TCHECK_2(lsap->ls_hdr.ls_length);
         length = GET_BE_U_2(lsap->ls_hdr.ls_length);
 
 	/*
@@ -491,7 +488,6 @@ ospf6_print_lsa(netdissect_options *ndo,
 		if (lsa_length < sizeof (lsap->lsa_un.un_rla.rla_options))
 			return (1);
 		lsa_length -= sizeof (lsap->lsa_un.un_rla.rla_options);
-		ND_TCHECK_4(lsap->lsa_un.un_rla.rla_options);
 		ND_PRINT("\n\t      Options [%s]",
 		          bittok2str(ospf6_option_values, "none",
 		          GET_BE_U_4(lsap->lsa_un.un_rla.rla_options)));
@@ -510,25 +506,25 @@ ospf6_print_lsa(netdissect_options *ndo,
 			case RLA_TYPE_VIRTUAL:
 				ND_PRINT("\n\t      Virtual Link: Neighbor Router-ID %s"
                                        "\n\t      Neighbor Interface-ID %s, Interface %s",
-                                       ipaddr_string(ndo, rlp->link_nrtid),
-                                       ipaddr_string(ndo, rlp->link_nifid),
-                                       ipaddr_string(ndo, rlp->link_ifid));
+                                       GET_IPADDR_STRING(rlp->link_nrtid),
+                                       GET_IPADDR_STRING(rlp->link_nifid),
+                                       GET_IPADDR_STRING(rlp->link_ifid));
                                 break;
 
 			case RLA_TYPE_ROUTER:
 				ND_PRINT("\n\t      Neighbor Router-ID %s"
                                        "\n\t      Neighbor Interface-ID %s, Interface %s",
-                                       ipaddr_string(ndo, rlp->link_nrtid),
-                                       ipaddr_string(ndo, rlp->link_nifid),
-                                       ipaddr_string(ndo, rlp->link_ifid));
+                                       GET_IPADDR_STRING(rlp->link_nrtid),
+                                       GET_IPADDR_STRING(rlp->link_nifid),
+                                       GET_IPADDR_STRING(rlp->link_ifid));
 				break;
 
 			case RLA_TYPE_TRANSIT:
 				ND_PRINT("\n\t      Neighbor Network-ID %s"
                                        "\n\t      Neighbor Interface-ID %s, Interface %s",
-				    ipaddr_string(ndo, rlp->link_nrtid),
-				    ipaddr_string(ndo, rlp->link_nifid),
-				    ipaddr_string(ndo, rlp->link_ifid));
+				    GET_IPADDR_STRING(rlp->link_nrtid),
+				    GET_IPADDR_STRING(rlp->link_nifid),
+				    GET_IPADDR_STRING(rlp->link_ifid));
 				break;
 
 			default:
@@ -545,7 +541,6 @@ ospf6_print_lsa(netdissect_options *ndo,
 		if (lsa_length < sizeof (lsap->lsa_un.un_nla.nla_options))
 			return (1);
 		lsa_length -= sizeof (lsap->lsa_un.un_nla.nla_options);
-		ND_TCHECK_4(lsap->lsa_un.un_nla.nla_options);
 		ND_PRINT("\n\t      Options [%s]",
 		          bittok2str(ospf6_option_values, "none",
 		          GET_BE_U_4(lsap->lsa_un.un_nla.nla_options)));
@@ -557,7 +552,7 @@ ospf6_print_lsa(netdissect_options *ndo,
 				return (1);
 			lsa_length -= sizeof (*ap);
 			ND_TCHECK_SIZE(ap);
-			ND_PRINT("\n\t\t%s", ipaddr_string(ndo, *ap));
+			ND_PRINT("\n\t\t%s", GET_IPADDR_STRING(*ap));
 			++ap;
 		}
 		break;
@@ -566,7 +561,6 @@ ospf6_print_lsa(netdissect_options *ndo,
 		if (lsa_length < sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric))
 			return (1);
 		lsa_length -= sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric);
-		ND_TCHECK_4(lsap->lsa_un.un_inter_ap.inter_ap_metric);
 		ND_PRINT(", metric %u",
 			GET_BE_U_4(lsap->lsa_un.un_inter_ap.inter_ap_metric) & SLA_MASK_METRIC);
 
@@ -575,6 +569,11 @@ ospf6_print_lsa(netdissect_options *ndo,
 			bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);
 			if (bytelen < 0)
 				goto trunc;
+			/*
+			 * ospf6_print_lsaprefix() will return -1 if
+			 * the length is too high, so this will not
+			 * underflow.
+			 */
 			lsa_length -= bytelen;
 			tptr += bytelen;
 		}
@@ -584,7 +583,6 @@ ospf6_print_lsa(netdissect_options *ndo,
 		if (lsa_length < sizeof (lsap->lsa_un.un_asla.asla_metric))
 			return (1);
 		lsa_length -= sizeof (lsap->lsa_un.un_asla.asla_metric);
-		ND_TCHECK_4(lsap->lsa_un.un_asla.asla_metric);
 		flags32 = GET_BE_U_4(lsap->lsa_un.un_asla.asla_metric);
 		ND_PRINT("\n\t     Flags [%s]",
 		          bittok2str(ospf6_asla_flag_values, "none", flags32));
@@ -597,6 +595,11 @@ ospf6_print_lsa(netdissect_options *ndo,
 		bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);
 		if (bytelen < 0)
 			goto trunc;
+		/*
+		 * ospf6_print_lsaprefix() will return -1 if
+		 * the length is too high, so this will not
+		 * underflow.
+		 */
 		lsa_length -= bytelen;
 		tptr += bytelen;
 
@@ -604,9 +607,8 @@ ospf6_print_lsa(netdissect_options *ndo,
 			if (lsa_length < sizeof (nd_ipv6))
 				return (1);
 			lsa_length -= sizeof (nd_ipv6);
-			ND_TCHECK_8(tptr);
 			ND_PRINT(" forward %s",
-			       ip6addr_string(ndo, tptr));
+				 GET_IP6ADDR_STRING(tptr));
 			tptr += sizeof(nd_ipv6);
 		}
 
@@ -614,9 +616,8 @@ ospf6_print_lsa(netdissect_options *ndo,
 			if (lsa_length < sizeof (uint32_t))
 				return (1);
 			lsa_length -= sizeof (uint32_t);
-			ND_TCHECK_4(tptr);
 			ND_PRINT(" tag %s",
-			       ipaddr_string(ndo, tptr));
+			       GET_IPADDR_STRING(tptr));
 			tptr += sizeof(uint32_t);
 		}
 
@@ -624,9 +625,8 @@ ospf6_print_lsa(netdissect_options *ndo,
 			if (lsa_length < sizeof (uint32_t))
 				return (1);
 			lsa_length -= sizeof (uint32_t);
-			ND_TCHECK_4(tptr);
 			ND_PRINT(" RefLSID: %s",
-			       ipaddr_string(ndo, tptr));
+			       GET_IPADDR_STRING(tptr));
 			tptr += sizeof(uint32_t);
 		}
 		break;
@@ -645,11 +645,10 @@ ospf6_print_lsa(netdissect_options *ndo,
 		if (lsa_length < sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix))
 			return (1);
 		lsa_length -= sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix);
-                ND_TCHECK_4(llsap->llsa_nprefix);
                 prefixes = GET_BE_U_4(llsap->llsa_nprefix);
 		ND_PRINT("\n\t      Priority %u, Link-local address %s, Prefixes %u:",
                        GET_U_1(llsap->llsa_priority),
-                       ip6addr_string(ndo, llsap->llsa_lladdr),
+                       GET_IP6ADDR_STRING(llsap->llsa_lladdr),
                        prefixes);
 
 		tptr = (const uint8_t *)llsap->llsa_prefix;
@@ -658,6 +657,11 @@ ospf6_print_lsa(netdissect_options *ndo,
 			if (bytelen < 0)
 				goto trunc;
 			prefixes--;
+			/*
+			 * ospf6_print_lsaprefix() will return -1 if
+			 * the length is too high, so this will not
+			 * underflow.
+			 */
 			lsa_length -= bytelen;
 			tptr += bytelen;
 		}
@@ -676,7 +680,6 @@ ospf6_print_lsa(netdissect_options *ndo,
 		if (lsa_length < sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix))
 			return (1);
 		lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
-		ND_TCHECK_2(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
                 prefixes = GET_BE_U_2(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
 		ND_PRINT("\n\t      Prefixes %u:", prefixes);
 
@@ -686,6 +689,11 @@ ospf6_print_lsa(netdissect_options *ndo,
 			if (bytelen < 0)
 				goto trunc;
 			prefixes--;
+			/*
+			 * ospf6_print_lsaprefix() will return -1 if
+			 * the length is too high, so this will not
+			 * underflow.
+			 */
 			lsa_length -= bytelen;
 			tptr += bytelen;
 		}
@@ -733,32 +741,28 @@ ospf6_decode_v3(netdissect_options *ndo,
 	case OSPF_TYPE_HELLO: {
 		const struct hello6 *hellop = (const struct hello6 *)((const uint8_t *)op + OSPF6HDR_LEN);
 
-		ND_TCHECK_4(hellop->hello_options);
 		ND_PRINT("\n\tOptions [%s]",
 		          bittok2str(ospf6_option_values, "none",
 		          GET_BE_U_4(hellop->hello_options)));
 
-		ND_TCHECK_2(hellop->hello_deadint);
 		ND_PRINT("\n\t  Hello Timer %us, Dead Timer %us, Interface-ID %s, Priority %u",
 		          GET_BE_U_2(hellop->hello_helloint),
 		          GET_BE_U_2(hellop->hello_deadint),
-		          ipaddr_string(ndo, hellop->hello_ifid),
+		          GET_IPADDR_STRING(hellop->hello_ifid),
 		          GET_U_1(hellop->hello_priority));
 
-		ND_TCHECK_4(hellop->hello_dr);
 		if (GET_BE_U_4(hellop->hello_dr) != 0)
 			ND_PRINT("\n\t  Designated Router %s",
-			    ipaddr_string(ndo, hellop->hello_dr));
-		ND_TCHECK_4(hellop->hello_bdr);
+			    GET_IPADDR_STRING(hellop->hello_dr));
 		if (GET_BE_U_4(hellop->hello_bdr) != 0)
 			ND_PRINT(", Backup Designated Router %s",
-			    ipaddr_string(ndo, hellop->hello_bdr));
+			    GET_IPADDR_STRING(hellop->hello_bdr));
 		if (ndo->ndo_vflag > 1) {
 			ND_PRINT("\n\t  Neighbor List:");
 			ap = hellop->hello_neighbor;
 			while ((const u_char *)ap < dataend) {
 				ND_TCHECK_SIZE(ap);
-				ND_PRINT("\n\t    %s", ipaddr_string(ndo, *ap));
+				ND_PRINT("\n\t    %s", GET_IPADDR_STRING(*ap));
 				++ap;
 			}
 		}
@@ -768,15 +772,12 @@ ospf6_decode_v3(netdissect_options *ndo,
 	case OSPF_TYPE_DD: {
 		const struct dd6 *ddp = (const struct dd6 *)((const uint8_t *)op + OSPF6HDR_LEN);
 
-		ND_TCHECK_4(ddp->db_options);
 		ND_PRINT("\n\tOptions [%s]",
 		          bittok2str(ospf6_option_values, "none",
 		          GET_BE_U_4(ddp->db_options)));
-		ND_TCHECK_1(ddp->db_flags);
 		ND_PRINT(", DD Flags [%s]",
 		          bittok2str(ospf6_dd_flag_values,"none",GET_U_1(ddp->db_flags)));
 
-		ND_TCHECK_4(ddp->db_seq);
 		ND_PRINT(", MTU %u, DD-Sequence 0x%08x",
                        GET_BE_U_2(ddp->db_mtu),
                        GET_BE_U_4(ddp->db_seq));
@@ -797,7 +798,7 @@ ospf6_decode_v3(netdissect_options *ndo,
 			while ((const u_char *)lsrp < dataend) {
 				ND_TCHECK_SIZE(lsrp);
 				ND_PRINT("\n\t  Advertising Router %s",
-				          ipaddr_string(ndo, lsrp->ls_router));
+				          GET_IPADDR_STRING(lsrp->ls_router));
 				ospf6_print_ls_type(ndo,
                                                     GET_BE_U_2(lsrp->ls_type),
                                                     &lsrp->ls_stateid);
@@ -810,7 +811,6 @@ ospf6_decode_v3(netdissect_options *ndo,
 		if (ndo->ndo_vflag > 1) {
 			const struct lsu6 *lsup = (const struct lsu6 *)((const uint8_t *)op + OSPF6HDR_LEN);
 
-			ND_TCHECK_4(lsup->lsu_count);
 			i = GET_BE_U_4(lsup->lsu_count);
 			lsap = lsup->lsu_lsa;
 			while ((const u_char *)lsap < dataend && i--) {
@@ -852,11 +852,9 @@ ospf6_print_lls(netdissect_options *ndo,
 	if (len < OSPF_LLS_HDRLEN)
 		goto trunc;
 	/* Checksum */
-	ND_TCHECK_2(cp);
 	ND_PRINT("\n\tLLS Checksum 0x%04x", GET_BE_U_2(cp));
 	cp += 2;
 	/* LLS Data Length */
-	ND_TCHECK_2(cp);
 	llsdatalen = GET_BE_U_2(cp);
 	ND_PRINT(", Data Length %u", llsdatalen);
 	if (llsdatalen < OSPF_LLS_HDRLEN || llsdatalen > len)
@@ -883,30 +881,24 @@ ospf6_decode_at(netdissect_options *ndo,
 	if (len < OSPF6_AT_HDRLEN)
 		goto trunc;
 	/* Authentication Type */
-	ND_TCHECK_2(cp);
 	ND_PRINT("\n\tAuthentication Type %s",
 		 tok2str(ospf6_auth_type_str, "unknown (0x%04x)", GET_BE_U_2(cp)));
 	cp += 2;
 	/* Auth Data Len */
-	ND_TCHECK_2(cp);
 	authdatalen = GET_BE_U_2(cp);
 	ND_PRINT(", Length %u", authdatalen);
 	if (authdatalen < OSPF6_AT_HDRLEN || authdatalen > len)
 		goto trunc;
 	cp += 2;
 	/* Reserved */
-	ND_TCHECK_2(cp);
 	cp += 2;
 	/* Security Association ID */
-	ND_TCHECK_2(cp);
 	ND_PRINT(", SAID %u", GET_BE_U_2(cp));
 	cp += 2;
 	/* Cryptographic Sequence Number (High-Order 32 Bits) */
-	ND_TCHECK_4(cp);
 	ND_PRINT(", CSN 0x%08x", GET_BE_U_4(cp));
 	cp += 4;
 	/* Cryptographic Sequence Number (Low-Order 32 Bits) */
-	ND_TCHECK_4(cp);
 	ND_PRINT(":%08x", GET_BE_U_4(cp));
 	cp += 4;
 	/* Authentication Data */
@@ -936,12 +928,10 @@ ospf6_decode_v3_trailer(netdissect_options *ndo,
 	type = GET_U_1(op->ospf6_type);
 	if (type == OSPF_TYPE_HELLO) {
 		const struct hello6 *hellop = (const struct hello6 *)((const uint8_t *)op + OSPF6HDR_LEN);
-		ND_TCHECK_4(hellop->hello_options);
 		if (GET_BE_U_4(hellop->hello_options) & OSPF6_OPTION_L)
 			lls_hello = 1;
 	} else if (type == OSPF_TYPE_DD) {
 		const struct dd6 *ddp = (const struct dd6 *)((const uint8_t *)op + OSPF6HDR_LEN);
-		ND_TCHECK_4(ddp->db_options);
 		if (GET_BE_U_4(ddp->db_options) & OSPF6_OPTION_L)
 			lls_dd = 1;
 	}
@@ -967,7 +957,6 @@ ospf6_print(netdissect_options *ndo,
 
 	/* If the type is valid translate it, or just print the type */
 	/* value.  If it's not valid, say so and return */
-	ND_TCHECK_1(op->ospf6_type);
 	cp = tok2str(ospf6_type_values, "unknown packet type (%u)",
 		     GET_U_1(op->ospf6_type));
 	ND_PRINT("OSPFv%u, %s, length %u", GET_U_1(op->ospf6_version), cp,
@@ -981,7 +970,6 @@ ospf6_print(netdissect_options *ndo,
 	}
 
 	/* OSPFv3 data always comes first and optional trailing data may follow. */
-	ND_TCHECK_2(op->ospf6_len);
 	datalen = GET_BE_U_2(op->ospf6_len);
 	if (datalen > length) {
 		ND_PRINT(" [len %u]", datalen);
@@ -989,15 +977,12 @@ ospf6_print(netdissect_options *ndo,
 	}
 	dataend = bp + datalen;
 
-	ND_TCHECK_4(op->ospf6_routerid);
-	ND_PRINT("\n\tRouter-ID %s", ipaddr_string(ndo, op->ospf6_routerid));
+	ND_PRINT("\n\tRouter-ID %s", GET_IPADDR_STRING(op->ospf6_routerid));
 
-	ND_TCHECK_4(op->ospf6_areaid);
 	if (GET_BE_U_4(op->ospf6_areaid) != 0)
-		ND_PRINT(", Area %s", ipaddr_string(ndo, op->ospf6_areaid));
+		ND_PRINT(", Area %s", GET_IPADDR_STRING(op->ospf6_areaid));
 	else
 		ND_PRINT(", Backbone Area");
-	ND_TCHECK_1(op->ospf6_instanceid);
 	if (GET_U_1(op->ospf6_instanceid))
 		ND_PRINT(", Instance %u", GET_U_1(op->ospf6_instanceid));