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-fcgi.c | |
| parent | c9b2ee3768abb730b49fc4fc779e77578a1c4971 (diff) | |
| download | wireshark-8081cf1d90397cbbb4404f9720595e1537ed5e14.tar.gz | |
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-fcgi.c')
| -rw-r--r-- | epan/dissectors/packet-fcgi.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c index 67282b5e48..d468d3d345 100644 --- a/epan/dissectors/packet-fcgi.c +++ b/epan/dissectors/packet-fcgi.c @@ -232,8 +232,8 @@ dissect_get_values_result(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, gui return; } -static void -dissect_fcgi_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_fcgi_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { gint offset = 0; guint8 type; @@ -321,6 +321,8 @@ dissect_fcgi_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*offset += plen;*/ } } + + return tvb_length(tvb); } static guint @@ -329,10 +331,11 @@ get_fcgi_record_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) return 8 + tvb_get_ntohs(tvb, offset + 4) + tvb_get_guint8(tvb, offset + 6); } -static void -dissect_fcgi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_fcgi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { - tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 8, get_fcgi_record_len, dissect_fcgi_record); + tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 8, get_fcgi_record_len, dissect_fcgi_record, data); + return tvb_length(tvb); } void @@ -398,7 +401,7 @@ proto_register_fcgi(void) 10, &tcp_port); - fcgi_handle = register_dissector("fcgi", dissect_fcgi, proto_fcgi); + fcgi_handle = new_register_dissector("fcgi", dissect_fcgi, proto_fcgi); } void |