osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Guillem Hernandez: fix decoding of EOSP bit. From Jaap Keuter: fix description of 'value' in proto_tree_add_boolean() that caused the former bug. 

svn path=/trunk/; revision=22293
This commit is contained in:
Jeff Morriss 2007-07-12 22:36:35 +00:00
parent 6d6affd859
commit 25df9f2133
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/README.developer
View File

@ -2210,8 +2210,9 @@ For proto_tree_add_ether(), the 'value_ptr' argument is a pointer to a
For proto_tree_add_string(), the 'value_ptr' argument is a pointer to a
text string.
For proto_tree_add_boolean(), the 'value' argument is a 32-bit integer;
zero means "false", and non-zero means "true".
For proto_tree_add_boolean(), the 'value' argument is a 32-bit integer.
It is masked and shifted as defined by the field info after which zero
means "false", and non-zero means "true".
For proto_tree_add_float(), the 'value' argument is a 'float' in the
host's floating-point format.

4
epan/dissectors/packet-ieee80211.c
View File

@ -275,7 +275,7 @@ int add_mimo_compressed_beamforming_feedback_report (proto_tree *tree, tvbuff_t
#define QOS_AMSDU_PRESENT(x) (((x) & 0x0080) >> 6)
#define QOS_FIELD_CONTENT(x) (((x) & 0xFF00) >> 8)
#define QOS_FLAG_EOSP 0x08
#define QOS_FLAG_EOSP 0x10
/*
* Extract subfields from the result of QOS_FIELD_CONTENT().
@ -6156,7 +6156,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
if (flags & FLAG_FROM_DS) {
proto_tree_add_boolean (qos_tree, hf_qos_eosp, tvb,
qosoff, 1, qos_eosp);
qosoff, 1, qos_control);
}
proto_tree_add_uint (qos_tree, hf_qos_ack_policy, tvb, qosoff, 1,