diff options
| author | Bruno Verstuyft <bruno.verstuyft@excentis.com> | 2018-09-19 14:14:24 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-09-19 14:18:48 +0000 |
| commit | ca8304249ee986f947b30eaea1d830207165c65e (patch) | |
| tree | c21a900af93746cfd2c16ff1ec0d5afd36bfbf20 | |
| parent | 2bd79c82088f92311bb67f58e8d54ff1d471a7d6 (diff) | |
XRA: Display length information in XRA protocol description. Set correct length of XRA header.
Change-Id: I8bde77dca812f2d4eeb21c8d502799894e93c463
Reviewed-on: https://code.wireshark.org/review/29741
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-xra.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/epan/dissectors/packet-xra.c b/epan/dissectors/packet-xra.c index 8f2fdaf0a1..1ffa108ac3 100644 --- a/epan/dissectors/packet-xra.c +++ b/epan/dissectors/packet-xra.c @@ -385,7 +385,7 @@ dissect_xra(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _ proto_item *it; proto_tree *xra_tree; - it = proto_tree_add_protocol_format (tree, proto_xra, tvb, 0, -1,"XRA (Excentis XRA header)"); + it = proto_tree_add_protocol_format (tree, proto_xra, tvb, 0, -1,"XRA"); xra_tree = proto_item_add_subtree (it, ett_xra); @@ -403,6 +403,10 @@ dissect_xra(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _ proto_tree_add_item_ret_uint (xra_tree, hf_xra_packettype, tvb, 1, 1, ENC_BIG_ENDIAN, &packet_type); proto_tree_add_item_ret_uint (xra_tree, hf_xra_tlvlength, tvb, 2, 2, ENC_BIG_ENDIAN, &tlv_length); + guint16 xra_length = 4 + tlv_length; + proto_item_append_text(it, " (Excentis XRA header: %d bytes). DOCSIS frame is %d bytes.", xra_length, tvb_reported_length_remaining(tvb, xra_length)); + proto_item_set_len(it, xra_length); + col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(packet_type, packettype, "Unknown XRA packet type: %u")); /*Dissecting TLVs*/ @@ -410,7 +414,6 @@ dissect_xra(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _ xra_tlv_tvb = tvb_new_subset_length(tvb, 4, tlv_length); dissect_xra_tlv(xra_tlv_tvb, pinfo, xra_tree, data, tlv_length, &segment_header_present); - guint16 xra_length = 4 + tlv_length; if(tvb_reported_length_remaining(tvb, xra_length) == 0) { return xra_length; } |