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-lane.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-lane.c')
-rw-r--r-- | print-lane.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/print-lane.c b/print-lane.c index e4f8a08b..a6f83b1a 100644 --- a/print-lane.c +++ b/print-lane.c @@ -68,7 +68,7 @@ static const struct tok lecop2str[] = { static void lane_hdr_print(netdissect_options *ndo, const u_char *bp) { - ND_PRINT("lecid:%x ", EXTRACT_BE_U_2(bp)); + ND_PRINT("lecid:%x ", GET_BE_U_2(bp)); } /* @@ -91,14 +91,14 @@ lane_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen) } lec = (const struct lane_controlhdr *)p; - if (EXTRACT_BE_U_2(lec->lec_header) == 0xff00) { + if (GET_BE_U_2(lec->lec_header) == 0xff00) { /* * LE Control. */ ND_PRINT("lec: proto %x vers %x %s", - EXTRACT_U_1(lec->lec_proto), - EXTRACT_U_1(lec->lec_vers), - tok2str(lecop2str, "opcode-#%u", EXTRACT_BE_U_2(lec->lec_opcode))); + GET_U_1(lec->lec_proto), + GET_U_1(lec->lec_vers), + tok2str(lecop2str, "opcode-#%u", GET_BE_U_2(lec->lec_opcode))); return; } |