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

IEEE80211: Remove ENC_NA from string encoding 

With the recent commit changing the pre commit check, need
this to make a different change.
This commit is contained in:
John Thacker 2021-12-12 16:21:26 -05:00 committed by Wireshark GitLab Utility
parent a68be23b7e
commit 9a054d7837
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9211,7 +9211,7 @@ dissect_venue_name_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int
proto_tree_add_item(tree, hf_ieee80211_ff_anqp_venue_language,
tvb, offset, 3, ENC_ASCII|ENC_NA);
proto_tree_add_item(tree, hf_ieee80211_ff_anqp_venue_name,
tvb, offset + 3, vlen - 3, ENC_UTF_8|ENC_NA);
tvb, offset + 3, vlen - 3, ENC_UTF_8);
offset += vlen;
}
}
@ -9710,7 +9710,7 @@ dissect_hs20_anqp_operator_friendly_name(proto_tree *tree, tvbuff_t *tvb,
proto_tree_add_item(ofn_tree, hf_array[1],
tvb, offset, 3, ENC_ASCII|ENC_NA);
proto_tree_add_item(ofn_tree, hf_array[2],
tvb, offset + 3, vlen - 3, ENC_UTF_8|ENC_NA);
tvb, offset + 3, vlen - 3, ENC_UTF_8);
offset += vlen;
proto_item_set_len(pi, offset - start_offset);
@ -10095,7 +10095,7 @@ dissect_hs20_anqp_osu_providers_list(proto_tree *tree, tvbuff_t *tvb,
offset++;
proto_tree_add_item(tree, hf_ieee80211_hs20_osu_providers_ssid, tvb, offset, ssid_len,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
offset += ssid_len;
osu_prov_count = tvb_get_guint8(tvb, offset);
@ -10126,7 +10126,7 @@ dissect_hs20_anqp_icon_request(proto_tree *tree, tvbuff_t *tvb, int offset,
int end)
{
proto_tree_add_item(tree, hf_ieee80211_hs20_icon_request_filename, tvb, offset,
end - offset, ENC_UTF_8|ENC_NA);
end - offset, ENC_UTF_8);
}
static const value_string hs20_icon_download_status_vals[] = {
@ -10158,7 +10158,7 @@ dissect_hs20_anqp_icon_binary_file(proto_tree *tree, tvbuff_t *tvb, int offset,
offset++;
proto_tree_add_item(tree, hf_ieee80211_hs20_icon_type, tvb, offset, icon_type_len,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
offset += icon_type_len;
icon_binary_data_len = tvb_get_letohs(tvb, offset);
@ -10294,7 +10294,7 @@ dissect_hs20_anqp_advice_of_charge(proto_tree *tree, tvbuff_t *tvb, int offset,
offset++;
proto_tree_add_item(aoc_tree, hf_ieee80211_hs20_anqp_aoc_nai_realm, tvb, offset,
nai_realm_len, ENC_UTF_8|ENC_NA);
nai_realm_len, ENC_UTF_8);
offset += nai_realm_len;
plan_tot_len = adv_charge_len - 3 - nai_realm_len;
@ -10320,7 +10320,7 @@ dissect_hs20_anqp_advice_of_charge(proto_tree *tree, tvbuff_t *tvb, int offset,
offset += 3;
proto_tree_add_item(plan_info_tree, hf_ieee80211_hs20_anqp_aoc_plan_information,
tvb, offset, plan_len - 6, ENC_UTF_8|ENC_NA);
tvb, offset, plan_len - 6, ENC_UTF_8);
offset += plan_len - 6;
plan_index++;