mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-23 18:14:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

NFS: Use more the EXTRACT_BE_U_4 macro

Browse Source
This commit is contained in:
Francois-Xavier Le Bail 2017-12-17 09:28:50 +01:00
parent 6a58ce3ad1
commit 9113e560eb
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
print-nfs.c
View File

@ -717,7 +717,9 @@ nfsreq_noaddr_print(netdissect_options *ndo,
EXTRACT_BE_U_4(dp + 4),
EXTRACT_BE_U_8(dp)));
if (ndo->ndo_vflag)
ND_PRINT((ndo, " verf %08x%08x", dp[2], dp[3]));
ND_PRINT((ndo, " verf %08x%08x",
EXTRACT_BE_U_4(dp + 2),
EXTRACT_BE_U_4(dp + 3)));
} else {
ND_TCHECK(dp[1]);
/*
@ -746,7 +748,9 @@ nfsreq_noaddr_print(netdissect_options *ndo,
if (ndo->ndo_vflag) {
ND_TCHECK(dp[5]);
ND_PRINT((ndo, " max %u verf %08x%08x",
EXTRACT_BE_U_4(dp + 5), dp[2], dp[3]));
EXTRACT_BE_U_4(dp + 5),
EXTRACT_BE_U_4(dp + 2),
EXTRACT_BE_U_4(dp + 3)));
}
return;
}
@ -796,7 +800,7 @@ nfs_printfh(netdissect_options *ndo,
ND_PRINT((ndo, " fh["));
for (i=0; i<len; i++) {
ND_PRINT((ndo, "%s%x", sep, dp[i]));
ND_PRINT((ndo, "%s%x", sep, EXTRACT_BE_U_4(dp + i)));
sep = ":";
}
ND_PRINT((ndo, "]"));
@ -1233,7 +1237,7 @@ parserddires(netdissect_options *ndo,
ND_TCHECK(dp[2]);
ND_PRINT((ndo, " offset 0x%x size %d ",
EXTRACT_BE_U_4(dp), EXTRACT_BE_U_4(dp + 1)));
if (dp[2] != 0)
if (EXTRACT_BE_U_4(dp + 2) != 0)
ND_PRINT((ndo, " eof"));
return (1);
@ -1366,7 +1370,8 @@ parsev3rddirres(netdissect_options *ndo,
return dp;
if (ndo->ndo_vflag) {
ND_TCHECK(dp[1]);
ND_PRINT((ndo, " verf %08x%08x", dp[0], dp[1]));
ND_PRINT((ndo, " verf %08x%08x",
EXTRACT_BE_U_4(dp), EXTRACT_BE_U_4(dp + 1)));
dp += 2;
}
return dp;