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 /asn1/idmp | |
| 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 'asn1/idmp')
| -rw-r--r-- | asn1/idmp/packet-idmp-template.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asn1/idmp/packet-idmp-template.c b/asn1/idmp/packet-idmp-template.c index 075bd6d929..752903d919 100644 --- a/asn1/idmp/packet-idmp-template.c +++ b/asn1/idmp/packet-idmp-template.c @@ -142,7 +142,7 @@ register_idmp_protocol_info(const char *oid, const ros_info_t *rinfo, int proto } -static void dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) +static int dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_) { int offset = 0; @@ -229,6 +229,7 @@ static void dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_t dissect_idmp_IDM_PDU(FALSE, tvb, offset, &asn1_ctx, tree, hf_idmp_PDU); } + return tvb_length(tvb); } static guint get_idmp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) @@ -240,11 +241,10 @@ static guint get_idmp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) return len + 6; } -static void dissect_idmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) +static int dissect_idmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data) { - - tcp_dissect_pdus(tvb, pinfo, parent_tree, idmp_desegment, 0, get_idmp_pdu_len, dissect_idmp); - + tcp_dissect_pdus(tvb, pinfo, parent_tree, idmp_desegment, 0, get_idmp_pdu_len, dissect_idmp, data); + return tvb_length(tvb); } static void idmp_reassemble_init (void) @@ -329,7 +329,7 @@ void proto_register_idmp(void) proto_register_field_array(proto_idmp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("idmp", dissect_idmp_tcp, proto_idmp); + new_register_dissector("idmp", dissect_idmp_tcp, proto_idmp); register_init_routine (&idmp_reassemble_init); |