diff options
Diffstat (limited to 'epan/dissectors/packet-gluster_pmap.c')
| -rw-r--r-- | epan/dissectors/packet-gluster_pmap.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/epan/dissectors/packet-gluster_pmap.c b/epan/dissectors/packet-gluster_pmap.c index d9f6f8b952..be12d63931 100644 --- a/epan/dissectors/packet-gluster_pmap.c +++ b/epan/dissectors/packet-gluster_pmap.c @@ -67,9 +67,10 @@ static gint ett_gluster_dump_detail = -1; /* PMAP PORTBYBRICK */ static int -gluster_pmap_portbybrick_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, +gluster_pmap_portbybrick_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { + int offset = 0; offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_uint32(tvb, tree, hf_gluster_brick_status, offset); offset = dissect_rpc_uint32(tvb, tree, hf_gluster_brick_port, offset); @@ -78,12 +79,10 @@ gluster_pmap_portbybrick_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -gluster_pmap_portbybrick_call(tvbuff_t *tvb, int offset, +gluster_pmap_portbybrick_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - offset = dissect_rpc_string(tvb, tree, hf_gluster_brick, offset, - NULL); - return offset; + return dissect_rpc_string(tvb, tree, hf_gluster_brick, 0, NULL); } /* Based on rpc/rpc-lib/src/rpc-common.c, but xdr encoding/decoding is broken. @@ -117,9 +116,11 @@ gluster_dump_reply_detail(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } static int -gluster_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, +gluster_dump_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { + int offset = 0; + offset = dissect_rpc_uint64(tvb, tree, hf_gluster_gfsid, offset); offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); @@ -131,12 +132,10 @@ gluster_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* DUMP request */ static int -gluster_dump_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, +gluster_dump_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - offset = dissect_rpc_uint64(tvb, tree, hf_gluster_gfsid, offset); - - return offset; + return dissect_rpc_uint64(tvb, tree, hf_gluster_gfsid, 0); } /* GLUSTER_PMAP_PROGRAM from xlators/mgmt/glusterd/src/glusterd-pmap.c */ |