diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-11-22 21:58:44 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-11-22 21:58:44 +0100 |
| commit | 3c8f3e13b03380742c24070f8a7b56fe12c6b8ee (patch) | |
| tree | a351bb5aa207949c220e71b8f26629703e0a0298 /print-mobility.c | |
| parent | e534e38f78ca28e849fd91eba2a962347b049faf (diff) | |
| download | tcpdump-3c8f3e13b03380742c24070f8a7b56fe12c6b8ee.tar.gz | |
Rename ND_TCHECK_/ND_TTEST_ macros
Now all the macros have a name meaning a count in bytes.
e.g.:
ND_TCHECK_32BITS -> ND_TCHECK_4
ND_TTEST_32BITS -> ND_TTEST_4
Diffstat (limited to 'print-mobility.c')
| -rw-r--r-- | print-mobility.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/print-mobility.c b/print-mobility.c index 9d2ebccb..85a62195 100644 --- a/print-mobility.c +++ b/print-mobility.c @@ -150,7 +150,7 @@ mobility_opt_print(netdissect_options *ndo, goto trunc; } /* units of 4 secs */ - ND_TCHECK_16BITS(&bp[i+2]); + ND_TCHECK_2(&bp[i + 2]); ND_PRINT((ndo, "(refresh: %u)", EXTRACT_BE_16BITS(bp + i + 2) << 2)); break; @@ -159,7 +159,7 @@ mobility_opt_print(netdissect_options *ndo, ND_PRINT((ndo, "(altcoa: trunc)")); goto trunc; } - ND_TCHECK_128BITS(&bp[i+2]); + ND_TCHECK_16(&bp[i + 2]); ND_PRINT((ndo, "(alt-CoA: %s)", ip6addr_string(ndo, &bp[i+2]))); break; case IP6MOPT_NONCEID: @@ -167,8 +167,8 @@ mobility_opt_print(netdissect_options *ndo, ND_PRINT((ndo, "(ni: trunc)")); goto trunc; } - ND_TCHECK_16BITS(&bp[i+2]); - ND_TCHECK_16BITS(&bp[i+4]); + ND_TCHECK_2(&bp[i + 2]); + ND_TCHECK_2(&bp[i + 4]); ND_PRINT((ndo, "(ni: ho=0x%04x co=0x%04x)", EXTRACT_BE_16BITS(bp + i + 2), EXTRACT_BE_16BITS(bp + i + 4))); @@ -247,7 +247,7 @@ mobility_print(netdissect_options *ndo, case IP6M_CAREOF_TEST_INIT: hlen = IP6M_MINLEN; if (ndo->ndo_vflag) { - ND_TCHECK_32BITS(&bp[hlen + 4]); + ND_TCHECK_4(&bp[hlen + 4]); ND_PRINT((ndo, " %s Init Cookie=%08x:%08x", type == IP6M_HOME_TEST_INIT ? "Home" : "Care-of", EXTRACT_BE_32BITS(bp + hlen), @@ -261,7 +261,7 @@ mobility_print(netdissect_options *ndo, ND_PRINT((ndo, " nonce id=0x%x", EXTRACT_BE_16BITS(&mh->ip6m_data16[0]))); hlen = IP6M_MINLEN; if (ndo->ndo_vflag) { - ND_TCHECK_32BITS(&bp[hlen + 4]); + ND_TCHECK_4(&bp[hlen + 4]); ND_PRINT((ndo, " %s Init Cookie=%08x:%08x", type == IP6M_HOME_TEST ? "Home" : "Care-of", EXTRACT_BE_32BITS(bp + hlen), @@ -269,7 +269,7 @@ mobility_print(netdissect_options *ndo, } hlen += 8; if (ndo->ndo_vflag) { - ND_TCHECK_32BITS(&bp[hlen + 4]); + ND_TCHECK_4(&bp[hlen + 4]); ND_PRINT((ndo, " %s Keygen Token=%08x:%08x", type == IP6M_HOME_TEST ? "Home" : "Care-of", EXTRACT_BE_32BITS(bp + hlen), @@ -281,7 +281,7 @@ mobility_print(netdissect_options *ndo, ND_TCHECK(mh->ip6m_data16[0]); ND_PRINT((ndo, " seq#=%u", EXTRACT_BE_16BITS(&mh->ip6m_data16[0]))); hlen = IP6M_MINLEN; - ND_TCHECK_16BITS(&bp[hlen]); + ND_TCHECK_2(&bp[hlen]); if (bp[hlen] & 0xf0) { ND_PRINT((ndo, " ")); if (bp[hlen] & 0x80) @@ -297,7 +297,7 @@ mobility_print(netdissect_options *ndo, hlen += 1; /* Reserved (8bits) */ hlen += 1; - ND_TCHECK_16BITS(&bp[hlen]); + ND_TCHECK_2(&bp[hlen]); /* units of 4 secs */ ND_PRINT((ndo, " lifetime=%u", EXTRACT_BE_16BITS(bp + hlen) << 2)); hlen += 2; @@ -310,10 +310,10 @@ mobility_print(netdissect_options *ndo, ND_PRINT((ndo, " K")); /* Reserved (7bits) */ hlen = IP6M_MINLEN; - ND_TCHECK_16BITS(&bp[hlen]); + ND_TCHECK_2(&bp[hlen]); ND_PRINT((ndo, " seq#=%u", EXTRACT_BE_16BITS(bp + hlen))); hlen += 2; - ND_TCHECK_16BITS(&bp[hlen]); + ND_TCHECK_2(&bp[hlen]); /* units of 4 secs */ ND_PRINT((ndo, " lifetime=%u", EXTRACT_BE_16BITS(bp + hlen) << 2)); hlen += 2; |