diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-05-31 08:56:19 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-05-31 08:56:19 +0000 |
| commit | 4d1abc7bbbe397c440924cd09ff7ff61e5366291 (patch) | |
| tree | 11b8949d6509511a44abb7a9e2616de45eb88aa7 /epan/dissectors/packet-rpc.c | |
| parent | 48fee703395047956e0baca39aa034f597c04ea4 (diff) | |
From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7306 :
RPC: show the AUTH_GLUSTERFS/lk_owner as hex
svn path=/trunk/; revision=42940
Diffstat (limited to 'epan/dissectors/packet-rpc.c')
| -rw-r--r-- | epan/dissectors/packet-rpc.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index d85effc1d1..bcdbac520b 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -1080,7 +1080,11 @@ dissect_rpc_authdes_cred(tvbuff_t* tvb, proto_tree* tree, int offset) static int dissect_rpc_authgluster_cred(tvbuff_t* tvb, proto_tree* tree, int offset) { - offset = dissect_rpc_bytes(tvb, tree, hf_rpc_auth_lk_owner, offset, 8, FALSE, NULL); + if (tree) + proto_tree_add_item(tree, hf_rpc_auth_lk_owner, tvb, offset, + 8, ENC_NA); + offset += 8; + offset = dissect_rpc_uint32(tvb, tree, hf_rpc_auth_pid, offset); offset = dissect_rpc_uint32(tvb, tree, hf_rpc_auth_uid, offset); offset = dissect_rpc_uint32(tvb, tree, hf_rpc_auth_gid, offset); @@ -1092,11 +1096,20 @@ dissect_rpc_authgluster_cred(tvbuff_t* tvb, proto_tree* tree, int offset) static int dissect_rpc_authglusterfs_v2_cred(tvbuff_t* tvb, proto_tree* tree, int offset) { + int len; + offset = dissect_rpc_uint32(tvb, tree, hf_rpc_auth_pid, offset); offset = dissect_rpc_uint32(tvb, tree, hf_rpc_auth_uid, offset); offset = dissect_rpc_uint32(tvb, tree, hf_rpc_auth_gid, offset); offset = dissect_rpc_authunix_groups(tvb, tree, offset); - offset = dissect_rpc_data(tvb, tree, hf_rpc_auth_lk_owner, offset); + + len = tvb_get_ntohl(tvb, offset); + offset += 4; + + if (tree) + proto_tree_add_item(tree, hf_rpc_auth_lk_owner, tvb, offset, + len, ENC_NA); + offset += len; return offset; } |