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

IEEE802.11: HS2.0 ANQP Friendly Name Subtree Fix 

Set index start to 1 for Friendly Operator Name subtree.
Moved lang code and name string within subtree.

Bug: 16534
Change-Id: I0fd4d926f585ec432a869c7a15e13b84d5d0f2fb
Reviewed-on: https://code.wireshark.org/review/36996
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Matthew Weant 2020-05-01 04:36:44 -07:00 committed by Anders Broman
parent 9279be0394
commit 87f320ec25
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7877,7 +7877,7 @@ dissect_hs20_anqp_operator_friendly_name(proto_tree *tree, tvbuff_t *tvb,
int start_offset = offset;
ofn_tree = proto_tree_add_subtree_format(tree, tvb, offset, -1, ett_val,
&pi, "Friendly Name %d", ofn_index);
&pi, "Friendly Name [%d]", ofn_index + 1);
item = proto_tree_add_item(ofn_tree, hf_array[0],
tvb, offset, 1, ENC_LITTLE_ENDIAN);
@ -7886,9 +7886,9 @@ dissect_hs20_anqp_operator_friendly_name(proto_tree *tree, tvbuff_t *tvb,
expert_add_info(pinfo, item, &ei_hs20_anqp_ofn_length);
break;
}
proto_tree_add_item(tree, hf_array[1],
proto_tree_add_item(ofn_tree, hf_array[1],
tvb, offset, 3, ENC_ASCII|ENC_NA);
proto_tree_add_item(tree, hf_array[2],
proto_tree_add_item(ofn_tree, hf_array[2],
tvb, offset + 3, vlen - 3, ENC_UTF_8|ENC_NA);
offset += vlen;