diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-09 17:46:28 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-09 17:46:28 +0000 |
| commit | 8081cf1d90397cbbb4404f9720595e1537ed5e14 (patch) | |
| tree | 353220f46e08be1f0020603538f501b65bea8f3b /epan/dissectors/packet-mrcpv2.c | |
| parent | c9b2ee3768abb730b49fc4fc779e77578a1c4971 (diff) | |
Add data parameter to tcp_dissect_pdus() as well as convert it to using "new" style dissectors.
Now that "bytes consumed" can be determined, should tcp_dissect_pdus() take advantage of that?
Should tcp_dissect_pdus return length (bytes consumed)? There are many dissectors that just call tcp_dissect_pdus() then return tvb_length(tvb). Seems like that could all be rolled into one.
svn path=/trunk/; revision=53198
Diffstat (limited to 'epan/dissectors/packet-mrcpv2.c')
| -rw-r--r-- | epan/dissectors/packet-mrcpv2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c index 46147f2b4a..a20fff263f 100644 --- a/epan/dissectors/packet-mrcpv2.c +++ b/epan/dissectors/packet-mrcpv2.c @@ -957,14 +957,14 @@ get_mrcpv2_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) return num_msg_len; } -static void -dissect_mrcpv2_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_mrcpv2_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - dissect_mrcpv2_common(tvb, pinfo, tree); + return dissect_mrcpv2_common(tvb, pinfo, tree); } static int -dissect_mrcpv2_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +dissect_mrcpv2_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { gint len; gint value_size; @@ -1019,7 +1019,7 @@ dissect_mrcpv2_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da /* if we are here, then we have MRCP v 2.0 protocol, so proceed with the dissection */ tcp_dissect_pdus(tvb, pinfo, tree, TRUE, MRCPV2_MIN_PDU_LEN, get_mrcpv2_pdu_len, - dissect_mrcpv2_tcp_pdu); + dissect_mrcpv2_tcp_pdu, data); return len; } |