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-geonet.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-geonet.c')
| -rw-r--r-- | print-geonet.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/print-geonet.c b/print-geonet.c index f30e434b..1e98fc5f 100644 --- a/print-geonet.c +++ b/print-geonet.c @@ -75,8 +75,8 @@ static void print_btp(netdissect_options *ndo, const u_char *bp) { - uint16_t dest = EXTRACT_BE_16BITS(bp + 0); - uint16_t src = EXTRACT_BE_16BITS(bp + 2); + uint16_t dest = EXTRACT_BE_U_2(bp + 0); + uint16_t src = EXTRACT_BE_U_2(bp + 2); ND_PRINT((ndo, "; BTP Dst:%u Src:%u", dest, src)); } @@ -92,9 +92,9 @@ print_long_pos_vector(netdissect_options *ndo, if (!ND_TTEST2(*(bp+12), 8)) return (-1); - lat = EXTRACT_BE_32BITS(bp + 12); + lat = EXTRACT_BE_U_4(bp + 12); ND_PRINT((ndo, "lat:%d ", lat)); - lon = EXTRACT_BE_32BITS(bp + 16); + lon = EXTRACT_BE_U_4(bp + 16); ND_PRINT((ndo, "lon:%d", lon)); return (0); } @@ -132,7 +132,7 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length, next_hdr = bp[0] & 0x0f; hdr_type = bp[1] >> 4; hdr_subtype = bp[1] & 0x0f; - payload_length = EXTRACT_BE_16BITS(bp + 4); + payload_length = EXTRACT_BE_U_2(bp + 4); hop_limit = bp[7]; switch (next_hdr) { |