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-igrp.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-igrp.c')
| -rw-r--r-- | print-igrp.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/print-igrp.c b/print-igrp.c index a9eb28ef..fedc561f 100644 --- a/print-igrp.c +++ b/print-igrp.c @@ -82,17 +82,17 @@ igrp_entry_print(netdissect_options *ndo, const struct igrprte *igr, ND_PRINT(" %u.%u.%u.0", igr->igr_net[0], igr->igr_net[1], igr->igr_net[2]); - delay = EXTRACT_BE_U_3(igr->igr_dly); - bandwidth = EXTRACT_BE_U_3(igr->igr_bw); + delay = GET_BE_U_3(igr->igr_dly); + bandwidth = GET_BE_U_3(igr->igr_bw); metric = bandwidth + delay; if (metric > 0xffffff) metric = 0xffffff; - mtu = EXTRACT_BE_U_2(igr->igr_mtu); + mtu = GET_BE_U_2(igr->igr_mtu); ND_PRINT(" d=%u b=%u r=%u l=%u M=%u mtu=%u in %u hops", 10 * delay, bandwidth == 0 ? 0 : 10000000 / bandwidth, - EXTRACT_U_1(igr->igr_rel), EXTRACT_U_1(igr->igr_ld), metric, - mtu, EXTRACT_U_1(igr->igr_hct)); + GET_U_1(igr->igr_rel), GET_U_1(igr->igr_ld), metric, + mtu, GET_U_1(igr->igr_hct)); } static const struct tok op2str[] = { @@ -115,15 +115,15 @@ igrp_print(netdissect_options *ndo, const u_char *bp, u_int length) /* Header */ ND_TCHECK_SIZE(hdr); - nint = EXTRACT_BE_U_2(hdr->ig_ni); - nsys = EXTRACT_BE_U_2(hdr->ig_ns); - next = EXTRACT_BE_U_2(hdr->ig_nx); + nint = GET_BE_U_2(hdr->ig_ni); + nsys = GET_BE_U_2(hdr->ig_ns); + next = GET_BE_U_2(hdr->ig_nx); ND_PRINT(" %s V%u edit=%u AS=%u (%u/%u/%u)", - tok2str(op2str, "op-#%u", IGRP_OP(EXTRACT_U_1(hdr->ig_vop))), - IGRP_V(EXTRACT_U_1(hdr->ig_vop)), - EXTRACT_U_1(hdr->ig_ed), - EXTRACT_BE_U_2(hdr->ig_as), + tok2str(op2str, "op-#%u", IGRP_OP(GET_U_1(hdr->ig_vop))), + IGRP_V(GET_U_1(hdr->ig_vop)), + GET_U_1(hdr->ig_ed), + GET_BE_U_2(hdr->ig_as), nint, nsys, next); |