From 1c777ec044473c644135c2a96576ac575e5a704c Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 7 Sep 2017 21:10:42 -0400 Subject: DOCSIS: Ensure docsis_ucd has a registered dissection function Bug: 14038 Change-Id: I36fbaa591a7ebf5da7d2e7be837e8fcca30c7f98 Reviewed-on: https://code.wireshark.org/review/23432 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- plugins/docsis/packet-macmgmt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c index 31cc3bcff2..363b29f0f7 100644 --- a/plugins/docsis/packet-macmgmt.c +++ b/plugins/docsis/packet-macmgmt.c @@ -1181,6 +1181,7 @@ static expert_field ei_docsis_mgmt_version_unknown = EI_INIT; static dissector_table_t docsis_mgmt_dissector_table; static dissector_handle_t docsis_tlv_handle; +static dissector_handle_t docsis_ucd_handle; static const value_string channel_tlv_vals[] = { {UCD_SYMBOL_RATE, "Symbol Rate"}, @@ -8533,6 +8534,7 @@ proto_register_docsis_mgmt (void) proto_docsis_type51ucd = proto_register_protocol_in_name_only("DOCSIS Upstream Channel Descriptor Type 51", "DOCSIS type51ucd", "docsis_type51ucd", proto_docsis_mgmt, FT_BYTES); register_dissector ("docsis_mgmt", dissect_macmgmt, proto_docsis_mgmt); + docsis_ucd_handle = register_dissector ("docsis_ucd", dissect_ucd, proto_docsis_ucd); } void @@ -8540,7 +8542,7 @@ proto_reg_handoff_docsis_mgmt (void) { /* Create dissection function handles for all Mac Management commands */ dissector_add_uint ("docsis_mgmt", MGT_SYNC, create_dissector_handle( dissect_sync, proto_docsis_sync )); - dissector_add_uint ("docsis_mgmt", MGT_UCD, create_dissector_handle( dissect_ucd, proto_docsis_ucd )); + dissector_add_uint ("docsis_mgmt", MGT_UCD, docsis_ucd_handle); dissector_add_uint ("docsis_mgmt", 256*MAP_v1 + MGT_MAP, create_dissector_handle( dissect_map_v1, proto_docsis_map_v1 )); dissector_add_uint ("docsis_mgmt", 256*MAP_v5 + MGT_MAP, create_dissector_handle( dissect_map_v5, proto_docsis_map_v5 )); dissector_add_uint ("docsis_mgmt", MGT_RNG_REQ, create_dissector_handle( dissect_rngreq, proto_docsis_rngreq )); -- cgit v1.2.3