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-dsi.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-dsi.c')
| -rw-r--r-- | epan/dissectors/packet-dsi.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index 18a5d9cf07..a8b2c9fbfc 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -501,8 +501,8 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) return ofs; } -static void -dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *dsi_tree; proto_item *ti; @@ -598,6 +598,8 @@ dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo, dsi_tree); break; } + + return tvb_length(tvb); } static guint @@ -626,11 +628,13 @@ get_dsi_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) return plen + 16; } -static void -dissect_dsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_dsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { tcp_dissect_pdus(tvb, pinfo, tree, dsi_desegment, 12, - get_dsi_pdu_len, dissect_dsi_packet); + get_dsi_pdu_len, dissect_dsi_packet, data); + + return tvb_length(tvb); } void @@ -880,7 +884,7 @@ proto_reg_handoff_dsi(void) { dissector_handle_t dsi_handle; - dsi_handle = create_dissector_handle(dissect_dsi, proto_dsi); + dsi_handle = new_create_dissector_handle(dissect_dsi, proto_dsi); dissector_add_uint("tcp.port", TCP_PORT_DSI, dsi_handle); data_handle = find_dissector("data"); |