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-m3ua.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-m3ua.c')
| -rw-r--r-- | print-m3ua.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/print-m3ua.c b/print-m3ua.c index 54b218da..163b6450 100644 --- a/print-m3ua.c +++ b/print-m3ua.c @@ -220,7 +220,7 @@ tag_value_print(netdissect_options *ndo, if (size < 4) goto invalid; ND_TCHECK2(*buf, size); - ND_PRINT((ndo, "0x%08x", EXTRACT_BE_32BITS(buf))); + ND_PRINT((ndo, "0x%08x", EXTRACT_BE_U_4(buf))); break; /* ... */ default: @@ -262,10 +262,10 @@ m3ua_tags_print(netdissect_options *ndo, goto invalid; ND_TCHECK2(*p, sizeof(struct m3ua_param_header)); /* Parameter Tag */ - hdr_tag = EXTRACT_BE_16BITS(p); + hdr_tag = EXTRACT_BE_U_2(p); ND_PRINT((ndo, "\n\t\t\t%s: ", tok2str(ParamName, "Unknown Parameter (0x%04x)", hdr_tag))); /* Parameter Length */ - hdr_len = EXTRACT_BE_16BITS(p + 2); + hdr_len = EXTRACT_BE_U_2(p + 2); if (hdr_len < sizeof(struct m3ua_param_header)) goto invalid; /* Parameter Value */ @@ -323,11 +323,11 @@ m3ua_print(netdissect_options *ndo, if (dict != NULL) ND_PRINT((ndo, " %s Message", tok2str(dict, "Unknown (0x%02x)", hdr->msg_type))); - if (size != EXTRACT_BE_32BITS(&hdr->len)) - ND_PRINT((ndo, "\n\t\t\t@@@@@@ Corrupted length %u of message @@@@@@", EXTRACT_BE_32BITS(&hdr->len))); + if (size != EXTRACT_BE_U_4(&hdr->len)) + ND_PRINT((ndo, "\n\t\t\t@@@@@@ Corrupted length %u of message @@@@@@", EXTRACT_BE_U_4(&hdr->len))); else m3ua_tags_print(ndo, buf + sizeof(struct m3ua_common_header), - EXTRACT_BE_32BITS(&hdr->len) - sizeof(struct m3ua_common_header)); + EXTRACT_BE_U_4(&hdr->len) - sizeof(struct m3ua_common_header)); return; invalid: |