diff options
| author | AdrianSimionov <daniel.simionov@gmail.com> | 2016-12-18 13:00:17 +1100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-12-18 11:55:44 +0000 |
| commit | 81fc27f5d7b7fa293faf7eca4bf36af72502c421 (patch) | |
| tree | c516dd3e608660f1d84e5077a7a3eaac9d68ec03 | |
| parent | 92c725cafb37067291022d3e9d05b9cbf4624b6e (diff) | |
[docsis->type2ucd] Fix issue with decoding
Burst 4 and Burst 5 values are now properly decoded.
Change-Id: I6232a19eb849a419825be69435069e4be721cbc1
Reviewed-on: https://code.wireshark.org/review/19327
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | plugins/docsis/packet-ucd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c index ec449b6119..3b0a8d45f5 100644 --- a/plugins/docsis/packet-ucd.c +++ b/plugins/docsis/packet-ucd.c @@ -404,11 +404,11 @@ dissect_ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data endtlvpos = pos + length - 1; while (pos < endtlvpos) { + tlvtype = tvb_get_guint8 (tvb, pos); burst_tree = proto_tree_add_subtree (tlv_tree, tvb, pos, -1, ett_docsis_burst_tlv, &burst_item, - val_to_str(type, burst_tlv_vals, + val_to_str(tlvtype, burst_tlv_vals, "Unknown TLV (%u)")); - tlvtype = tvb_get_guint8 (tvb, pos); proto_tree_add_uint (burst_tree, hf_docsis_ucd_burst_type, tvb, pos++, 1, tlvtype); tlvlen = tvb_get_guint8 (tvb, pos); proto_tree_add_uint (burst_tree, hf_docsis_ucd_burst_length, tvb, pos++, 1, tlvlen); @@ -558,11 +558,11 @@ dissect_ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data endtlvpos = pos + length - 1; while (pos < endtlvpos) { + tlvtype = tvb_get_guint8 (tvb, pos); burst_tree = proto_tree_add_subtree (tlv_tree, tvb, pos, -1, ett_docsis_burst_tlv, &burst_item, - val_to_str(type, burst_tlv_vals, + val_to_str(tlvtype, burst_tlv_vals, "Unknown TLV (%u)")); - tlvtype = tvb_get_guint8 (tvb, pos); proto_tree_add_uint (burst_tree, hf_docsis_ucd_burst_type, tvb, pos++, 1, tlvtype); tlvlen = tvb_get_guint8 (tvb, pos); proto_tree_add_uint (burst_tree, hf_docsis_ucd_burst_length, tvb, pos++, 1, tlvlen); @@ -785,7 +785,7 @@ proto_register_docsis_ucd (void) }, {&hf_docsis_ucd_burst_type, {"Type", "docsis_ucd.burst.tlvtype", - FT_UINT8, BASE_DEC, VALS(channel_tlv_vals), 0x0, + FT_UINT8, BASE_DEC, VALS(burst_tlv_vals), 0x0, "Burst TLV type", HFILL} }, {&hf_docsis_ucd_burst_length, |