diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-11-18 11:52:52 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-11-18 13:56:40 +0100 |
| commit | 577621026df8d4a33a34d4e125f9ec964fc0e53c (patch) | |
| tree | a25ed4b22461cbb115c9e112935c28bcd57406bc /print-sll.c | |
| parent | 0e854b0937199956478686ae610ff9f794aafc6b (diff) | |
| download | tcpdump-577621026df8d4a33a34d4e125f9ec964fc0e53c.tar.gz | |
Rename EXTRACT_nBITS() macros to EXTRACT_BE_nBITS()
It indicates clearly that these macros are used to extract big-endian
integral values.
Diffstat (limited to 'print-sll.c')
| -rw-r--r-- | print-sll.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/print-sll.c b/print-sll.c index 6148569e..712c2279 100644 --- a/print-sll.c +++ b/print-sll.c @@ -136,18 +136,18 @@ sll_print(netdissect_options *ndo, register const struct sll_header *sllp, u_int { u_short ether_type; - ND_PRINT((ndo, "%3s ",tok2str(sll_pkttype_values,"?",EXTRACT_16BITS(&sllp->sll_pkttype)))); + ND_PRINT((ndo, "%3s ",tok2str(sll_pkttype_values,"?",EXTRACT_BE_16BITS(&sllp->sll_pkttype)))); /* * XXX - check the link-layer address type value? * For now, we just assume 6 means Ethernet. * XXX - print others as strings of hex? */ - if (EXTRACT_16BITS(&sllp->sll_halen) == 6) + if (EXTRACT_BE_16BITS(&sllp->sll_halen) == 6) ND_PRINT((ndo, "%s ", etheraddr_string(ndo, sllp->sll_addr))); if (!ndo->ndo_qflag) { - ether_type = EXTRACT_16BITS(&sllp->sll_protocol); + ether_type = EXTRACT_BE_16BITS(&sllp->sll_protocol); if (ether_type <= ETHERMTU) { /* @@ -225,7 +225,7 @@ sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char p += SLL_HDR_LEN; hdrlen = SLL_HDR_LEN; - ether_type = EXTRACT_16BITS(&sllp->sll_protocol); + ether_type = EXTRACT_BE_16BITS(&sllp->sll_protocol); recurse: /* @@ -279,12 +279,12 @@ recurse: return (hdrlen + length); } if (ndo->ndo_eflag) { - uint16_t tag = EXTRACT_16BITS(p); + uint16_t tag = EXTRACT_BE_16BITS(p); ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag))); } - ether_type = EXTRACT_16BITS(p + 2); + ether_type = EXTRACT_BE_16BITS(p + 2); if (ether_type <= ETHERMTU) ether_type = LINUX_SLL_P_802_2; if (!ndo->ndo_qflag) { |