diff options
| author | Bill Fenner <fenner@FreeBSD.org> | 1998-09-15 19:46:59 +0000 |
|---|---|---|
| committer | Bill Fenner <fenner@FreeBSD.org> | 1998-09-15 19:46:59 +0000 |
| commit | 699fc31439c6d227def4f2fdf7b4f4c5f3d02828 (patch) | |
| tree | 0f65e43947993b82a8cd54d6bbd653f4940945a5 /contrib/tcpdump/print-nfs.c | |
| parent | 90dc276c84c804d608fad6d71f9daf536f2203a3 (diff) | |
| download | src-699fc31439c6d227def4f2fdf7b4f4c5f3d02828.tar.gz src-699fc31439c6d227def4f2fdf7b4f4c5f3d02828.zip | |
Merge tcpdump 3.4
PR: bin/7877
Notes
Notes:
svn path=/head/; revision=39300
Diffstat (limited to 'contrib/tcpdump/print-nfs.c')
| -rw-r--r-- | contrib/tcpdump/print-nfs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/contrib/tcpdump/print-nfs.c b/contrib/tcpdump/print-nfs.c index fd71a462cd20..bfaf4387d2a1 100644 --- a/contrib/tcpdump/print-nfs.c +++ b/contrib/tcpdump/print-nfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996 + * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: print-nfs.c,v 1.63 96/12/10 23:18:07 leres Exp $ (LBL)"; + "@(#) $Header: print-nfs.c,v 1.65 97/08/17 13:24:22 leres Exp $ (LBL)"; #endif #include <sys/param.h> @@ -247,7 +247,7 @@ nfsreply_print(register const u_char *bp, u_int length, ip = (const struct ip *)bp2; if (!nflag) - (void)printf("%s.nfs > %s.%x: reply %s %d", + (void)printf("%s.nfs > %s.%u: reply %s %d", ipaddr_string(&ip->ip_src), ipaddr_string(&ip->ip_dst), (u_int32_t)ntohl(rp->rm_xid), @@ -255,7 +255,7 @@ nfsreply_print(register const u_char *bp, u_int length, "ok":"ERR", length); else - (void)printf("%s.%x > %s.%x: reply %s %d", + (void)printf("%s.%u > %s.%u: reply %s %d", ipaddr_string(&ip->ip_src), NFS_PORT, ipaddr_string(&ip->ip_dst), @@ -383,13 +383,13 @@ nfsreq_print(register const u_char *bp, u_int length, rp = (const struct rpc_msg *)bp; ip = (const struct ip *)bp2; if (!nflag) - (void)printf("%s.%x > %s.nfs: %d", + (void)printf("%s.%u > %s.nfs: %d", ipaddr_string(&ip->ip_src), (u_int32_t)ntohl(rp->rm_xid), ipaddr_string(&ip->ip_dst), length); else - (void)printf("%s.%x > %s.%x: %d", + (void)printf("%s.%u > %s.%u: %d", ipaddr_string(&ip->ip_src), (u_int32_t)ntohl(rp->rm_xid), ipaddr_string(&ip->ip_dst), @@ -758,7 +758,7 @@ xid_map_find(const struct rpc_msg *rp, const struct ip *ip, u_int32_t *proc, } while (i != xid_map_hint); /* search failed */ - return (-1); + return (0); } /* |