diff options
| author | Bruno Verstuyft <bruno.verstuyft@excentis.com> | 2017-10-27 17:22:46 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-10-28 00:25:40 +0000 |
| commit | ce181cbc87f8c9012d6df79b1e9280908a78ec51 (patch) | |
| tree | f3c82b33dcd3060fc268529fc2a44f5421a6ac5c /plugins | |
| parent | 087faa248845059203de152b6c1cc806f89a8599 (diff) | |
DOCSIS: DPD: adding modulation list to info column
Change-Id: I5d99692d897f17e6e14952db8e4736ca65aa1373
Reviewed-on: https://code.wireshark.org/review/24106
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/docsis/packet-macmgmt.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c index 049ac3694c..75754fdcfe 100644 --- a/plugins/docsis/packet-macmgmt.c +++ b/plugins/docsis/packet-macmgmt.c @@ -5703,11 +5703,13 @@ dissect_dpd_subcarrier_assignment_range_list(tvbuff_t * tvb, packet_info * pinfo { guint32 i, subcarrier_assignment_type; proto_item* type_item; + guint modulation; type_item = proto_tree_add_item_ret_uint (tree, hf_docsis_dpd_tlv_subc_assign_type, tvb, pos, 1, ENC_BIG_ENDIAN, &subcarrier_assignment_type); proto_tree_add_item (tree, hf_docsis_dpd_tlv_subc_assign_value, tvb, pos, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_docsis_dpd_tlv_subc_assign_reserved, tvb, pos, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (tree, hf_docsis_dpd_tlv_subc_assign_modulation, tvb, pos, 1, ENC_BIG_ENDIAN); + proto_tree_add_item_ret_uint (tree, hf_docsis_dpd_tlv_subc_assign_modulation, tvb, pos, 1, ENC_BIG_ENDIAN, &modulation); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(modulation, docsis_dpd_subc_assign_modulation_str, "%s")); pos++; switch (subcarrier_assignment_type) @@ -5757,6 +5759,7 @@ dissect_dpd_tlv (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) guint pos = 0; guint length; guint8 type; + guint first_subc_assign_list = 1; it = proto_tree_add_item(tree, hf_docsis_dpd_tlv_data, tvb, 0, tvb_reported_length(tvb), ENC_NA); tlv_tree = proto_item_add_subtree (it, ett_docsis_dpd_tlv); @@ -5782,6 +5785,12 @@ dissect_dpd_tlv (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case SUBCARRIER_ASSIGNMENT_RANGE_LIST: if (length >= 5) { + if(first_subc_assign_list) { + col_append_str(pinfo->cinfo, COL_INFO, ", Modulation: "); + first_subc_assign_list = 0; + } else { + col_append_str(pinfo->cinfo, COL_INFO, " | "); + } dissect_dpd_subcarrier_assignment_range_list(tvb, pinfo, tlv_tree, pos, length); } else |