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-gmr1_dtap.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-gmr1_dtap.c')
| -rw-r--r-- | epan/dissectors/packet-gmr1_dtap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-gmr1_dtap.c b/epan/dissectors/packet-gmr1_dtap.c index 0c0063f7c1..95529d9c43 100644 --- a/epan/dissectors/packet-gmr1_dtap.c +++ b/epan/dissectors/packet-gmr1_dtap.c @@ -50,8 +50,8 @@ static gint ett_gmr1_pd = -1; static dissector_handle_t gsm_dtap_handle; -static void -dissect_gmr1_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_gmr1_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 len, offset; gmr1_msg_func_t msg_func; @@ -78,7 +78,7 @@ dissect_gmr1_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* HACK: Quick delegation hack to GSM */ if (pd != GMR1_PD_RR) { call_dissector(gsm_dtap_handle, tvb, pinfo, tree); - return; + return tvb_captured_length(tvb); } /* Fill up some info */ @@ -140,7 +140,7 @@ dissect_gmr1_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Done ! */ - return; + return tvb_captured_length(tvb); } @@ -173,7 +173,7 @@ proto_register_gmr1_dtap(void) proto_register_field_array(proto_gmr1_dtap, hf, array_length(hf)); /* Register dissector */ - register_dissector("gmr1_dtap", dissect_gmr1_dtap, proto_gmr1_dtap); + new_register_dissector("gmr1_dtap", dissect_gmr1_dtap, proto_gmr1_dtap); } void |