forked from osmocom/wireshark
From Pontus Fuchs via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6548
80211 QoS Control: Add Raw TID svn path=/trunk/; revision=39754
This commit is contained in:
parent
82186b84df
commit
40d6131f1b
|
@ -1448,6 +1448,7 @@ static int hf_ieee80211_addr = -1; /* Source or destination address subfield */
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
/* Header values for QoS control field */
|
/* Header values for QoS control field */
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
|
static int hf_ieee80211_qos_tid = -1;
|
||||||
static int hf_ieee80211_qos_priority = -1;
|
static int hf_ieee80211_qos_priority = -1;
|
||||||
static int hf_ieee80211_qos_ack_policy = -1;
|
static int hf_ieee80211_qos_ack_policy = -1;
|
||||||
static int hf_ieee80211_qos_amsdu_present = -1;
|
static int hf_ieee80211_qos_amsdu_present = -1;
|
||||||
|
@ -10676,6 +10677,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
|
||||||
proto_item *qos_fields;
|
proto_item *qos_fields;
|
||||||
proto_tree *qos_tree;
|
proto_tree *qos_tree;
|
||||||
|
|
||||||
|
guint16 qos_tid;
|
||||||
guint16 qos_priority;
|
guint16 qos_priority;
|
||||||
guint16 qos_ack_policy;
|
guint16 qos_ack_policy;
|
||||||
guint16 qos_amsdu_present;
|
guint16 qos_amsdu_present;
|
||||||
|
@ -10686,12 +10688,16 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
|
||||||
"QoS Control");
|
"QoS Control");
|
||||||
qos_tree = proto_item_add_subtree (qos_fields, ett_qos_parameters);
|
qos_tree = proto_item_add_subtree (qos_fields, ett_qos_parameters);
|
||||||
|
|
||||||
|
qos_tid = QOS_TID(qos_control);
|
||||||
qos_priority = QOS_PRIORITY(qos_control);
|
qos_priority = QOS_PRIORITY(qos_control);
|
||||||
qos_ack_policy = QOS_ACK_POLICY(qos_control);
|
qos_ack_policy = QOS_ACK_POLICY(qos_control);
|
||||||
qos_amsdu_present = QOS_AMSDU_PRESENT(qos_control);
|
qos_amsdu_present = QOS_AMSDU_PRESENT(qos_control);
|
||||||
qos_eosp = QOS_EOSP(qos_control);
|
qos_eosp = QOS_EOSP(qos_control);
|
||||||
qos_field_content = QOS_FIELD_CONTENT(qos_control);
|
qos_field_content = QOS_FIELD_CONTENT(qos_control);
|
||||||
|
|
||||||
|
proto_tree_add_uint (qos_tree, hf_ieee80211_qos_tid, tvb,
|
||||||
|
qosoff, 1, qos_tid);
|
||||||
|
|
||||||
proto_tree_add_uint_format (qos_tree, hf_ieee80211_qos_priority, tvb,
|
proto_tree_add_uint_format (qos_tree, hf_ieee80211_qos_priority, tvb,
|
||||||
qosoff, 1, qos_priority,
|
qosoff, 1, qos_priority,
|
||||||
"Priority: %d (%s) (%s)",
|
"Priority: %d (%s) (%s)",
|
||||||
|
@ -12197,6 +12203,10 @@ proto_register_ieee80211 (void)
|
||||||
{"Sequence number", "wlan.seq", FT_UINT16, BASE_DEC, NULL, 0,
|
{"Sequence number", "wlan.seq", FT_UINT16, BASE_DEC, NULL, 0,
|
||||||
NULL, HFILL }},
|
NULL, HFILL }},
|
||||||
|
|
||||||
|
{&hf_ieee80211_qos_tid,
|
||||||
|
{"TID", "wlan.qos.tid", FT_UINT16, BASE_DEC, NULL, 0,
|
||||||
|
"TID", HFILL }},
|
||||||
|
|
||||||
{&hf_ieee80211_qos_priority,
|
{&hf_ieee80211_qos_priority,
|
||||||
{"Priority", "wlan.qos.priority", FT_UINT16, BASE_DEC, NULL, 0,
|
{"Priority", "wlan.qos.priority", FT_UINT16, BASE_DEC, NULL, 0,
|
||||||
"802.1D Tag", HFILL }},
|
"802.1D Tag", HFILL }},
|
||||||
|
|
Loading…
Reference in New Issue