diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-14 09:23:33 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-14 21:54:27 +0000 |
| commit | 28ea58251c04562cc0670e57bf073dc6966e73e6 (patch) | |
| tree | abe57292f17b280056a73ee7cfdc94abdcaaaaf3 /epan/dissectors/packet-srp.c | |
| parent | 13101020e12eb21e8464a3c4eb4fc2fe51409235 (diff) | |
register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most.
This concludes a "first pass" over the dissector directory.
Change-Id: If5ce5484214be50fe541cba478da1de62e354297
Reviewed-on: https://code.wireshark.org/review/11830
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-srp.c')
| -rw-r--r-- | epan/dissectors/packet-srp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c index 2807b03506..844d8a7334 100644 --- a/epan/dissectors/packet-srp.c +++ b/epan/dissectors/packet-srp.c @@ -71,7 +71,7 @@ static const value_string ccsrl_ls_vals[] = { /*****************************************************************************/ -static void dissect_ccsrl(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) +static int dissect_ccsrl(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_) { proto_item *ccsrl_item; proto_tree *ccsrl_tree=NULL; @@ -92,6 +92,7 @@ static void dissect_ccsrl(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree */ next_tvb = tvb_new_subset_remaining(tvb, 1); call_dissector( h245dg_handle, next_tvb, pinfo, ccsrl_tree ); + return tvb_captured_length(tvb); } static void dissect_srp_command(tvbuff_t * tvb, packet_info * pinfo, proto_tree * srp_tree) @@ -111,7 +112,7 @@ static void dissect_srp_command(tvbuff_t * tvb, packet_info * pinfo, proto_tree call_dissector(ccsrl_handle, next_tvb, pinfo, srp_tree ); } -static void dissect_srp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) +static int dissect_srp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_) { proto_item *srp_item = NULL; proto_tree *srp_tree = NULL; @@ -167,6 +168,7 @@ static void dissect_srp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) } } + return tvb_captured_length(tvb); } void proto_register_ccsrl (void) @@ -184,7 +186,7 @@ void proto_register_ccsrl (void) proto_ccsrl = proto_register_protocol ("H.324/CCSRL", "CCSRL", "ccsrl"); proto_register_field_array (proto_ccsrl, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); - register_dissector("ccsrl", dissect_ccsrl, proto_ccsrl); + new_register_dissector("ccsrl", dissect_ccsrl, proto_ccsrl); } void proto_register_srp (void) @@ -211,7 +213,7 @@ void proto_register_srp (void) proto_srp = proto_register_protocol ("H.324/SRP", "SRP", "srp"); proto_register_field_array (proto_srp, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); - register_dissector("srp", dissect_srp, proto_srp); + new_register_dissector("srp", dissect_srp, proto_srp); /* register our init routine to be called at the start of a capture, to clear out our hash tables etc */ |