diff options
| author | Adrian Simionov <daniel.simionov@gmail.com> | 2018-10-01 15:46:50 +1000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-10-01 07:45:13 +0000 |
| commit | c3adfdf6053b6c68b9b8a7e24256340bf41dd2da (patch) | |
| tree | 317ebe5b56ea09a0e72f871453b1284fa4e0c415 | |
| parent | b3cbb4faf12691af2cc9127b36889b7593306409 (diff) | |
DOCSIS: Fix UCC-REQ
* UCC-REQ does not contain any Annex C TLVs
* Align INFO field for UCC REQ and RSP to similar DOCSIS packets
Change-Id: I2cdad12aaf5036b9130c8af3d131ee3a6b317923
Reviewed-on: https://code.wireshark.org/review/29948
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-docsis-macmgmt.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-docsis-macmgmt.c b/epan/dissectors/packet-docsis-macmgmt.c index 93a33f4641..278b6364a2 100644 --- a/epan/dissectors/packet-docsis-macmgmt.c +++ b/epan/dissectors/packet-docsis-macmgmt.c @@ -3411,7 +3411,6 @@ dissect_uccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* da proto_item *it; proto_tree *uccreq_tree; guint32 chid; - tvbuff_t *next_tvb; it = proto_tree_add_item (tree, proto_docsis_uccreq, tvb, 0, -1, ENC_NA); uccreq_tree = proto_item_add_subtree (it, ett_docsis_uccreq); @@ -3419,12 +3418,9 @@ dissect_uccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* da proto_tree_add_item_ret_uint (uccreq_tree, hf_docsis_mgt_upstream_chid, tvb, 0, 1, ENC_BIG_ENDIAN, &chid); col_add_fstr (pinfo->cinfo, COL_INFO, - "Upstream Channel Change request Channel ID = %u (U%u)", + "Upstream Channel Change request: Channel ID = %u (U%u)", chid, (chid > 0 ? chid - 1 : chid)); - /* call dissector for Appendix C TLV's */ - next_tvb = tvb_new_subset_remaining (tvb, 1); - call_dissector (docsis_tlv_handle, next_tvb, pinfo, uccreq_tree); return tvb_captured_length(tvb); } @@ -3441,7 +3437,7 @@ dissect_uccrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* da proto_tree_add_item_ret_uint (uccrsp_tree, hf_docsis_mgt_upstream_chid, tvb, 0, 1, ENC_BIG_ENDIAN, &chid); col_add_fstr (pinfo->cinfo, COL_INFO, - "Upstream Channel Change response Channel ID = %u (U%u)", + "Upstream Channel Change response: Channel ID = %u (U%u)", chid, (chid > 0 ? chid - 1 : chid)); return tvb_captured_length(tvb); |