diff options
| author | Adrian <daniel.simionov@gmail.com> | 2016-03-12 21:39:09 +1100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-12 15:08:27 +0000 |
| commit | a69d07dca03fdf286e023d399defee8cb715bbe5 (patch) | |
| tree | 0855123af7ad80b23c52e197868d2b9b834e678c /plugins/docsis | |
| parent | bc55b62bf6be9d6449d504ad8b24fb78be0a624c (diff) | |
| download | wireshark-a69d07dca03fdf286e023d399defee8cb715bbe5.tar.gz | |
[docsis->mdd] Add support for TLV 1.6
Change-Id: I5c7529bc630ad7312011b04ce101ba3608041d35
Reviewed-on: https://code.wireshark.org/review/14435
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins/docsis')
| -rw-r--r-- | plugins/docsis/packet-mdd.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c index 5fda1f096a..2783df2390 100644 --- a/plugins/docsis/packet-mdd.c +++ b/plugins/docsis/packet-mdd.c @@ -49,6 +49,7 @@ #define DOWNSTREAM_ACTIVE_CHANNEL_LIST_MODULATION_ORDER_ANNEX 3 #define DOWNSTREAM_ACTIVE_CHANNEL_LIST_PRIMARY_CAPABLE 4 #define DOWNSTREAM_ACTIVE_CHANNEL_LIST_CM_STATUS_EVENT_ENABLE_BITMASK 5 +#define DOWNSTREAM_ACTIVE_CHANNEL_LIST_MAP_UCD_TRANSPORT_INDICATOR 6 /*Mac Domain Downstream Service Group*/ #define MAC_DOMAIN_DOWNSTREAM_SERVICE_GROUP_MD_DS_SG_IDENTIFIER 1 @@ -67,6 +68,10 @@ #define NOT_PRIMARY_CAPABLE 0 #define PRIMARY_CAPABLE 1 +/*Can carry MAP and UCD*/ +#define CANNOT_CARRY_MAP_UCD 0 +#define CAN_CARRY_MAP_UCD 1 + /*Receive Channel Profile Reporting Control*/ #define RCP_CENTER_FREQUENCY_SPACING 1 #define VERBOSE_RCP_REPORTING 2 @@ -152,6 +157,12 @@ static const value_string primary_capable_vals[] = { {0, NULL} }; +static const value_string map_ucd_transport_indicator_vals[] = { + {CANNOT_CARRY_MAP_UCD, "Channel cannot carry MAPs and UCDs for the MAC domain for which the MDD is sent"}, + {CAN_CARRY_MAP_UCD, "Channel can carry MAPs and UCDs for the MAC domain for which the MDD is sent"}, + {0, NULL} +}; + static const value_string mdd_tlv_vals[] = { {DOWNSTREAM_ACTIVE_CHANNEL_LIST, "Downstream Active Channel List"}, {MAC_DOMAIN_DOWNSTREAM_SERVICE_GROUP, "Mac Domain Downstream Service Group"}, @@ -245,6 +256,7 @@ static int hf_docsis_mdd_downstream_active_channel_list_frequency = -1; static int hf_docsis_mdd_downstream_active_channel_list_annex = -1; static int hf_docsis_mdd_downstream_active_channel_list_modulation_order = -1; static int hf_docsis_mdd_downstream_active_channel_list_primary_capable = -1; +static int hf_docsis_mdd_downstream_active_channel_list_map_ucd_transport_indicator = -1; static int hf_docsis_mdd_cm_status_event_enable_bitmask_mdd_timeout = -1; static int hf_docsis_mdd_cm_status_event_enable_bitmask_qam_fec_lock_failure = -1; @@ -367,6 +379,9 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_mdd_recovery, tvb, subpos + 2 , 2,ENC_BIG_ENDIAN); proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_qam_fec_lock_recovery, tvb, subpos + 2 , 2, ENC_BIG_ENDIAN); break; + case DOWNSTREAM_ACTIVE_CHANNEL_LIST_MAP_UCD_TRANSPORT_INDICATOR: + proto_tree_add_item (tlv_tree, hf_docsis_mdd_downstream_active_channel_list_map_ucd_transport_indicator, tvb, subpos + 2 , 1, ENC_BIG_ENDIAN); + break; } subpos += sublength + 2; } @@ -595,6 +610,11 @@ void proto_register_docsis_mdd (void) FT_UINT16, BASE_DEC, NULL, 0x0020, "CM-STATUS event QAM/FEC Lock Recovery", HFILL} }, + {&hf_docsis_mdd_downstream_active_channel_list_map_ucd_transport_indicator, + {"MAP and UCD transport indicator", "docsis_mdd.downstream_active_channel_list_map_ucd_transport_indicator", + FT_UINT8, BASE_DEC, VALS(map_ucd_transport_indicator_vals), 0x0, + "Mdd Downstream Active Channel List MAP and UCD Transport Indicator", HFILL} + }, {&hf_docsis_mdd_cm_status_event_enable_bitmask_t4_timeout, {"T4 timeout", "docsis_mdd.cm_status_event_enable_bitmask_t4_timeout", FT_UINT16, BASE_DEC, NULL, 0x0040, |