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-sunrpc.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-sunrpc.c')
| -rw-r--r-- | print-sunrpc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/print-sunrpc.c b/print-sunrpc.c index 0e7af1b7..ce8b0393 100644 --- a/print-sunrpc.c +++ b/print-sunrpc.c @@ -178,11 +178,11 @@ sunrpc_print(netdissect_options *ndo, register const u_char *bp, if (!ndo->ndo_nflag) { snprintf(srcid, sizeof(srcid), "0x%x", - EXTRACT_BE_32BITS(&rp->rm_xid)); + EXTRACT_BE_U_4(&rp->rm_xid)); strlcpy(dstid, "sunrpc", sizeof(dstid)); } else { snprintf(srcid, sizeof(srcid), "0x%x", - EXTRACT_BE_32BITS(&rp->rm_xid)); + EXTRACT_BE_U_4(&rp->rm_xid)); snprintf(dstid, sizeof(dstid), "0x%x", SUNRPC_PMAPPORT); } @@ -205,23 +205,23 @@ sunrpc_print(netdissect_options *ndo, register const u_char *bp, } ND_PRINT((ndo, " %s", tok2str(proc2str, " proc #%u", - EXTRACT_BE_32BITS(&rp->rm_call.cb_proc)))); - x = EXTRACT_BE_32BITS(&rp->rm_call.cb_rpcvers); + EXTRACT_BE_U_4(&rp->rm_call.cb_proc)))); + x = EXTRACT_BE_U_4(&rp->rm_call.cb_rpcvers); if (x != 2) ND_PRINT((ndo, " [rpcver %u]", x)); - switch (EXTRACT_BE_32BITS(&rp->rm_call.cb_proc)) { + switch (EXTRACT_BE_U_4(&rp->rm_call.cb_proc)) { case SUNRPC_PMAPPROC_SET: case SUNRPC_PMAPPROC_UNSET: case SUNRPC_PMAPPROC_GETPORT: case SUNRPC_PMAPPROC_CALLIT: - x = EXTRACT_BE_32BITS(&rp->rm_call.cb_prog); + x = EXTRACT_BE_U_4(&rp->rm_call.cb_prog); if (!ndo->ndo_nflag) ND_PRINT((ndo, " %s", progstr(x))); else ND_PRINT((ndo, " %u", x)); - ND_PRINT((ndo, ".%u", EXTRACT_BE_32BITS(&rp->rm_call.cb_vers))); + ND_PRINT((ndo, ".%u", EXTRACT_BE_U_4(&rp->rm_call.cb_vers))); break; } } |