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-isup.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-isup.c')
| -rw-r--r-- | epan/dissectors/packet-isup.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 8fbd7d6051..2d5f3abbb6 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -10646,8 +10646,8 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup } /* ------------------------------------------------------------------ */ -static void -dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* Set up structures needed to add the protocol subtree and manage it */ @@ -10738,11 +10738,12 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_tvb = tvb_new_subset_remaining(tvb, CIC_LENGTH); dissect_isup_message(message_tvb, pinfo, isup_tree, itu_isup_variant, cic); } + return tvb_captured_length(tvb); } /* ------------------------------------------------------------------ */ -static void -dissect_bicc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_bicc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* Set up structures needed to add the protocol subtree and manage it */ @@ -10815,6 +10816,7 @@ dissect_bicc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_tvb = tvb_new_subset_remaining(tvb, BICC_CIC_LENGTH); dissect_isup_message(message_tvb, pinfo, bicc_tree, itu_isup_variant, bicc_cic); col_set_fence(pinfo->cinfo, COL_INFO); + return tvb_captured_length(tvb); } static int @@ -12389,7 +12391,7 @@ proto_register_isup(void) proto_isup = proto_register_protocol("ISDN User Part", "ISUP", "isup"); - register_dissector("isup", dissect_isup, proto_isup); + new_register_dissector("isup", dissect_isup, proto_isup); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_isup, hf, array_length(hf)); @@ -12431,7 +12433,7 @@ proto_reg_handoff_isup(void) dissector_handle_t isup_handle; dissector_handle_t application_isup_handle; - isup_handle = create_dissector_handle(dissect_isup, proto_isup); + isup_handle = new_create_dissector_handle(dissect_isup, proto_isup); application_isup_handle = new_create_dissector_handle(dissect_application_isup, proto_isup); dissector_add_uint("mtp3.service_indicator", MTP_SI_ISUP, isup_handle); dissector_add_string("media_type", "application/isup", application_isup_handle); @@ -12458,7 +12460,7 @@ proto_register_bicc(void) proto_bicc = proto_register_protocol("Bearer Independent Call Control", "BICC", "bicc"); - bicc_handle = register_dissector("bicc", dissect_bicc, proto_bicc); + bicc_handle = new_register_dissector("bicc", dissect_bicc, proto_bicc); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_bicc, hf, array_length(hf)); |