The Tcpdump Group git mirrors - tcpdump/blobdiff

diff --git a/print-pim.c b/print-pim.c

index 4eacd04df35eed60c0e204a0e7ca1b0c1d18977f..f2db8c7681655ba2b3a712e1a3e0129f0ba524c6 100644 (file)

--- a/print-pim.c

+++ b/print-pim.c

@@ -137,7 +137,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 +189,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));

@@ -197,7 +196,6 @@ pimv1_join_prune_print(netdissect_options *ndo,

len -= 4;

if (len < 4)

goto trunc;

- ND_TCHECK_2(bp + 2);

if (ndo->ndo_vflag > 1)

ND_PRINT("\n");

ND_PRINT(" Hold time: ");

@@ -209,7 +207,6 @@ pimv1_join_prune_print(netdissect_options *ndo,

if (len < 4)

goto trunc;

- ND_TCHECK_4(bp);

ngroups = GET_U_1(bp + 3);

bp += 4;

len -= 4;

@@ -220,20 +217,17 @@ 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;

len -= 4;

if (len < 4)

goto trunc;

- ND_TCHECK_4(bp);

njoin = GET_BE_U_2(bp);

nprune = GET_BE_U_2(bp + 2);

ND_PRINT(" joined: %u pruned: %u", njoin, nprune);

@@ -248,7 +242,6 @@ pimv1_join_prune_print(netdissect_options *ndo,

type = "Prune";

if (len < 6)

goto trunc;

- ND_TCHECK_6(bp);

ND_PRINT("\n\t%s %s%s%s%s/%u", type,

(GET_U_1(bp) & 0x01) ? "Sparse " : "Dense ",

(GET_U_1(bp + 1) & 0x80) ? "WC " : "",

@@ -263,7 +256,6 @@ pimv1_join_prune_print(netdissect_options *ndo,

return;

trunc:

nd_print_trunc(ndo);

- return;

}

void

@@ -307,13 +299,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));

@@ -322,7 +312,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)

@@ -348,7 +337,6 @@ pimv1_print(netdissect_options *ndo,

trunc:

nd_print_trunc(ndo);

- return;

}

/*

@@ -414,7 +402,6 @@ cisco_autorp_print(netdissect_options *ndo,

if (len < 4)

goto trunc;

- ND_TCHECK_4(bp);

ND_PRINT(" RP %s", GET_IPADDR_STRING(bp));

bp += 4;

len -= 4;

@@ -443,7 +430,6 @@ cisco_autorp_print(netdissect_options *ndo,

while (nentries != 0) {

if (len < 6)

goto trunc;

- ND_TCHECK_6(bp);

ND_PRINT("%c%s%s/%u", s, GET_U_1(bp) & 1 ? "!" : "",

GET_IPADDR_STRING(bp + 2), GET_U_1(bp + 1));

if (GET_U_1(bp) & 0x02) {

@@ -462,7 +448,6 @@ cisco_autorp_print(netdissect_options *ndo,

trunc:

nd_print_trunc(ndo);

- return;

}

void

@@ -473,9 +458,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)) {

@@ -577,7 +559,6 @@ pimv2_addr_print(netdissect_options *ndo,

if (addr_len == 0) {

if (len < 2)

goto trunc;

- ND_TCHECK_1(bp + 1);

switch (GET_U_1(bp)) {

case 1:

af = AF_INET;

@@ -719,7 +700,6 @@ pimv2_print(netdissect_options *ndo,

nd_print_invalid(ndo);

return;

}

- ND_TCHECK_1(pim->pim_rsv);

pim_typever = GET_U_1(pim->pim_typever);

/* RFC5015 allocates the high 4 bits of pim_rsv for "subtype". */

pimv2_addr_len = GET_U_1(pim->pim_rsv) & 0x0f;

@@ -781,7 +761,6 @@ pimv2_print(netdissect_options *ndo,

while (len > 0) {

if (len < 4)

goto trunc;

- ND_TCHECK_4(bp);

otype = GET_BE_U_2(bp);

olen = GET_BE_U_2(bp + 2);

ND_PRINT("\n\t %s Option (%u), length %u, Value: ",

@@ -919,10 +898,8 @@ pimv2_print(netdissect_options *ndo,

if (len == 0)

goto trunc;

ip = (const struct ip *)bp;

- ND_TCHECK_1(ip->ip_vhl);

switch (IP_V(ip)) {

case 0: /* Null header */

- ND_TCHECK_4(ip->ip_dst);

ND_PRINT("IP-Null-header %s > %s",

GET_IPADDR_STRING(ip->ip_src),

GET_IPADDR_STRING(ip->ip_dst));

@@ -1110,7 +1087,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));