diff options
author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-06-16 17:23:21 +0200 |
---|---|---|
committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2019-03-26 21:06:24 +0100 |
commit | ee68aa36460d7efeca48747f33b7f2adc0900bfb (patch) | |
tree | 72c1b65d29301835c0e064b433ea685fc856a68e /print-dtp.c | |
parent | 1af20c3adc4dfef93de41d4fcd02f0aeb6bbfd4e (diff) | |
download | tcpdump-ee68aa36460d7efeca48747f33b7f2adc0900bfb.tar.gz |
Use the new GET_ macros instead of the EXTRACT_ ones
The exceptions are currently:
Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer.
An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer
pointer.
Diffstat (limited to 'print-dtp.c')
-rw-r--r-- | print-dtp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/print-dtp.c b/print-dtp.c index 004f7d31..1ea36fce 100644 --- a/print-dtp.c +++ b/print-dtp.c @@ -57,7 +57,7 @@ dtp_print(netdissect_options *ndo, const u_char *pptr, u_int length) ND_TCHECK_LEN(tptr, DTP_HEADER_LEN); ND_PRINT("DTPv%u, length %u", - EXTRACT_U_1(tptr), + GET_U_1(tptr), length); /* @@ -72,8 +72,8 @@ dtp_print(netdissect_options *ndo, const u_char *pptr, u_int length) while (tptr < (pptr+length)) { ND_TCHECK_4(tptr); - type = EXTRACT_BE_U_2(tptr); - len = EXTRACT_BE_U_2(tptr + 2); + type = GET_BE_U_2(tptr); + len = GET_BE_U_2(tptr + 2); /* XXX: should not be but sometimes it is, see the test captures */ if (type == 0) return; @@ -96,7 +96,7 @@ dtp_print(netdissect_options *ndo, const u_char *pptr, u_int length) case DTP_DTP_TYPE_TLV: if (len < 5) goto invalid; - ND_PRINT(", 0x%x", EXTRACT_U_1(tptr + 4)); + ND_PRINT(", 0x%x", GET_U_1(tptr + 4)); break; case DTP_NEIGHBOR_TLV: |