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-ppi.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-ppi.c')
| -rw-r--r-- | print-ppi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/print-ppi.c b/print-ppi.c index 72cd1b86..9cd5fc1e 100644 --- a/print-ppi.c +++ b/print-ppi.c @@ -34,8 +34,8 @@ ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length) hdr = (const ppi_header_t *)bp; - len = EXTRACT_LE_16BITS(&hdr->ppi_len); - dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt); + len = EXTRACT_LE_U_2(&hdr->ppi_len); + dlt = EXTRACT_LE_U_4(&hdr->ppi_dlt); dltname = pcap_datalink_val_to_name(dlt); if (!ndo->ndo_qflag) { @@ -68,7 +68,7 @@ ppi_print(netdissect_options *ndo, } hdr = (const ppi_header_t *)p; - len = EXTRACT_LE_16BITS(&hdr->ppi_len); + len = EXTRACT_LE_U_2(&hdr->ppi_len); if (caplen < len) { /* * If we don't have the entire PPI header, don't @@ -81,7 +81,7 @@ ppi_print(netdissect_options *ndo, ND_PRINT((ndo, "[|ppi]")); return (len); } - dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt); + dlt = EXTRACT_LE_U_4(&hdr->ppi_dlt); if (ndo->ndo_eflag) ppi_header_print(ndo, p, length); |