osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Jouni Malinen: 

ieee80211: Show ANQP adv proto on subtree title line

This makes it easier to get the most significant information from the
Advertisement Protocol element in GAS messages without having to expand
subtrees.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6339

svn path=/trunk/; revision=39007
This commit is contained in:
Anders Broman 2011-09-15 06:50:26 +00:00
parent da4ffffd0a
commit ddc3393312
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3393,7 +3393,7 @@ dissect_advertisement_protocol(packet_info *pinfo, proto_tree *tree,
tvbuff_t *tvb, int offset, gboolean *anqp)
{
guint8 tag_no, tag_len, left;
proto_item *item = NULL;
proto_item *item = NULL, *adv_item;
proto_tree *adv_tree, *adv_tuple_tree;
if (anqp)
@ -3422,14 +3422,16 @@ dissect_advertisement_protocol(packet_info *pinfo, proto_tree *tree,
left = tag_len;
offset += 2;
item = proto_tree_add_text(tree, tvb, offset, left,
"Advertisement Protocol element");
adv_tree = proto_item_add_subtree(item, ett_adv_proto);
adv_item = proto_tree_add_text(tree, tvb, offset, left,
"Advertisement Protocol element");
adv_tree = proto_item_add_subtree(adv_item, ett_adv_proto);
while (left >= 2) {
guint8 id;
id = tvb_get_guint8(tvb, offset + 1);
if (id == 0)
proto_item_append_text(adv_item, ": ANQP");
item = proto_tree_add_text(adv_tree, tvb, offset, 2,
"Advertisement Protocol Tuple: %s",
val_to_str(id, adv_proto_id_vals,