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-ipnet.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-ipnet.c')
| -rw-r--r-- | print-ipnet.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/print-ipnet.c b/print-ipnet.c index 6a521ecc..7c6a301b 100644 --- a/print-ipnet.c +++ b/print-ipnet.c @@ -39,19 +39,19 @@ ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length) hdr = (const ipnet_hdr_t *)bp; ND_TCHECK_SIZE(hdr); - ND_PRINT("%u > %u", EXTRACT_BE_U_4(hdr->iph_zsrc), - EXTRACT_BE_U_4(hdr->iph_zdst)); + ND_PRINT("%u > %u", GET_BE_U_4(hdr->iph_zsrc), + GET_BE_U_4(hdr->iph_zdst)); if (!ndo->ndo_qflag) { ND_PRINT(", family %s (%u)", tok2str(ipnet_values, "Unknown", - EXTRACT_U_1(hdr->iph_family)), - EXTRACT_U_1(hdr->iph_family)); + GET_U_1(hdr->iph_family)), + GET_U_1(hdr->iph_family)); } else { ND_PRINT(", %s", tok2str(ipnet_values, "Unknown Ethertype (0x%04x)", - EXTRACT_U_1(hdr->iph_family))); + GET_U_1(hdr->iph_family))); } ND_PRINT(", length %u: ", length); @@ -78,7 +78,7 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen p += sizeof(ipnet_hdr_t); ND_TCHECK_1(hdr->iph_family); - switch (EXTRACT_U_1(hdr->iph_family)) { + switch (GET_U_1(hdr->iph_family)) { case IPH_AF_INET: ip_print(ndo, p, length); |