diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-13 20:18:34 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-14 18:00:00 +0000 |
| commit | 8faf5c80b3302247c32e1f5c492cb31a082ee0ad (patch) | |
| tree | e9bac5673fc9a480fe1fa06fcc6d5d7d45b37389 /epan/dissectors/packet-iax2.c | |
| parent | 76dec3ba681da2c315efba4433d3b1f995defd91 (diff) | |
register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I25fe6a0aac93980333217d007702799d16946563
Reviewed-on: https://code.wireshark.org/review/11816
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-iax2.c')
| -rw-r--r-- | epan/dissectors/packet-iax2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index b3de3e3a5b..5b9a368d22 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1120,8 +1120,8 @@ static void dissect_payload(tvbuff_t *tvb, guint32 offset, -static void -dissect_iax2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_iax2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *iax2_item; proto_tree *iax2_tree; @@ -1210,6 +1210,7 @@ dissect_iax2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) not the audio data. */ proto_item_set_len(iax2_item, len); tap_queue_packet(iax2_tap, pinfo, iax2_info); + return tvb_captured_length(tvb); } static proto_item *dissect_datetime_ie(tvbuff_t *tvb, guint32 offset, proto_tree *ies_tree) @@ -3198,7 +3199,7 @@ proto_register_iax2(void) expert_iax = expert_register_protocol(proto_iax2); expert_register_field_array(expert_iax, ei, array_length(ei)); - register_dissector("iax2", dissect_iax2, proto_iax2); + new_register_dissector("iax2", dissect_iax2, proto_iax2); iax2_codec_dissector_table = register_dissector_table( "iax2.codec", "IAX codec number", FT_UINT32, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE); |