X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/aad6ac30ce7904f688226dbc61021ca4f907274f..ccf930c72c87592c2362b1efde5dc23a0d3078a8:/print-pim.c

diff --git a/print-pim.c b/print-pim.c
index 186f84b5..30dfaa83 100644
--- a/print-pim.c
+++ b/print-pim.c
@@ -21,9 +21,7 @@
 
 /* \summary: Protocol Independent Multicast (PIM) printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -137,7 +135,7 @@ static const struct tok pimv2_df_election_flag_values[] = {
 
 /*
  * XXX: We consider a case where IPv6 is not ready yet for portability,
- * but PIM dependent defintions should be independent of IPv6...
+ * but PIM dependent definitions should be independent of IPv6...
  */
 
 struct pim {
@@ -189,7 +187,6 @@ pimv1_join_prune_print(netdissect_options *ndo,
 
 	if (len < sizeof(nd_ipv4))
 		goto trunc;
-	ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
 	if (ndo->ndo_vflag > 1)
 		ND_PRINT("\n");
 	ND_PRINT(" Upstream Nbr: %s", GET_IPADDR_STRING(bp));
@@ -218,13 +215,11 @@ pimv1_join_prune_print(netdissect_options *ndo,
 		 */
 		if (len < 4)
 			goto trunc;
-		ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
 		ND_PRINT("\n\tGroup: %s", GET_IPADDR_STRING(bp));
 		bp += 4;
 		len -= 4;
 		if (len < 4)
 			goto trunc;
-		ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
 		if (GET_BE_U_4(bp) != 0xffffffff)
 			ND_PRINT("/%s", GET_IPADDR_STRING(bp));
 		bp += 4;
@@ -259,7 +254,6 @@ pimv1_join_prune_print(netdissect_options *ndo,
 	return;
 trunc:
 	nd_print_trunc(ndo);
-	return;
 }
 
 void
@@ -303,13 +297,11 @@ pimv1_print(netdissect_options *ndo,
 			  GET_IPADDR_STRING(bp + 24));
 		break;
 	case PIMV1_TYPE_REGISTER_STOP:
-		ND_TCHECK_LEN(bp + 12, sizeof(nd_ipv4));
 		ND_PRINT(" for %s > %s", GET_IPADDR_STRING(bp + 8),
 			  GET_IPADDR_STRING(bp + 12));
 		break;
 	case PIMV1_TYPE_RP_REACHABILITY:
 		if (ndo->ndo_vflag) {
-			ND_TCHECK_2(bp + 22);
 			ND_PRINT(" group %s", GET_IPADDR_STRING(bp + 8));
 			if (GET_BE_U_4(bp + 12) != 0xffffffff)
 				ND_PRINT("/%s", GET_IPADDR_STRING(bp + 12));
@@ -318,7 +310,6 @@ pimv1_print(netdissect_options *ndo,
 		}
 		break;
 	case PIMV1_TYPE_ASSERT:
-		ND_TCHECK_LEN(bp + 16, sizeof(nd_ipv4));
 		ND_PRINT(" for %s > %s", GET_IPADDR_STRING(bp + 16),
 			  GET_IPADDR_STRING(bp + 8));
 		if (GET_BE_U_4(bp + 12) != 0xffffffff)
@@ -344,7 +335,6 @@ pimv1_print(netdissect_options *ndo,
 
 trunc:
 	nd_print_trunc(ndo);
-	return;
 }
 
 /*
@@ -456,7 +446,6 @@ cisco_autorp_print(netdissect_options *ndo,
 
 trunc:
 	nd_print_trunc(ndo);
-	return;
 }
 
 void
@@ -467,9 +456,6 @@ pim_print(netdissect_options *ndo,
 	uint8_t pim_typever;
 
 	ndo->ndo_protocol = "pim";
-#ifdef notyet			/* currently we see only version and type */
-	ND_TCHECK_1(pim->pim_rsv);
-#endif
 
 	pim_typever = GET_U_1(pim->pim_typever);
 	switch (PIM_VER(pim_typever)) {
@@ -611,8 +597,7 @@ pimv2_addr_print(netdissect_options *ndo,
 		if (af == AF_INET) {
 			if (!silent)
 				ND_PRINT("%s", GET_IPADDR_STRING(bp));
-		}
-		else if (af == AF_INET6) {
+		} else if (af == AF_INET6) {
 			if (!silent)
 				ND_PRINT("%s", GET_IP6ADDR_STRING(bp));
 		}
@@ -628,8 +613,7 @@ pimv2_addr_print(netdissect_options *ndo,
 				if (GET_U_1(bp + 1) != 32)
 					ND_PRINT("/%u", GET_U_1(bp + 1));
 			}
-		}
-		else if (af == AF_INET6) {
+		} else if (af == AF_INET6) {
 			if (!silent) {
 				ND_PRINT("%s", GET_IP6ADDR_STRING(bp + 2));
 				if (GET_U_1(bp + 1) != 128)
@@ -1099,7 +1083,6 @@ pimv2_print(netdissect_options *ndo,
 
 				if (len < 2)
 					goto trunc;
-				ND_TCHECK_2(bp);
 				ND_PRINT(",holdtime=");
 				unsigned_relts_print(ndo,
 						     GET_BE_U_2(bp));