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-udld.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-udld.c')
| -rw-r--r-- | print-udld.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/print-udld.c b/print-udld.c index 011fd8ad..69bdea46 100644 --- a/print-udld.c +++ b/print-udld.c @@ -112,8 +112,8 @@ udld_print (netdissect_options *ndo, const u_char *pptr, u_int length) UDLD_EXTRACT_VERSION(*tptr), tok2str(udld_code_values, "Reserved", code), code, - bittok2str(udld_flags_values, "none", EXTRACT_8BITS((tptr + 1))), - EXTRACT_8BITS((tptr + 1)), + bittok2str(udld_flags_values, "none", EXTRACT_U_1((tptr + 1))), + EXTRACT_U_1((tptr + 1)), length)); /* @@ -123,15 +123,15 @@ udld_print (netdissect_options *ndo, const u_char *pptr, u_int length) return; } - ND_PRINT((ndo, "\n\tChecksum 0x%04x (unverified)", EXTRACT_BE_16BITS(tptr + 2))); + ND_PRINT((ndo, "\n\tChecksum 0x%04x (unverified)", EXTRACT_BE_U_2(tptr + 2))); tptr += UDLD_HEADER_LEN; while (tptr < (pptr+length)) { ND_TCHECK2(*tptr, 4); - type = EXTRACT_BE_16BITS(tptr); - len = EXTRACT_BE_16BITS(tptr + 2); + type = EXTRACT_BE_U_2(tptr); + len = EXTRACT_BE_U_2(tptr + 2); ND_PRINT((ndo, "\n\t%s (0x%04x) TLV, length %u", tok2str(udld_tlv_values, "Unknown", type), @@ -172,7 +172,7 @@ udld_print (netdissect_options *ndo, const u_char *pptr, u_int length) case UDLD_SEQ_NUMBER_TLV: if (len != 4) goto invalid; - ND_PRINT((ndo, ", %u", EXTRACT_BE_32BITS(tptr))); + ND_PRINT((ndo, ", %u", EXTRACT_BE_U_4(tptr))); break; default: |