diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-11-22 23:54:09 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-11-22 23:54:09 +0100 |
| commit | da20bc56d6100b5275d6f85c4a25bac1dab4e57e (patch) | |
| tree | 643c746e737c54d5a13d0b0083049d847d2cff24 /print-pktap.c | |
| parent | 3c8f3e13b03380742c24070f8a7b56fe12c6b8ee (diff) | |
| download | tcpdump-da20bc56d6100b5275d6f85c4a25bac1dab4e57e.tar.gz | |
Rename EXTRACT_ macros
Now all the macros have a name meaning a count in bytes.
With _S_: signed, _U_: unsigned
e.g.:
EXTRACT_BE_32BITS -> EXTRACT_BE_U_4
EXTRACT_LE_32BITS -> EXTRACT_LE_U_4
...
EXTRACT_BE_INT32 -> EXTRACT_BE_S_4
and have:
EXTRACT_8BITS -> EXTRACT_U_1
EXTRACT_INT8 -> EXTRACT_S_1
Diffstat (limited to 'print-pktap.c')
| -rw-r--r-- | print-pktap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/print-pktap.c b/print-pktap.c index 4a295fdf..1d5c7647 100644 --- a/print-pktap.c +++ b/print-pktap.c @@ -76,8 +76,8 @@ pktap_header_print(netdissect_options *ndo, const u_char *bp, u_int length) hdr = (const pktap_header_t *)bp; - dlt = EXTRACT_LE_32BITS(&hdr->pkt_dlt); - hdrlen = EXTRACT_LE_32BITS(&hdr->pkt_len); + dlt = EXTRACT_LE_U_4(&hdr->pkt_dlt); + hdrlen = EXTRACT_LE_U_4(&hdr->pkt_len); dltname = pcap_datalink_val_to_name(dlt); if (!ndo->ndo_qflag) { ND_PRINT((ndo,"DLT %s (%d) len %d", @@ -111,8 +111,8 @@ pktap_if_print(netdissect_options *ndo, return (0); } hdr = (const pktap_header_t *)p; - dlt = EXTRACT_LE_32BITS(&hdr->pkt_dlt); - hdrlen = EXTRACT_LE_32BITS(&hdr->pkt_len); + dlt = EXTRACT_LE_U_4(&hdr->pkt_dlt); + hdrlen = EXTRACT_LE_U_4(&hdr->pkt_len); if (hdrlen < sizeof(pktap_header_t)) { /* * Claimed header length < structure length. @@ -136,7 +136,7 @@ pktap_if_print(netdissect_options *ndo, caplen -= hdrlen; p += hdrlen; - rectype = EXTRACT_LE_32BITS(&hdr->pkt_rectype); + rectype = EXTRACT_LE_U_4(&hdr->pkt_rectype); switch (rectype) { case PKT_REC_NONE: |