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-802_15_4.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-802_15_4.c')
| -rw-r--r-- | print-802_15_4.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/print-802_15_4.c b/print-802_15_4.c index 781360b9..8db4a213 100644 --- a/print-802_15_4.c +++ b/print-802_15_4.c @@ -77,8 +77,8 @@ ieee802_15_4_if_print(netdissect_options *ndo, } hdrlen = 3; - fc = EXTRACT_LE_16BITS(p); - seq = EXTRACT_8BITS(p + 2); + fc = EXTRACT_LE_U_2(p); + seq = EXTRACT_U_1(p + 2); p += 3; caplen -= 3; @@ -113,7 +113,7 @@ ieee802_15_4_if_print(netdissect_options *ndo, ND_PRINT((ndo, "[|802.15.4]")); return hdrlen; } - panid = EXTRACT_LE_16BITS(p); + panid = EXTRACT_LE_U_2(p); p += 2; caplen -= 2; hdrlen += 2; @@ -122,7 +122,7 @@ ieee802_15_4_if_print(netdissect_options *ndo, return hdrlen; } if (ndo->ndo_vflag) - ND_PRINT((ndo,"%04x:%04x ", panid, EXTRACT_LE_16BITS(p))); + ND_PRINT((ndo,"%04x:%04x ", panid, EXTRACT_LE_U_2(p))); p += 2; caplen -= 2; hdrlen += 2; @@ -132,7 +132,7 @@ ieee802_15_4_if_print(netdissect_options *ndo, ND_PRINT((ndo, "[|802.15.4]")); return hdrlen; } - panid = EXTRACT_LE_16BITS(p); + panid = EXTRACT_LE_U_2(p); p += 2; caplen -= 2; hdrlen += 2; @@ -173,7 +173,7 @@ ieee802_15_4_if_print(netdissect_options *ndo, ND_PRINT((ndo, "[|802.15.4]")); return hdrlen; } - panid = EXTRACT_LE_16BITS(p); + panid = EXTRACT_LE_U_2(p); p += 2; caplen -= 2; hdrlen += 2; @@ -183,7 +183,7 @@ ieee802_15_4_if_print(netdissect_options *ndo, return hdrlen; } if (ndo->ndo_vflag) - ND_PRINT((ndo,"%04x:%04x ", panid, EXTRACT_LE_16BITS(p))); + ND_PRINT((ndo,"%04x:%04x ", panid, EXTRACT_LE_U_2(p))); p += 2; caplen -= 2; hdrlen += 2; @@ -199,7 +199,7 @@ ieee802_15_4_if_print(netdissect_options *ndo, ND_PRINT((ndo, "[|802.15.4]")); return hdrlen; } - panid = EXTRACT_LE_16BITS(p); + panid = EXTRACT_LE_U_2(p); p += 2; caplen -= 2; hdrlen += 2; |