diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-06-16 17:23:21 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2019-03-26 21:06:24 +0100 |
| commit | ee68aa36460d7efeca48747f33b7f2adc0900bfb (patch) | |
| tree | 72c1b65d29301835c0e064b433ea685fc856a68e /print-sunrpc.c | |
| parent | 1af20c3adc4dfef93de41d4fcd02f0aeb6bbfd4e (diff) | |
| download | tcpdump-ee68aa36460d7efeca48747f33b7f2adc0900bfb.tar.gz | |
Use the new GET_ macros instead of the EXTRACT_ ones
The exceptions are currently:
Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer.
An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer
pointer.
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 f83f4eb9..773e8b56 100644 --- a/print-sunrpc.c +++ b/print-sunrpc.c @@ -173,11 +173,11 @@ sunrpc_print(netdissect_options *ndo, const u_char *bp, if (!ndo->ndo_nflag) { nd_snprintf(srcid, sizeof(srcid), "0x%x", - EXTRACT_BE_U_4(rp->rm_xid)); + GET_BE_U_4(rp->rm_xid)); strlcpy(dstid, "sunrpc", sizeof(dstid)); } else { nd_snprintf(srcid, sizeof(srcid), "0x%x", - EXTRACT_BE_U_4(rp->rm_xid)); + GET_BE_U_4(rp->rm_xid)); nd_snprintf(dstid, sizeof(dstid), "0x%x", SUNRPC_PMAPPORT); } @@ -200,23 +200,23 @@ sunrpc_print(netdissect_options *ndo, const u_char *bp, } ND_PRINT(" %s", tok2str(proc2str, " proc #%u", - EXTRACT_BE_U_4(rp->rm_call.cb_proc))); - x = EXTRACT_BE_U_4(rp->rm_call.cb_rpcvers); + GET_BE_U_4(rp->rm_call.cb_proc))); + x = GET_BE_U_4(rp->rm_call.cb_rpcvers); if (x != 2) ND_PRINT(" [rpcver %u]", x); - switch (EXTRACT_BE_U_4(rp->rm_call.cb_proc)) { + switch (GET_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_U_4(rp->rm_call.cb_prog); + x = GET_BE_U_4(rp->rm_call.cb_prog); if (!ndo->ndo_nflag) ND_PRINT(" %s", progstr(x)); else ND_PRINT(" %u", x); - ND_PRINT(".%u", EXTRACT_BE_U_4(rp->rm_call.cb_vers)); + ND_PRINT(".%u", GET_BE_U_4(rp->rm_call.cb_vers)); break; } return; |