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-soupbintcp.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-soupbintcp.c')
| -rw-r--r-- | epan/dissectors/packet-soupbintcp.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index fbfce61173..d5f7af625b 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -453,28 +453,30 @@ get_soupbintcp_pdu_len( /** Dissect a possibly-reassembled TCP PDU */ -static void +static int dissect_soupbintcp_tcp_pdu( tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "SoupBinTCP"); dissect_soupbintcp_common(tvb, pinfo, tree); + return tvb_length(tvb); } /** Dissect a TCP segment containing SoupBinTCP data */ -static void +static int dissect_soupbintcp_tcp( tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data) { tcp_dissect_pdus(tvb, pinfo, tree, soupbintcp_desegment, 2, get_soupbintcp_pdu_len, - dissect_soupbintcp_tcp_pdu); + dissect_soupbintcp_tcp_pdu, data); + return tvb_length(tvb); } static void @@ -613,7 +615,7 @@ proto_register_soupbintcp(void) void proto_reg_handoff_soupbintcp(void) { - soupbintcp_handle = create_dissector_handle(dissect_soupbintcp_tcp, + soupbintcp_handle = new_create_dissector_handle(dissect_soupbintcp_tcp, proto_soupbintcp); /* For "decode-as" */ |