diff options
| author | sam <sam@FreeBSD.org> | 2005-05-29 18:17:16 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-05-29 18:17:16 +0000 |
| commit | 88a191f109e4bbf287e317e4115185aa904a7757 (patch) | |
| tree | d59cebde657eda0af31fdab513367f5ad61113cd /contrib/tcpdump/print-sunrpc.c | |
| parent | 281e9d71408deb6e8c5046c746c2e97002b0e7fe (diff) | |
| download | FreeBSD-src-88a191f109e4bbf287e317e4115185aa904a7757.zip FreeBSD-src-88a191f109e4bbf287e317e4115185aa904a7757.tar.gz | |
Virgin import of tcpdump v3.9.1 (alpha 096) from tcpdump.org
Diffstat (limited to 'contrib/tcpdump/print-sunrpc.c')
| -rw-r--r-- | contrib/tcpdump/print-sunrpc.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/contrib/tcpdump/print-sunrpc.c b/contrib/tcpdump/print-sunrpc.c index 3ac556a..8fa733c 100644 --- a/contrib/tcpdump/print-sunrpc.c +++ b/contrib/tcpdump/print-sunrpc.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.43.2.2 2003/11/16 08:51:47 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.46 2004/12/27 00:41:31 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -30,13 +30,12 @@ static const char rcsid[] _U_ = #include <tcpdump-stdinc.h> +#ifdef HAVE_GETRPCBYNUMBER #include <rpc/rpc.h> #ifdef HAVE_RPC_RPCENT_H #include <rpc/rpcent.h> -#endif -#ifndef WIN32 -#include <rpc/pmap_prot.h> -#endif /* WIN32 */ +#endif /* HAVE_RPC_RPCENT_H */ +#endif /* HAVE_GETRPCBYNUMBER */ #include <stdio.h> #include <string.h> @@ -50,6 +49,10 @@ static const char rcsid[] _U_ = #include "ip6.h" #endif +#include "rpc_auth.h" +#include "rpc_msg.h" +#include "pmap_prot.h" + static struct tok proc2str[] = { { PMAPPROC_NULL, "null" }, { PMAPPROC_SET, "set" }, @@ -67,7 +70,7 @@ void sunrpcrequest_print(register const u_char *bp, register u_int length, register const u_char *bp2) { - register const struct rpc_msg *rp; + register const struct sunrpc_msg *rp; register const struct ip *ip; #ifdef INET6 register const struct ip6_hdr *ip6; @@ -75,7 +78,7 @@ sunrpcrequest_print(register const u_char *bp, register u_int length, u_int32_t x; char srcid[20], dstid[20]; /*fits 32bit*/ - rp = (struct rpc_msg *)bp; + rp = (struct sunrpc_msg *)bp; if (!nflag) { snprintf(srcid, sizeof(srcid), "0x%x", @@ -133,7 +136,7 @@ static char * progstr(prog) u_int32_t prog; { -#ifndef WIN32 +#ifdef HAVE_GETRPCBYNUMBER register struct rpcent *rp; #endif static char buf[32]; @@ -141,12 +144,12 @@ progstr(prog) if (lastprog != 0 && prog == lastprog) return (buf); -#ifndef WIN32 +#ifdef HAVE_GETRPCBYNUMBER rp = getrpcbynumber(prog); if (rp == NULL) -#endif /* WIN32 */ +#endif (void) snprintf(buf, sizeof(buf), "#%u", prog); -#ifndef WIN32 +#ifdef HAVE_GETRPCBYNUMBER else strlcpy(buf, rp->r_name, sizeof(buf)); #endif |
