The Tcpdump Group git mirrors - tcpdump/blobdiff

index b18933d464f47bdeafc6dbbf9b43b08fe6e222ca..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;

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));

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;

len -= 4;

if (len < 4)

goto trunc;

- ND_TCHECK_2(bp + 2);

if (ndo->ndo_vflag > 1)

ND_PRINT("\n");

ND_PRINT(" Hold time: ");

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;

if (len < 4)

goto trunc;

- ND_TCHECK_4(bp);

ngroups = GET_U_1(bp + 3);

bp += 4;

len -= 4;

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;

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_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;

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);

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;

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 " : "",

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;

trunc:

nd_print_trunc(ndo);

- return;

}

void

}

void

@@ -273,7 +265,6 @@ pimv1_print(netdissect_options *ndo,

u_char type;

ndo->ndo_protocol = "pimv1";

u_char type;

ndo->ndo_protocol = "pimv1";

- ND_TCHECK_1(bp + 1);

type = GET_U_1(bp + 1);

ND_PRINT(" %s", tok2str(pimv1_type_str, "[type %u]", type));

type = GET_U_1(bp + 1);

ND_PRINT(" %s", tok2str(pimv1_type_str, "[type %u]", type));

@@ -296,7 +287,6 @@ pimv1_print(netdissect_options *ndo,

}

if (ndo->ndo_vflag) {

}

if (ndo->ndo_vflag) {

- ND_TCHECK_2(bp + 10);

ND_PRINT(" (Hold-time ");

unsigned_relts_print(ndo, GET_BE_U_2(bp + 10));

ND_PRINT(")");

ND_PRINT(" (Hold-time ");

unsigned_relts_print(ndo, GET_BE_U_2(bp + 10));

ND_PRINT(")");

@@ -309,13 +299,11 @@ pimv1_print(netdissect_options *ndo,

GET_IPADDR_STRING(bp + 24));

break;

case PIMV1_TYPE_REGISTER_STOP:

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_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));

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));

@@ -324,12 +312,10 @@ pimv1_print(netdissect_options *ndo,

}

break;

case PIMV1_TYPE_ASSERT:

}

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)

ND_PRINT("/%s", GET_IPADDR_STRING(bp + 12));

ND_PRINT(" for %s > %s", GET_IPADDR_STRING(bp + 16),

GET_IPADDR_STRING(bp + 8));

if (GET_BE_U_4(bp + 12) != 0xffffffff)

ND_PRINT("/%s", GET_IPADDR_STRING(bp + 12));

- ND_TCHECK_4(bp + 24);

ND_PRINT(" %s pref %u metric %u",

(GET_U_1(bp + 20) & 0x80) ? "RP-tree" : "SPT",

GET_BE_U_4(bp + 20) & 0x7fffffff,

ND_PRINT(" %s pref %u metric %u",

(GET_U_1(bp + 20) & 0x80) ? "RP-tree" : "SPT",

GET_BE_U_4(bp + 20) & 0x7fffffff,

@@ -345,14 +331,12 @@ pimv1_print(netdissect_options *ndo,

}

break;

}

break;

}

- ND_TCHECK_1(bp + 4);

if ((GET_U_1(bp + 4) >> 4) != 1)

ND_PRINT(" [v%u]", GET_U_1(bp + 4) >> 4);

return;

trunc:

nd_print_trunc(ndo);

if ((GET_U_1(bp + 4) >> 4) != 1)

ND_PRINT(" [v%u]", GET_U_1(bp + 4) >> 4);

return;

trunc:

nd_print_trunc(ndo);

- return;

}

@@ -372,7 +356,6 @@ cisco_autorp_print(netdissect_options *ndo,

ndo->ndo_protocol = "cisco_autorp";

if (len < 8)

goto trunc;

ndo->ndo_protocol = "cisco_autorp";

if (len < 8)

goto trunc;

- ND_TCHECK_1(bp);

ND_PRINT(" auto-rp ");

type = GET_U_1(bp);

switch (type) {

ND_PRINT(" auto-rp ");

type = GET_U_1(bp);

switch (type) {

@@ -387,10 +370,8 @@ cisco_autorp_print(netdissect_options *ndo,

break;

}

break;

}

- ND_TCHECK_1(bp + 1);

numrps = GET_U_1(bp + 1);

- ND_TCHECK_2(bp + 2);

ND_PRINT(" Hold ");

hold = GET_BE_U_2(bp + 2);

if (hold)

ND_PRINT(" Hold ");

hold = GET_BE_U_2(bp + 2);

if (hold)

@@ -421,13 +402,11 @@ cisco_autorp_print(netdissect_options *ndo,

if (len < 4)

goto trunc;

if (len < 4)

goto trunc;

- ND_TCHECK_4(bp);

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

bp += 4;

len -= 4;

if (len < 1)

goto trunc;

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

bp += 4;

len -= 4;

if (len < 1)

goto trunc;

- ND_TCHECK_1(bp);

switch (GET_U_1(bp) & 0x3) {

case 0: ND_PRINT(" PIMv?");

break;

switch (GET_U_1(bp) & 0x3) {

case 0: ND_PRINT(" PIMv?");

break;

@@ -444,7 +423,6 @@ cisco_autorp_print(netdissect_options *ndo,

len -= 1;

if (len < 1)

goto trunc;

len -= 1;

if (len < 1)

goto trunc;

- ND_TCHECK_1(bp);

nentries = GET_U_1(bp);

bp += 1;

len -= 1;

nentries = GET_U_1(bp);

bp += 1;

len -= 1;

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

while (nentries != 0) {

if (len < 6)

goto trunc;

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) {

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) {

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

trunc:

nd_print_trunc(ndo);

trunc:

nd_print_trunc(ndo);

- return;

}

void

}

void

@@ -482,11 +458,7 @@ pim_print(netdissect_options *ndo,

uint8_t pim_typever;

ndo->ndo_protocol = "pim";

uint8_t pim_typever;

ndo->ndo_protocol = "pim";

-#ifdef notyet /* currently we see only version and type */

- ND_TCHECK_1(pim->pim_rsv);

-#endif

- ND_TCHECK_1(pim->pim_typever);

pim_typever = GET_U_1(pim->pim_typever);

switch (PIM_VER(pim_typever)) {

case 2:

pim_typever = GET_U_1(pim->pim_typever);

switch (PIM_VER(pim_typever)) {

case 2:

@@ -510,11 +482,6 @@ pim_print(netdissect_options *ndo,

len);

break;

}

len);

break;

}

- return;

-trunc:

- nd_print_trunc(ndo);

- return;

}

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

if (addr_len == 0) {

if (len < 2)

goto trunc;

if (addr_len == 0) {

if (len < 2)

goto trunc;

- ND_TCHECK_1(bp + 1);

switch (GET_U_1(bp)) {

case 1:

af = AF_INET;

switch (GET_U_1(bp)) {

case 1:

af = AF_INET;

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

nd_print_invalid(ndo);

return;

}

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;

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;

@@ -746,7 +711,6 @@ pimv2_print(netdissect_options *ndo,

nd_print_invalid(ndo);

return;

}

nd_print_invalid(ndo);

return;

}

- ND_TCHECK_2(pim->pim_cksum);

ND_PRINT(", cksum 0x%04x ", GET_BE_U_2(pim->pim_cksum));

if (GET_BE_U_2(pim->pim_cksum) == 0) {

ND_PRINT("(unverified)");

ND_PRINT(", cksum 0x%04x ", GET_BE_U_2(pim->pim_cksum));

if (GET_BE_U_2(pim->pim_cksum) == 0) {

ND_PRINT("(unverified)");

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

while (len > 0) {

if (len < 4)

goto trunc;

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: ",

otype = GET_BE_U_2(bp);

olen = GET_BE_U_2(bp + 2);

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

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

if (len == 0)

goto trunc;

ip = (const struct ip *)bp;

if (len == 0)

goto trunc;

ip = (const struct ip *)bp;

- ND_TCHECK_1(ip->ip_vhl);

switch (IP_V(ip)) {

case 0: /* Null header */

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));

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

GET_IPADDR_STRING(ip->ip_src),

GET_IPADDR_STRING(ip->ip_dst));

@@ -1072,13 +1033,11 @@ pimv2_print(netdissect_options *ndo,

/* Fragment Tag, Hash Mask len, and BSR-priority */

if (len < 2)

goto trunc;

/* Fragment Tag, Hash Mask len, and BSR-priority */

if (len < 2)

goto trunc;

- ND_TCHECK_2(bp);

ND_PRINT(" tag=%x", GET_BE_U_2(bp));

bp += 2;

len -= 2;

if (len < 1)

goto trunc;

ND_PRINT(" tag=%x", GET_BE_U_2(bp));

bp += 2;

len -= 2;

if (len < 1)

goto trunc;

- ND_TCHECK_1(bp);

ND_PRINT(" hashmlen=%u", GET_U_1(bp));

if (len < 2)

goto trunc;

ND_PRINT(" hashmlen=%u", GET_U_1(bp));

if (len < 2)

goto trunc;

@@ -1105,11 +1064,9 @@ pimv2_print(netdissect_options *ndo,

/* RP-Count, Frag RP-Cnt, and rsvd */

if (len < 1)

goto trunc;

/* RP-Count, Frag RP-Cnt, and rsvd */

if (len < 1)

goto trunc;

- ND_TCHECK_1(bp);

ND_PRINT(" RPcnt=%u", GET_U_1(bp));

if (len < 2)

goto trunc;

ND_PRINT(" RPcnt=%u", GET_U_1(bp));

if (len < 2)

goto trunc;

- ND_TCHECK_1(bp + 1);

frpcnt = GET_U_1(bp + 1);

ND_PRINT(" FRPcnt=%u", frpcnt);

if (len < 4)

frpcnt = GET_U_1(bp + 1);

ND_PRINT(" FRPcnt=%u", frpcnt);

if (len < 4)

@@ -1130,13 +1087,11 @@ pimv2_print(netdissect_options *ndo,

if (len < 2)

goto trunc;

if (len < 2)

goto trunc;

- ND_TCHECK_2(bp);

ND_PRINT(",holdtime=");

unsigned_relts_print(ndo,

GET_BE_U_2(bp));

if (len < 3)

goto trunc;

ND_PRINT(",holdtime=");

unsigned_relts_print(ndo,

GET_BE_U_2(bp));

if (len < 3)

goto trunc;

- ND_TCHECK_1(bp + 2);

ND_PRINT(",prio=%u", GET_U_1(bp + 2));

if (len < 4)

goto trunc;

ND_PRINT(",prio=%u", GET_U_1(bp + 2));

if (len < 4)

goto trunc;

@@ -1172,16 +1127,13 @@ pimv2_print(netdissect_options *ndo,

/* Prefix-Cnt, Priority, and Holdtime */

if (len < 1)

goto trunc;

/* Prefix-Cnt, Priority, and Holdtime */

if (len < 1)

goto trunc;

- ND_TCHECK_1(bp);

ND_PRINT(" prefix-cnt=%u", GET_U_1(bp));

pfxcnt = GET_U_1(bp);

if (len < 2)

goto trunc;

ND_PRINT(" prefix-cnt=%u", GET_U_1(bp));

pfxcnt = GET_U_1(bp);

if (len < 2)

goto trunc;

- ND_TCHECK_1(bp + 1);

ND_PRINT(" prio=%u", GET_U_1(bp + 1));

if (len < 4)

goto trunc;

ND_PRINT(" prio=%u", GET_U_1(bp + 1));

if (len < 4)

goto trunc;

- ND_TCHECK_2(bp + 2);

ND_PRINT(" holdtime=");

unsigned_relts_print(ndo, GET_BE_U_2(bp + 2));

bp += 4;

ND_PRINT(" holdtime=");

unsigned_relts_print(ndo, GET_BE_U_2(bp + 2));

bp += 4;

@@ -1223,7 +1175,6 @@ pimv2_print(netdissect_options *ndo,

len -= advance;

if (len < 2)

goto trunc;

len -= advance;

if (len < 2)

goto trunc;

- ND_TCHECK_2(bp);

ND_PRINT(" TUNR ");

unsigned_relts_print(ndo, GET_BE_U_2(bp));

break;

ND_PRINT(" TUNR ");

unsigned_relts_print(ndo, GET_BE_U_2(bp));

break;