diff options
| author | Jorge Mora <jmora1300@gmail.com> | 2019-10-23 10:52:37 -0600 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-10-25 03:24:45 +0000 |
| commit | 1fc558b82bdf4bc707e9e42d1232c327052aecb3 (patch) | |
| tree | b5ea607ec7204e791d01c75f9e999c18b2effbfd /epan/dissectors/packet-nfs.c | |
| parent | dda619fb70551d940f681d7f22911d30eb326b52 (diff) | |
NFS: Fixing again stateid display of other_hash
Initially added feature to match linux kernel hash value of
stateid to the wireshark in
commit 05c47d755a82891fd73b2dfad7e128cd3c966ded
change id I70c6d2b88822b6f735e8bc506a1bfcb421f6ddb9
[NFS] adding stateid hash based on stateid.other
This has been broken by
commit b913bcc13a9a6213902691a8d73bba1427ab407b
change id I3bf7caefc3341887a4c9137500dfeac0115af8cf
NFSv4: Fix for duplicate StateId hashes
This patch fixes it to again calculate a crc32 hash to
make it to the linux kernel output.
Change-Id: Ibb29516de61bd9bdf2dd1164da4b14412aa7a71c
Reviewed-on: https://code.wireshark.org/review/34842
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-nfs.c')
| -rw-r--r-- | epan/dissectors/packet-nfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index c3d33a4710..15213c3642 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -8085,7 +8085,7 @@ dissect_nfs4_stateid(tvbuff_t *tvb, int offset, proto_tree *tree, guint16 *hash) proto_tree_add_item(stateid_tree, hf_nfs4_stateid_other, tvb, offset, 12, ENC_NA); - other_hash = crc16_ccitt_tvb_offset(tvb, offset, 12); + other_hash = crc32_ccitt_tvb_offset(tvb, offset, 12); oth_item = proto_tree_add_uint(stateid_tree, hf_nfs4_stateid_other_hash, tvb, offset, 12, other_hash); proto_item_set_generated(oth_item); offset+=12; @@ -12558,8 +12558,8 @@ proto_register_nfs(void) "StateID Other", "nfs.stateid.other", FT_BYTES, BASE_NONE, NULL, 0, "Unique component of StateID", HFILL }}, { &hf_nfs4_stateid_other_hash,{ - "StateID Other hash", "nfs.stateid.other_hash", FT_UINT16, BASE_HEX, - NULL, 0, "CRC-16 hash", HFILL }}, + "StateID Other hash", "nfs.stateid.other_hash", FT_UINT32, BASE_HEX, + NULL, 0, "CRC-32 hash", HFILL }}, { &hf_nfs4_offset, { "offset", "nfs.offset4", FT_UINT64, BASE_DEC, |