diff options
author | Bruno Verstuyft <bruno.verstuyft@excentis.com> | 2019-07-01 12:00:31 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2019-07-02 07:11:52 +0000 |
commit | f64990438c64e86074d51845cb6f7dd791668f46 (patch) | |
tree | 67376c6c2a9f3571eece448d2291db8416977446 /epan/dissectors/packet-xra.c | |
parent | 9efddcef85ab594f0efb942362ebd9b747c2f055 (diff) |
XRA: adding packettype OFDM PLC MMM
Change-Id: I9cf97d372b0e15c3b2b6fc22e449079cce0ffa83
Reviewed-on: https://code.wireshark.org/review/33798
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-xra.c')
-rw-r--r-- | epan/dissectors/packet-xra.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-xra.c b/epan/dissectors/packet-xra.c index 64e1182cc1..1971c35d58 100644 --- a/epan/dissectors/packet-xra.c +++ b/epan/dissectors/packet-xra.c @@ -192,6 +192,7 @@ static int dissect_ofdma_segment(tvbuff_t * tvb, packet_info* pinfo, proto_tree #define XRA_PACKETTYPE_OFDM_DOCSIS 8 #define XRA_PACKETTYPE_OFDM_NCP 9 #define XRA_PACKETTYPE_OFDM_PLC 10 +#define XRA_PACKETTYPE_OFDM_PLC_MMM 11 #define XRA_PACKETTYPE_TDMA_BURST 65 #define XRA_PACKETTYPE_OFDMA_DATA_BURST 72 @@ -272,6 +273,7 @@ static const value_string packettype[] = { {XRA_PACKETTYPE_OFDM_DOCSIS, "OFDM DOCSIS"}, {XRA_PACKETTYPE_OFDM_NCP, "OFDM NCP"}, {XRA_PACKETTYPE_OFDM_PLC, "OFDM PLC"}, + {XRA_PACKETTYPE_OFDM_PLC_MMM, "OFDM PLC MMM"}, {XRA_PACKETTYPE_TDMA_BURST, "TDMA Burst"}, {XRA_PACKETTYPE_OFDMA_DATA_BURST, "OFDMA Data Burst"}, {XRA_PACKETTTYPE_OFDMA_INITIAL_RANGING, "OFDMA Initial Ranging"}, @@ -421,6 +423,7 @@ dissect_xra(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _ switch(packet_type) { case XRA_PACKETTYPE_DS_SCQAM_DOCSIS_MACFRAME: case XRA_PACKETTYPE_OFDM_DOCSIS: + case XRA_PACKETTYPE_OFDM_PLC_MMM: /*Calling docsis dissector*/ docsis_tvb = tvb_new_subset_remaining(tvb, xra_length); if (docsis_handle) { @@ -680,7 +683,7 @@ dissect_xra_tlv(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* da break; case XRA_ESTIMATED_POWER_LEVEL: power_level = ((gint16) (256*tvb_get_guint8(tvb, tlv_index) + tvb_get_guint8(tvb, tlv_index+1)) )/10.0; - proto_tree_add_double_format_value(xra_tlv_tree, hf_xra_tlv_power_level, tvb, tlv_index, length, power_level, "%.1f dB", power_level); + proto_tree_add_double_format_value(xra_tlv_tree, hf_xra_tlv_power_level, tvb, tlv_index, length, power_level, "%.1f dBmV", power_level); break; case XRA_SUBSLOT_ID: proto_tree_add_item (xra_tlv_tree, hf_xra_tlv_subslot_id, tvb, tlv_index, length, ENC_BIG_ENDIAN); |