diff options
| author | guy <guy> | 2005-04-27 21:43:48 +0000 |
|---|---|---|
| committer | guy <guy> | 2005-04-27 21:43:48 +0000 |
| commit | 37b93aecec2bdb9f8738db1c293e966047710a64 (patch) | |
| tree | 30b702c52d392980c5c2dd8269fe5f2b824e660d /print-sunrpc.c | |
| parent | df8ee0903548456db62ea60cbd5f7fbca8e92de3 (diff) | |
| download | tcpdump-37b93aecec2bdb9f8738db1c293e966047710a64.tar.gz | |
Get rid of the multiple-include protection in our RPC headers, so we
include them even if we also happen to have included system RPC headers,
as we want *our* versions of the structures (which use types with
explicit sizes for structure members, as we use them for on-the-wire
data).
Change pmap_prot.h to prefix all #defines and structure names with
"SUNRPC_" or "sunrpc_", to avoid collisions with any definitions and
structure names from the system header files.
Diffstat (limited to 'print-sunrpc.c')
| -rw-r--r-- | print-sunrpc.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/print-sunrpc.c b/print-sunrpc.c index 58e6112a..bfb2fe9a 100644 --- a/print-sunrpc.c +++ b/print-sunrpc.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.46 2004-12-27 00:41:31 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.47 2005-04-27 21:43:48 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -54,13 +54,13 @@ static const char rcsid[] _U_ = #include "pmap_prot.h" static struct tok proc2str[] = { - { PMAPPROC_NULL, "null" }, - { PMAPPROC_SET, "set" }, - { PMAPPROC_UNSET, "unset" }, - { PMAPPROC_GETPORT, "getport" }, - { PMAPPROC_DUMP, "dump" }, - { PMAPPROC_CALLIT, "call" }, - { 0, NULL } + { SUNRPC_PMAPPROC_NULL, "null" }, + { SUNRPC_PMAPPROC_SET, "set" }, + { SUNRPC_PMAPPROC_UNSET, "unset" }, + { SUNRPC_PMAPPROC_GETPORT, "getport" }, + { SUNRPC_PMAPPROC_DUMP, "dump" }, + { SUNRPC_PMAPPROC_CALLIT, "call" }, + { 0, NULL } }; /* Forwards */ @@ -87,7 +87,7 @@ sunrpcrequest_print(register const u_char *bp, register u_int length, } else { snprintf(srcid, sizeof(srcid), "0x%x", EXTRACT_32BITS(&rp->rm_xid)); - snprintf(dstid, sizeof(dstid), "0x%x", PMAPPORT); + snprintf(dstid, sizeof(dstid), "0x%x", SUNRPC_PMAPPORT); } switch (IP_V((struct ip *)bp2)) { @@ -118,10 +118,10 @@ sunrpcrequest_print(register const u_char *bp, register u_int length, switch (EXTRACT_32BITS(&rp->rm_call.cb_proc)) { - case PMAPPROC_SET: - case PMAPPROC_UNSET: - case PMAPPROC_GETPORT: - case PMAPPROC_CALLIT: + case SUNRPC_PMAPPROC_SET: + case SUNRPC_PMAPPROC_UNSET: + case SUNRPC_PMAPPROC_GETPORT: + case SUNRPC_PMAPPROC_CALLIT: x = EXTRACT_32BITS(&rp->rm_call.cb_prog); if (!nflag) printf(" %s", progstr(x)); |