diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-07-01 07:33:02 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-07-02 08:54:10 +0000 |
| commit | b68a0ed42e26aaa7f30b47657311c187c8e02114 (patch) | |
| tree | 0731ab045fd6d7a43c2a9a8d280d0c4a9e2ac3e7 /epan/dissectors/packet-gluster_pmap.c | |
| parent | 9d8b81012700bda095418dd7f1f7d15b94809cab (diff) | |
Replace RPC "dissect_function_t" function signature with "new style" dissector function signature.
This paves the way for using dissector tables.
Change-Id: I88ac165ef9aa5bf5c05e1115f7321e18e734d683
Reviewed-on: https://code.wireshark.org/review/9453
Reviewed-by: Anders Broman <a.broman58@gmail.com>
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 */ |