X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bbedebc666a341d8e14922dce37a92766400c798..refs/heads/tcpdump-4.6:/print-pim.c

diff --git a/print-pim.c b/print-pim.c
index 3bb98219..567d3d99 100644
--- a/print-pim.c
+++ b/print-pim.c
@@ -32,6 +32,27 @@
 
 #include "ip.h"
 
+#define PIMV1_TYPE_QUERY           0
+#define PIMV1_TYPE_REGISTER        1
+#define PIMV1_TYPE_REGISTER_STOP   2
+#define PIMV1_TYPE_JOIN_PRUNE      3
+#define PIMV1_TYPE_RP_REACHABILITY 4
+#define PIMV1_TYPE_ASSERT          5
+#define PIMV1_TYPE_GRAFT           6
+#define PIMV1_TYPE_GRAFT_ACK       7
+
+static const struct tok pimv1_type_str[] = {
+	{ PIMV1_TYPE_QUERY,           "Query"         },
+	{ PIMV1_TYPE_REGISTER,        "Register"      },
+	{ PIMV1_TYPE_REGISTER_STOP,   "Register-Stop" },
+	{ PIMV1_TYPE_JOIN_PRUNE,      "Join/Prune"    },
+	{ PIMV1_TYPE_RP_REACHABILITY, "RP-reachable"  },
+	{ PIMV1_TYPE_ASSERT,          "Assert"        },
+	{ PIMV1_TYPE_GRAFT,           "Graft"         },
+	{ PIMV1_TYPE_GRAFT_ACK,       "Graft-ACK"     },
+	{ 0, NULL }
+};
+
 #define PIMV2_TYPE_HELLO         0
 #define PIMV2_TYPE_REGISTER      1
 #define PIMV2_TYPE_REGISTER_STOP 2
@@ -42,6 +63,8 @@
 #define PIMV2_TYPE_GRAFT_ACK     7
 #define PIMV2_TYPE_CANDIDATE_RP  8
 #define PIMV2_TYPE_PRUNE_REFRESH 9
+#define PIMV2_TYPE_DF_ELECTION   10
+#define PIMV2_TYPE_ECMP_REDIRECT 11
 
 static const struct tok pimv2_type_values[] = {
     { PIMV2_TYPE_HELLO,         "Hello" },
@@ -54,6 +77,8 @@ static const struct tok pimv2_type_values[] = {
     { PIMV2_TYPE_GRAFT_ACK,     "Graft Acknowledgement" },
     { PIMV2_TYPE_CANDIDATE_RP,  "Candidate RP Advertisement" },
     { PIMV2_TYPE_PRUNE_REFRESH, "Prune Refresh" },
+    { PIMV2_TYPE_DF_ELECTION,   "DF Election" },
+    { PIMV2_TYPE_ECMP_REDIRECT, "ECMP Redirect" },
     { 0, NULL}
 };
 
@@ -96,7 +121,7 @@ static const struct tok pimv2_register_flag_values[] = {
  */
 
 struct pim {
-	u_int8_t pim_typever;
+	uint8_t pim_typever;
 			/* upper 4bit: PIM version number; 2 for PIMv2 */
 			/* lower 4bit: the PIM message type, currently they are:
 			 * Hello, Register, Register-Stop, Join/Prune,
@@ -212,9 +237,9 @@ pimv1_print(netdissect_options *ndo,
 	ND_TCHECK(bp[1]);
 	type = bp[1];
 
+	ND_PRINT((ndo, " %s", tok2str(pimv1_type_str, "[type %u]", type)));
 	switch (type) {
-	case 0:
-		ND_PRINT((ndo, " Query"));
+	case PIMV1_TYPE_QUERY:
 		if (ND_TTEST(bp[8])) {
 			switch (bp[8] >> 4) {
 			case 0:
@@ -239,25 +264,17 @@ pimv1_print(netdissect_options *ndo,
 		}
 		break;
 
-	case 1:
-		ND_PRINT((ndo, " Register"));
+	case PIMV1_TYPE_REGISTER:
 		ND_TCHECK2(bp[8], 20);			/* ip header */
 		ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, &bp[20]),
 		    ipaddr_string(ndo, &bp[24])));
 		break;
-	case 2:
-		ND_PRINT((ndo, " Register-Stop"));
+	case PIMV1_TYPE_REGISTER_STOP:
 		ND_TCHECK2(bp[12], sizeof(struct in_addr));
 		ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, &bp[8]),
 		    ipaddr_string(ndo, &bp[12])));
 		break;
-	case 3:
-		ND_PRINT((ndo, " Join/Prune"));
-		if (ndo->ndo_vflag)
-			pimv1_join_prune_print(ndo, &bp[8], len - 8);
-		break;
-	case 4:
-		ND_PRINT((ndo, " RP-reachable"));
+	case PIMV1_TYPE_RP_REACHABILITY:
 		if (ndo->ndo_vflag) {
 			ND_TCHECK2(bp[22], 2);
 			ND_PRINT((ndo, " group %s", ipaddr_string(ndo, &bp[8])));
@@ -267,8 +284,7 @@ pimv1_print(netdissect_options *ndo,
 			relts_print(ndo, EXTRACT_16BITS(&bp[22]));
 		}
 		break;
-	case 5:
-		ND_PRINT((ndo, " Assert"));
+	case PIMV1_TYPE_ASSERT:
 		ND_TCHECK2(bp[16], sizeof(struct in_addr));
 		ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, &bp[16]),
 		    ipaddr_string(ndo, &bp[8])));
@@ -280,22 +296,12 @@ pimv1_print(netdissect_options *ndo,
 		EXTRACT_32BITS(&bp[20]) & 0x7fffffff,
 		EXTRACT_32BITS(&bp[24])));
 		break;
-	case 6:
-		ND_PRINT((ndo, " Graft"));
+	case PIMV1_TYPE_JOIN_PRUNE:
+	case PIMV1_TYPE_GRAFT:
+	case PIMV1_TYPE_GRAFT_ACK:
 		if (ndo->ndo_vflag)
 			pimv1_join_prune_print(ndo, &bp[8], len - 8);
 		break;
-	case 7:
-		ND_PRINT((ndo, " Graft-ACK"));
-		if (ndo->ndo_vflag)
-			pimv1_join_prune_print(ndo, &bp[8], len - 8);
-		break;
-	case 8:
-		ND_PRINT((ndo, " Mode"));
-		break;
-	default:
-		ND_PRINT((ndo, " [type %d]", type));
-		break;
 	}
 	if ((bp[4] >> 4) != 1)
 		ND_PRINT((ndo, " [v%d]", bp[4] >> 4));
@@ -642,7 +648,7 @@ pimv2_print(netdissect_options *ndo,
 	switch (PIM_TYPE(pim->pim_typever)) {
 	case PIMV2_TYPE_HELLO:
 	    {
-		u_int16_t otype, olen;
+		uint16_t otype, olen;
 		bp += 4;
 		while (bp < ep) {
 			ND_TCHECK2(bp[0], 4);
@@ -665,7 +671,7 @@ pimv2_print(netdissect_options *ndo,
 					ND_PRINT((ndo, "ERROR: Option Length != 4 Bytes (%u)", olen));
 				} else {
 					char t_bit;
-					u_int16_t lan_delay, override_interval;
+					uint16_t lan_delay, override_interval;
 					lan_delay = EXTRACT_16BITS(bp);
 					override_interval = EXTRACT_16BITS(bp+2);
 					t_bit = (lan_delay & 0x8000)? 1 : 0;
@@ -742,8 +748,7 @@ pimv2_print(netdissect_options *ndo,
 	{
 		struct ip *ip;
 
-		if (!ND_TTEST2(*(bp+4), PIMV2_REGISTER_FLAG_LEN))
-			goto trunc;
+		ND_TCHECK2(*(bp + 4), PIMV2_REGISTER_FLAG_LEN);
 
 		ND_PRINT((ndo, ", Flags [ %s ]\n\t",
 		          tok2str(pimv2_register_flag_values,
@@ -836,10 +841,10 @@ pimv2_print(netdissect_options *ndo,
          */
 
 	    {
-		u_int8_t ngroup;
-		u_int16_t holdtime;
-		u_int16_t njoin;
-		u_int16_t nprune;
+		uint8_t ngroup;
+		uint16_t holdtime;
+		uint16_t njoin;
+		uint16_t nprune;
 		int i, j;
 
 		bp += 4; len -= 4;
@@ -910,9 +915,9 @@ pimv2_print(netdissect_options *ndo,
 		bp += 4;
 
 		/* Fragment Tag, Hash Mask len, and BSR-priority */
-		if (bp + sizeof(u_int16_t) >= ep) break;
+		if (bp + sizeof(uint16_t) >= ep) break;
 		ND_PRINT((ndo, " tag=%x", EXTRACT_16BITS(bp)));
-		bp += sizeof(u_int16_t);
+		bp += sizeof(uint16_t);
 		if (bp >= ep) break;
 		ND_PRINT((ndo, " hashmlen=%d", bp[0]));
 		if (bp + 1 >= ep) break;