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-gsm_cbch.c | |
| parent | 76dec3ba681da2c315efba4433d3b1f995defd91 (diff) | |
| download | wireshark-8faf5c80b3302247c32e1f5c492cb31a082ee0ad.tar.gz | |
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-gsm_cbch.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_cbch.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-gsm_cbch.c b/epan/dissectors/packet-gsm_cbch.c index 82a0c1d853..f3f346797d 100644 --- a/epan/dissectors/packet-gsm_cbch.c +++ b/epan/dissectors/packet-gsm_cbch.c @@ -369,8 +369,8 @@ dissect_schedule_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree } } -static void -dissect_cbch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_cbch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { fragment_head *frag_data = NULL; guint8 octet, lb, lpd, seq_num; @@ -473,6 +473,7 @@ dissect_cbch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) expert_add_info(pinfo, lpd_item, &ei_gsm_cbch_lpd); call_dissector(data_handle, tvb, pinfo, cbch_tree); } + return tvb_captured_length(tvb); } /* Register the protocol with Wireshark */ @@ -644,7 +645,7 @@ proto_register_gsm_cbch(void) expert_register_field_array(expert_cbch, ei, array_length(ei)); /* subdissector code */ - register_dissector("gsm_cbch", dissect_cbch, proto_cbch); + new_register_dissector("gsm_cbch", dissect_cbch, proto_cbch); register_init_routine(cbch_defragment_init); register_cleanup_routine(cbch_defragment_cleanup); |