diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-14 15:11:44 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-14 21:54:39 +0000 |
| commit | 159227a14b25b15b535ac95c85d8bc699317d45e (patch) | |
| tree | 7d02f802790d5701a0cc5c40537538944b60bb63 /plugins/docsis/packet-macmgmt.c | |
| parent | 28ea58251c04562cc0670e57bf073dc6966e73e6 (diff) | |
| download | wireshark-159227a14b25b15b535ac95c85d8bc699317d45e.tar.gz | |
register_dissector -> new_register_dissector for plugins.
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: Ie98e071a7cb568c13c8958de56b1fc25a4ce2ce9
Reviewed-on: https://code.wireshark.org/review/11831
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins/docsis/packet-macmgmt.c')
| -rw-r--r-- | plugins/docsis/packet-macmgmt.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c index 6680dfce23..0285b6848c 100644 --- a/plugins/docsis/packet-macmgmt.c +++ b/plugins/docsis/packet-macmgmt.c @@ -143,8 +143,8 @@ static const value_string mgmt_type_vals[] = { }; /* Dissection */ -static void -dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) +static int +dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_) { guint16 msg_len; proto_item *mgt_hdr_it; @@ -192,11 +192,10 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) msg_len = tvb_get_ntohs (tvb, 12); payload_tvb = tvb_new_subset_length (tvb, 20, msg_len - 6); - if (dissector_try_uint - (docsis_mgmt_dissector_table, type, payload_tvb, pinfo, tree)) - return; - else + if (!dissector_try_uint(docsis_mgmt_dissector_table, type, payload_tvb, pinfo, tree)) call_dissector (data_handle, payload_tvb, pinfo, tree); + + return tvb_captured_length(tvb); } /* Register the protocol with Wireshark */ @@ -268,7 +267,7 @@ proto_register_docsis_mgmt (void) proto_register_field_array (proto_docsis_mgmt, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); - register_dissector ("docsis_mgmt", dissect_macmgmt, proto_docsis_mgmt); + new_register_dissector ("docsis_mgmt", dissect_macmgmt, proto_docsis_mgmt); } void |