diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-12-09 12:32:00 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-12-09 14:05:25 +0100 |
| commit | 07ac438e08e5ffed3539e10d78f1cfc7d221d591 (patch) | |
| tree | 8e07185c1f646ef08c85bbb7d9a075b32e65272f /print-pim.c | |
| parent | 1cfd6cd2ac8acecbcf16e083a6cd272a19ec994e (diff) | |
| download | tcpdump-07ac438e08e5ffed3539e10d78f1cfc7d221d591.tar.gz | |
Use more the EXTRACT_U_1() macro (52/n)
Assignment, p[n]
Diffstat (limited to 'print-pim.c')
| -rw-r--r-- | print-pim.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/print-pim.c b/print-pim.c index b6048c77..26e3356b 100644 --- a/print-pim.c +++ b/print-pim.c @@ -192,7 +192,7 @@ pimv1_join_prune_print(netdissect_options *ndo, if (len < 4) goto trunc; ND_TCHECK_4(bp); - ngroups = bp[3]; + ngroups = EXTRACT_U_1(bp + 3); bp += 4; len -= 4; while (ngroups--) { @@ -254,7 +254,7 @@ pimv1_print(netdissect_options *ndo, register u_char type; ND_TCHECK_1(bp + 1); - type = bp[1]; + type = EXTRACT_U_1(bp + 1); ND_PRINT((ndo, " %s", tok2str(pimv1_type_str, "[type %u]", type))); switch (type) { @@ -353,7 +353,7 @@ cisco_autorp_print(netdissect_options *ndo, goto trunc; ND_TCHECK_1(bp); ND_PRINT((ndo, " auto-rp ")); - type = bp[0]; + type = EXTRACT_U_1(bp); switch (type) { case 0x11: ND_PRINT((ndo, "candidate-advert")); @@ -367,7 +367,7 @@ cisco_autorp_print(netdissect_options *ndo, } ND_TCHECK_1(bp + 1); - numrps = bp[1]; + numrps = EXTRACT_U_1(bp + 1); ND_TCHECK_2(bp + 2); ND_PRINT((ndo, " Hold ")); @@ -424,7 +424,7 @@ cisco_autorp_print(netdissect_options *ndo, if (len < 1) goto trunc; ND_TCHECK_1(bp); - nentries = bp[0]; + nentries = EXTRACT_U_1(bp); bp += 1; len -= 1; s = ' '; @@ -977,7 +977,7 @@ pimv2_print(netdissect_options *ndo, if (len < 4) goto trunc; ND_TCHECK_4(bp); - ngroup = bp[1]; + ngroup = EXTRACT_U_1(bp + 1); holdtime = EXTRACT_BE_U_2(bp + 2); ND_PRINT((ndo, "\n\t %u group(s)", ngroup)); if (PIM_TYPE(pim->pim_typever) != 7) { /*not for Graft-ACK*/ @@ -1124,7 +1124,7 @@ pimv2_print(netdissect_options *ndo, goto trunc; ND_TCHECK_1(bp); ND_PRINT((ndo, " prefix-cnt=%d", EXTRACT_U_1(bp))); - pfxcnt = bp[0]; + pfxcnt = EXTRACT_U_1(bp); if (len < 2) goto trunc; ND_TCHECK_1(bp + 1); |