X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/51e180c4fb05a88ad6687a23cc983955cd9ea431..2fd7b16acb63b86d7291abb4c68c27e24bc50a85:/print-nfs.c

diff --git a/print-nfs.c b/print-nfs.c
index a83f1b54..bbce4953 100644
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -198,7 +198,7 @@ static const struct tok sunrpc_str[] = {
 };
 
 static void
-print_nfsaddr(netdissect_options *ndo,
+nfsaddr_print(netdissect_options *ndo,
               const u_char *bp, const char *s, const char *d)
 {
 	const struct ip *ip;
@@ -340,7 +340,6 @@ nfsreply_print(netdissect_options *ndo,
 	ndo->ndo_protocol = "nfs";
 	rp = (const struct sunrpc_msg *)bp;
 
-	ND_TCHECK_4(rp->rm_xid);
 	if (!ndo->ndo_nflag) {
 		strlcpy(srcid, "nfs", sizeof(srcid));
 		snprintf(dstid, sizeof(dstid), "%u",
@@ -350,13 +349,9 @@ nfsreply_print(netdissect_options *ndo,
 		snprintf(dstid, sizeof(dstid), "%u",
 		    GET_BE_U_4(rp->rm_xid));
 	}
-	print_nfsaddr(ndo, bp2, srcid, dstid);
+	nfsaddr_print(ndo, bp2, srcid, dstid);
 
 	nfsreply_noaddr_print(ndo, bp, length, bp2);
-	return;
-
-trunc:
-	nd_print_trunc(ndo);
 }
 
 void
@@ -901,17 +896,19 @@ nfs_printfh(netdissect_options *ndo,
 		if (spacep)
 			*spacep = '\0';
 
-		ND_PRINT(" fh %s/", temp);
+		ND_PRINT(" fh ");
+		fn_print_str(ndo, (const u_char *)temp);
+		ND_PRINT("/");
 	} else {
 		ND_PRINT(" fh %u,%u/",
 			     fsid.Fsid_dev.Major, fsid.Fsid_dev.Minor);
 	}
 
-	if(fsid.Fsid_dev.Minor == 257)
+	if(fsid.Fsid_dev.Minor == UINT_MAX && fsid.Fsid_dev.Major == UINT_MAX)
 		/* Print the undecoded handle */
-		ND_PRINT("%s", fsid.Opaque_Handle);
+		fn_print_str(ndo, (const u_char *)fsid.Opaque_Handle);
 	else
-		ND_PRINT("%ld", (long) ino);
+		ND_PRINT("%u", ino);
 }
 
 /*
@@ -975,8 +972,7 @@ xid_map_enter(netdissect_options *ndo,
 				 sizeof(ip->ip_src));
 		UNALIGNED_MEMCPY(&xmep->server, ip->ip_dst,
 				 sizeof(ip->ip_dst));
-	}
-	else if (ip6) {
+	} else if (ip6) {
 		xmep->ipver = 6;
 		UNALIGNED_MEMCPY(&xmep->client, ip6->ip6_src,
 				 sizeof(ip6->ip6_src));
@@ -1317,15 +1313,12 @@ parserddires(netdissect_options *ndo,
 	if (ndo->ndo_qflag)
 		return (1);
 
-	ND_TCHECK_4(dp + 2);
 	ND_PRINT(" offset 0x%x size %u ",
 	       GET_BE_U_4(dp), GET_BE_U_4(dp + 1));
 	if (GET_BE_U_4(dp + 2) != 0)
 		ND_PRINT(" eof");
 
 	return (1);
-trunc:
-	return (0);
 }
 
 static const uint32_t *
@@ -1567,7 +1560,7 @@ interp_reply(netdissect_options *ndo,
 		if (dp == NULL)
 			goto trunc;
 		if (v3) {
-			if (parsewccres(ndo, dp, ndo->ndo_vflag, &nfserr) == 0)
+			if (parsewccres(ndo, dp, ndo->ndo_vflag, &nfserr) == NULL)
 				goto trunc;
 		} else {
 			if (parseattrstat(ndo, dp, !ndo->ndo_qflag, 0, &nfserr) == 0)