X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/acfb5669a9678c01e0db6446874dd9d09afae945..refs/pull/1034/head:/print-forces.c

diff --git a/print-forces.c b/print-forces.c
index 31cd2df4..03ea6074 100644
--- a/print-forces.c
+++ b/print-forces.c
@@ -661,7 +661,7 @@ prestlv_print(netdissect_options *ndo,
               uint16_t op_msk _U_, int indent)
 {
 	const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;
-	const u_char *tdp = (const u_char *) TLV_DATA(tlv);
+	const u_char *tdp = TLV_DATA(tlv);
 	const struct res_val *r = (const struct res_val *)tdp;
 	u_int dlen;
 	uint8_t result;
@@ -701,7 +701,7 @@ fdatatlv_print(netdissect_options *ndo,
 {
 	const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;
 	u_int rlen;
-	const u_char *tdp = (const u_char *) TLV_DATA(tlv);
+	const u_char *tdp = TLV_DATA(tlv);
 	uint16_t type;
 
 	/*
@@ -745,12 +745,11 @@ sdatailv_print(netdissect_options *ndo,
 	indent += 1;
 	while (rlen != 0) {
 		char *ib = indent_pr(indent, 1);
-		const u_char *tdp = (const u_char *) ILV_DATA(ilv);
+		const u_char *tdp = ILV_DATA(ilv);
 		invilv = ilv_valid(ndo, ilv, rlen);
 		if (invilv) {
-			ND_PRINT("%s[", ib + 1);
-			hex_print(ndo, ib, tdp, rlen);
-			ND_PRINT("\n%s]\n", ib + 1);
+			ND_PRINT("Error: %s, rlen %u\n",
+			         tok2str(ForCES_TLV_err, NULL, invilv), rlen);
 			goto invalid;
 		}
 		if (ndo->ndo_vflag >= 3) {
@@ -775,7 +774,7 @@ sdatatlv_print(netdissect_options *ndo,
 {
 	const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;
 	u_int rlen;
-	const u_char *tdp = (const u_char *) TLV_DATA(tlv);
+	const u_char *tdp = TLV_DATA(tlv);
 	uint16_t type;
 
 	/*
@@ -802,7 +801,7 @@ pkeyitlv_print(netdissect_options *ndo,
                uint16_t op_msk, int indent)
 {
 	const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;
-	const u_char *tdp = (const u_char *) TLV_DATA(tlv);
+	const u_char *tdp = TLV_DATA(tlv);
 	const u_char *dp = tdp + 4;
 	const struct forces_tlv *kdtlv = (const struct forces_tlv *)dp;
 	uint32_t id;
@@ -828,7 +827,7 @@ pkeyitlv_print(netdissect_options *ndo,
 	 * go past the end of the containing TLV).
 	 */
 	tll = GET_BE_U_2(kdtlv->length);
-	dp = (const u_char *) TLV_DATA(kdtlv);
+	dp = TLV_DATA(kdtlv);
 	return fdatatlv_print(ndo, dp, tll, op_msk, indent);
 invalid:
 	return -1;
@@ -849,9 +848,7 @@ pdatacnt_print(netdissect_options *ndo,
 		ND_PRINT("%sTABLE APPEND\n", ib);
 	}
 	for (i = 0; i < IDcnt; i++) {
-		ND_TCHECK_4(pptr);
-		if (len < 4)
-			goto invalid;
+		ND_ICHECK_U(len, <, 4);
 		id = GET_BE_U_4(pptr);
 		if (ndo->ndo_vflag >= 3)
 			ND_PRINT("%sID#%02u: %u\n", ib, i + 1, id);
@@ -965,10 +962,9 @@ pdatacnt_print(netdissect_options *ndo,
 
 			chk_op_type(ndo, type, op_msk, ops->op_msk);
 
-			if (ops->print(ndo, (const u_char *)pdtlv,
-					tll + pad + TLV_HDRL, op_msk,
-					indent + 2) == -1)
-				goto invalid;
+			ND_ICHECK_U(ops->print(ndo, (const u_char *)pdtlv,
+				    tll + pad + TLV_HDRL, op_msk, indent + 2),
+				    ==, -1);
 			len -= (TLV_HDRL + pad + tll);
 		} else {
 			ND_PRINT("Invalid path data content type 0x%x len %u\n",
@@ -1001,8 +997,7 @@ pdata_print(netdissect_options *ndo,
 	uint16_t idcnt = 0;
 
 	ND_TCHECK_SIZE(pdh);
-	if (len < sizeof(struct pathdata_h))
-		goto invalid;
+	ND_ICHECK_ZU(len, <, sizeof(struct pathdata_h));
 	if (ndo->ndo_vflag >= 3) {
 		ND_PRINT("\n%sPathdata: Flags 0x%x ID count %u\n",
 		       ib, GET_BE_U_2(pdh->pflags),
@@ -1078,7 +1073,7 @@ genoptlv_print(netdissect_options *ndo,
 	 * length is large enough but not too large (it doesn't
 	 * go past the end of the containing TLV).
 	 */
-	const u_char *dp = (const u_char *) TLV_DATA(pdtlv);
+	const u_char *dp = TLV_DATA(pdtlv);
 
 	if (!ttlv_valid(type)) {
 		ND_PRINT("%s TLV type 0x%x len %u\n",
@@ -1122,7 +1117,7 @@ recpdoptlv_print(netdissect_options *ndo,
 		 */
 		ib = indent_pr(indent, 0);
 		type = GET_BE_U_2(pdtlv->type);
-		dp = (const u_char *) TLV_DATA(pdtlv);
+		dp = TLV_DATA(pdtlv);
 
 		if (ndo->ndo_vflag >= 3)
 			ND_PRINT("%s%s, length %u (data encapsulated %u Bytes)",
@@ -1130,8 +1125,8 @@ recpdoptlv_print(netdissect_options *ndo,
 			          tlvl,
 			          tlvl - TLV_HDRL);
 
-		if (pdata_print(ndo, dp, tlvl - TLV_HDRL, op_msk, indent + 1) == -1)
-			goto invalid;
+		ND_ICHECK_U(pdata_print(ndo, dp, tlvl - TLV_HDRL, op_msk, indent + 1),
+			    ==, -1);
 		pdtlv = GO_NXT_TLV(pdtlv, len);
 	}
 
@@ -1167,7 +1162,7 @@ otlv_print(netdissect_options *ndo,
            const struct forces_tlv *otlv, uint16_t op_msk _U_, int indent)
 {
 	int rc = 0;
-	const u_char *dp = (const u_char *) TLV_DATA(otlv);
+	const u_char *dp = TLV_DATA(otlv);
 	uint16_t type;
 	u_int tll;
 	char *ib = indent_pr(indent, 0);
@@ -1310,12 +1305,12 @@ gentltlv_print(netdissect_options *ndo,
 
 static int
 print_metailv(netdissect_options *ndo,
-              const u_char * pptr, uint16_t op_msk _U_, int indent)
+              const struct forces_ilv * ilv, uint16_t op_msk _U_,
+              const int indent)
 {
 	u_int rlen;
 	char *ib = indent_pr(indent, 0);
 	/* XXX: check header length */
-	const struct forces_ilv *ilv = (const struct forces_ilv *)pptr;
 
 	/*
 	 * print_metatlv() has ensured that len (what remains in the
@@ -1360,7 +1355,7 @@ print_metatlv(netdissect_options *ndo,
 		 * length is large enough but not too large (it doesn't
 		 * go past the end of the containing TLV).
 		 */
-		print_metailv(ndo, (const u_char *) ilv, 0, indent + 1);
+		print_metailv(ndo, ilv, 0, indent + 1);
 		ilv = GO_NXT_ILV(ilv, rlen);
 	}
 
@@ -1430,11 +1425,11 @@ redirect_print(netdissect_options *ndo,
 		 * go past the end of the containing TLV).
 		 */
 		if (type == F_TLV_METD) {
-			print_metatlv(ndo, (const u_char *) TLV_DATA(tlv),
+			print_metatlv(ndo, TLV_DATA(tlv),
 				      tlvl, 0,
 				      indent);
 		} else if (type == F_TLV_REDD) {
-			print_reddata(ndo, (const u_char *) TLV_DATA(tlv),
+			print_reddata(ndo, TLV_DATA(tlv),
 				      tlvl, 0,
 				      indent);
 		} else {
@@ -1608,12 +1603,10 @@ forces_type_print(netdissect_options *ndo,
 			       tlvl,
 			       tlvl - TLV_HDRL);
 
-		rc = tops->print(ndo, (const u_char *) TLV_DATA(tltlv),
+		rc = tops->print(ndo, TLV_DATA(tltlv),
 				 tlvl,
 				 tops->op_msk, 9);
-		if (rc < 0) {
-			goto invalid;
-		}
+		ND_ICHECK_U(rc, <, 0);
 		tltlv = GO_NXT_TLV(tltlv, rlen);
 		ttlv--;
 		if (ttlv <= 0)
@@ -1694,9 +1687,7 @@ forces_print(netdissect_options *ndo,
 		     ForCES_RS1(fhdr), ForCES_RS2(fhdr));
 	}
 	rc = forces_type_print(ndo, pptr, fhdr, mlen, tops);
-	if (rc < 0) {
-		goto invalid;
-	}
+	ND_ICHECK_U(rc, <, 0);
 
 	if (ndo->ndo_vflag >= 4) {
 		ND_PRINT("\n\t  Raw ForCES message\n\t [");