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

33
doc/README.developer
View File

@ -611,11 +611,11 @@ note to wireshark-dev for guidance.
1.1.6 Compiler warnings
You should write code that is free of compiler warnings. Such warnings will
often indicate questionable code and sometimes even real bugs, so it's best
to avoid warnings at all.
You should write code that is free of compiler warnings. Such warnings will
often indicate questionable code and sometimes even real bugs, so it's best
to avoid warnings at all.
The compiler flags in the Makefiles are set to "treat warnings as errors",
The compiler flags in the Makefiles are set to "treat warnings as errors",
so your code won't even compile when warnings occur.
1.2 Skeleton code.
@ -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.
@ -3241,8 +3242,8 @@ This will create preferences "beep.tcp.port" and
"beep.strict_header_terminator", the first of which is an unsigned
integer and the second of which is a Boolean.
Note that a warning will pop up if you've saved such preference to the
preference file and you subsequently take the code out. The way to make
Note that a warning will pop up if you've saved such preference to the
preference file and you subsequently take the code out. The way to make
a preference obsolete is to register it as such:
/* Register a preference that used to be supported but no longer is. */
@ -3468,26 +3469,26 @@ ptvcursor_free(ptvcursor_t*)
after your dissection with the ptvcursor API is completed.
proto_tree*
proto_tree*
ptvcursor_push_subtree(ptvcursor_t *ptvc, proto_item *it, gint ett_subtree)
Pushes the current subtree in the tree stack of the cursor, creates a new
one and sets this one as the working tree.
void
void
ptvcursor_pop_subtree(ptvcursor_t *ptvc);
Pops a subtree in the tree stack of the cursor
Pops a subtree in the tree stack of the cursor
proto_tree*
ptvcursor_add_with_subtree(ptvcursor_t * ptvc, int hfindex, gint length,
proto_tree*
ptvcursor_add_with_subtree(ptvcursor_t * ptvc, int hfindex, gint length,
gboolean little_endian, gint ett_subtree);
Adds an item to the tree and creates a subtree.
Adds an item to the tree and creates a subtree.
If the length is unknown, length may be defined as
SUBTREE_UNDEFINED_LENGTH. In this case, at the next pop, the item length
will be equal to the advancement of the cursor since the creation of the
subtree.
proto_tree *
ptvcursor_add_text_with_subtree(ptvcursor_t * ptvc, gint length,
proto_tree *
ptvcursor_add_text_with_subtree(ptvcursor_t * ptvc, gint length,
gint ett_subtree, const char *format, ...);
Add a text node to the tree and create a subtree
If the length is unknown, length may be defined as

6
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().
@ -6147,7 +6147,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
qos_ack_policy = QOS_ACK_POLICY(qos_control);
qos_amsdu_present = QOS_AMSDU_PRESENT(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_format (qos_tree, hf_qos_priority, tvb,
qosoff, 1, qos_priority,
@ -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,