diff options
author | Guy Harris <guy@alum.mit.edu> | 2015-08-05 19:45:12 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2015-08-06 02:45:37 +0000 |
commit | c6889d8a505c7f0da7804a89231cecb0017b6015 (patch) | |
tree | eef7dece0ce7381a9633cd05ed1e2eea8535d4a9 /epan/dissectors/packet-ieee80211.c | |
parent | f30ac4a41cc29f28056f2a115187b787dbb29543 (diff) |
Fix some encoding arguments.
802.11 is overwhelmingly little-endian; change all 1-byte fields that
were ENC_BIG_ENDIAN to ENC_LITTLE_ENDIAN.
Change one ENC_BIG_ENDIAN MAC address to ENC_NA; byte order doesn't
apply to them.
The remaining ENC_BIG_ENDIANs should be checked.
Change-Id: I3dc51a5555b99c25dce0d3b7f3be4c441b13d1a3
Reviewed-on: https://code.wireshark.org/review/9890
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
-rw-r--r-- | epan/dissectors/packet-ieee80211.c | 206 |
1 files changed, 103 insertions, 103 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index ce32875652..d4d9258eba 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -6062,14 +6062,14 @@ dissect_advertisement_protocol(packet_info *pinfo, proto_tree *tree, proto_tree_add_item(adv_tuple_tree, hf_ieee80211_tag_adv_proto_resp_len_limit, tvb, - offset, 1, ENC_BIG_ENDIAN); + offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(adv_tuple_tree, hf_ieee80211_tag_adv_proto_pame_bi, tvb, - offset, 1, ENC_BIG_ENDIAN); + offset, 1, ENC_LITTLE_ENDIAN); offset += 1; left--; proto_tree_add_item(adv_tuple_tree, hf_ieee80211_tag_adv_proto_id, tvb, - offset, 1, ENC_BIG_ENDIAN); + offset, 1, ENC_LITTLE_ENDIAN); offset += 1; left--; @@ -6213,9 +6213,9 @@ static void dissect_venue_info(proto_tree *tree, tvbuff_t *tvb, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_venue_info_group, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_ff_venue_info_type, - tvb, offset + 1, 1, ENC_BIG_ENDIAN); + tvb, offset + 1, 1, ENC_LITTLE_ENDIAN); } static void @@ -6228,7 +6228,7 @@ dissect_venue_name_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int while (offset + 4 <= end) { guint8 vlen = tvb_get_guint8(tvb, offset); item = proto_tree_add_item(tree, hf_ieee80211_ff_anqp_venue_length, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; if ((vlen > (end - offset)) || (vlen < 3)) { expert_add_info(pinfo, item, &ei_ieee80211_ff_anqp_venue_length); @@ -6256,7 +6256,7 @@ dissect_network_auth_type(proto_tree *tree, tvbuff_t *tvb, int offset, int end) while (offset + 3 <= end) { guint16 len; proto_tree_add_item(tree, hf_ieee80211_ff_anqp_nw_auth_type_indicator, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; len = tvb_get_letohs(tvb, offset); proto_tree_add_item(tree, hf_ieee80211_ff_anqp_nw_auth_type_url_len, @@ -6291,7 +6291,7 @@ dissect_roaming_consortium_list(proto_tree *tree, tvbuff_t *tvb, packet_info *pi len = tvb_get_guint8(tvb, offset); item = proto_tree_add_item(tree, hf_ieee80211_ff_anqp_roaming_consortium_oi_len, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; if ((len > (end - offset)) || (len < 3)) { expert_add_info(pinfo, item, &ei_ieee80211_ff_anqp_roaming_consortium_oi_len); @@ -6329,9 +6329,9 @@ dissect_ip_addr_type_availability_info(proto_tree *tree, tvbuff_t *tvb, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_anqp_ip_addr_avail_ipv6, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_ff_anqp_ip_addr_avail_ipv4, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); } static const value_string nai_realm_encoding_vals[] = { @@ -6473,21 +6473,21 @@ dissect_3gpp_cellular_network_info(proto_tree *tree, tvbuff_t *tvb, packet_info proto_item *item; /* See Annex A of 3GPP TS 24.234 v8.1.0 for description */ - proto_tree_add_item(tree, hf_ieee80211_3gpp_gc_gud, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_3gpp_gc_gud, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_ieee80211_3gpp_gc_udhl, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_3gpp_gc_udhl, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; iei = tvb_get_guint8(tvb, offset); - item = proto_tree_add_item(tree, hf_ieee80211_3gpp_gc_iei, tvb, offset, 1, ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_ieee80211_3gpp_gc_iei, tvb, offset, 1, ENC_LITTLE_ENDIAN); if (iei == 0) proto_item_append_text(item, " (PLMN List)"); else return; offset += 1; - proto_tree_add_item(tree, hf_ieee80211_3gpp_gc_plmn_len, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_3gpp_gc_plmn_len, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; num = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_ieee80211_3gpp_gc_num_plmns, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_3gpp_gc_num_plmns, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; while (num > 0) { if (tvb_reported_length_remaining(tvb, offset) < 3) @@ -6506,7 +6506,7 @@ dissect_domain_name_list(proto_tree *tree, tvbuff_t *tvb, int offset, int end) while (offset < end) { len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_ieee80211_ff_anqp_domain_name_len, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_ieee80211_ff_anqp_domain_name, tvb, offset, len, ENC_ASCII|ENC_NA); @@ -7705,7 +7705,7 @@ static guint add_ff_pa_action_code(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_public_action, tvb, offset, 1, - ENC_BIG_ENDIAN); + ENC_LITTLE_ENDIAN); return 1; } @@ -7713,7 +7713,7 @@ static guint add_ff_ppa_action_code(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_protected_public_action, tvb, offset, 1, - ENC_BIG_ENDIAN); + ENC_LITTLE_ENDIAN); return 1; } @@ -8461,7 +8461,7 @@ static guint add_ff_ft_action_code(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_ft_action_code, tvb, offset, 1, - ENC_BIG_ENDIAN); + ENC_LITTLE_ENDIAN); return 1; } @@ -8493,9 +8493,9 @@ static guint add_ff_gas_fragment_id(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_gas_fragment_id, tvb, offset, 1, - ENC_BIG_ENDIAN); + ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_ff_more_gas_fragments, tvb, offset, 1, - ENC_BIG_ENDIAN); + ENC_LITTLE_ENDIAN); return 1; } @@ -8503,7 +8503,7 @@ static guint add_ff_sa_query_action_code(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_sa_query_action_code, tvb, offset, - 1, ENC_BIG_ENDIAN); + 1, ENC_LITTLE_ENDIAN); return 1; } @@ -8524,7 +8524,7 @@ add_ff_tdls_action_code(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int val_to_str_ext_const(code, &tdls_action_codes_ext, "Unknown TDLS Action")); proto_tree_add_item(tree, hf_ieee80211_ff_tdls_action_code, tvb, offset, 1, - ENC_BIG_ENDIAN); + ENC_LITTLE_ENDIAN); return 1; } @@ -8532,7 +8532,7 @@ static guint add_ff_target_channel(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_target_channel, tvb, offset, 1, - ENC_BIG_ENDIAN); + ENC_LITTLE_ENDIAN); return 1; } @@ -8540,7 +8540,7 @@ static guint add_ff_operating_class(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_operating_class, tvb, offset, 1, - ENC_BIG_ENDIAN); + ENC_LITTLE_ENDIAN); return 1; } @@ -8552,7 +8552,7 @@ add_ff_wnm_action_code(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int code = tvb_get_guint8(tvb, offset); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(code, &wnm_action_codes_ext, "Unknown WNM Action")); - proto_tree_add_item(tree, hf_ieee80211_ff_wnm_action_code, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_ff_wnm_action_code, tvb, offset, 1, ENC_LITTLE_ENDIAN); return 1; } @@ -8564,7 +8564,7 @@ add_ff_unprotected_wnm_action_code(proto_tree *tree, tvbuff_t *tvb, packet_info code = tvb_get_guint8(tvb, offset); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(code, &unprotected_wnm_action_codes_ext, "Unknown Unprotected WNM Action")); - proto_tree_add_item(tree, hf_ieee80211_ff_unprotected_wnm_action_code, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_ff_unprotected_wnm_action_code, tvb, offset, 1, ENC_LITTLE_ENDIAN); return 1; } @@ -10081,9 +10081,9 @@ dissect_vendor_ie_wpawme(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, in /* Check if OUI is 00:50:F2 (WFA) */ if (tvb_get_ntoh24(tvb, offset) == OUI_WPAWME) { - proto_tree_add_item(wpa_mcs_tree, hf_ieee80211_wfa_ie_wpa_mcs_wfa_type, tvb, offset + 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(wpa_mcs_tree, hf_ieee80211_wfa_ie_wpa_mcs_wfa_type, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); } else { - proto_tree_add_item(wpa_mcs_tree, hf_ieee80211_wfa_ie_wpa_mcs_type, tvb, offset + 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(wpa_mcs_tree, hf_ieee80211_wfa_ie_wpa_mcs_type, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); } offset += 4; @@ -10103,10 +10103,10 @@ dissect_vendor_ie_wpawme(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, in /* Check if OUI is 00:50:F2 (WFA) */ if (tvb_get_ntoh24(tvb, offset) == OUI_WPAWME) { - proto_tree_add_item(wpa_sub_ucs_tree, hf_ieee80211_wfa_ie_wpa_ucs_wfa_type, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(wpa_sub_ucs_tree, hf_ieee80211_wfa_ie_wpa_ucs_wfa_type, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(wpa_ucs_item, " %s", wpa_ucs_return(tvb_get_ntohl(tvb, offset))); } else { - proto_tree_add_item(wpa_sub_ucs_tree, hf_ieee80211_wfa_ie_wpa_ucs_type, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(wpa_sub_ucs_tree, hf_ieee80211_wfa_ie_wpa_ucs_type, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); } offset += 4; } @@ -10127,10 +10127,10 @@ dissect_vendor_ie_wpawme(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, in /* Check if OUI is 00:50:F2 (WFA) */ if (tvb_get_ntoh24(tvb, offset) == OUI_WPAWME) { - proto_tree_add_item(wpa_sub_akms_tree, hf_ieee80211_wfa_ie_wpa_akms_wfa_type, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(wpa_sub_akms_tree, hf_ieee80211_wfa_ie_wpa_akms_wfa_type, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(wpa_akms_item, " %s", wpa_akms_return(tvb_get_ntohl(tvb, offset))); } else { - proto_tree_add_item(wpa_sub_akms_tree, hf_ieee80211_wfa_ie_wpa_akms_type, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(wpa_sub_akms_tree, hf_ieee80211_wfa_ie_wpa_akms_type, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); } offset += 4; } @@ -10596,9 +10596,9 @@ dissect_vendor_ie_aironet(proto_item *aironet_item, proto_tree *ietree, case AIRONET_IE_QBSS_V2: /* Extract Values */ proto_tree_add_item (ietree, hf_ieee80211_qbss2_scount, tvb, offset, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item (ietree, hf_ieee80211_qbss2_cu, tvb, offset + 2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (ietree, hf_ieee80211_qbss2_cal, tvb, offset + 3, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (ietree, hf_ieee80211_qbss2_gl, tvb, offset + 4, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (ietree, hf_ieee80211_qbss2_cu, tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (ietree, hf_ieee80211_qbss2_cal, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item (ietree, hf_ieee80211_qbss2_gl, tvb, offset + 4, 1, ENC_LITTLE_ENDIAN); break; case AIRONET_IE_CLIENT_MFP: proto_tree_add_item (ietree, hf_ieee80211_aironet_ie_clientmfp, tvb, offset, 1, ENC_LITTLE_ENDIAN); @@ -10807,9 +10807,9 @@ dissect_rsn_ie(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, /* Check if OUI is 00:0F:AC (ieee80211) */ if (tvb_get_ntoh24(tvb, offset) == OUI_RSN) { - proto_tree_add_item(rsn_gcs_tree, hf_ieee80211_rsn_gcs_80211_type, tvb, offset + 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rsn_gcs_tree, hf_ieee80211_rsn_gcs_80211_type, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); } else { - proto_tree_add_item(rsn_gcs_tree, hf_ieee80211_rsn_gcs_type, tvb, offset + 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rsn_gcs_tree, hf_ieee80211_rsn_gcs_type, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); } offset += 4; @@ -10836,10 +10836,10 @@ dissect_rsn_ie(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, /* Check if OUI is 00:0F:AC (ieee80211) */ if (tvb_get_ntoh24(tvb, offset) == OUI_RSN) { - proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_80211_type, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_80211_type, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(rsn_pcs_item, " %s", rsn_pcs_return(tvb_get_ntohl(tvb, offset))); } else { - proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_type, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_type, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); } offset += 4; } @@ -10872,10 +10872,10 @@ dissect_rsn_ie(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, /* Check if OUI is 00:0F:AC (ieee80211) */ if (tvb_get_ntoh24(tvb, offset) == OUI_RSN) { - proto_tree_add_item(rsn_sub_akms_tree, hf_ieee80211_rsn_akms_80211_type, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rsn_sub_akms_tree, hf_ieee80211_rsn_akms_80211_type, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(rsn_akms_item, " %s", rsn_akms_return(tvb_get_ntohl(tvb, offset))); } else { - proto_tree_add_item(rsn_sub_akms_tree, hf_ieee80211_rsn_akms_type, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rsn_sub_akms_tree, hf_ieee80211_rsn_akms_type, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); } offset += 4; } @@ -10928,9 +10928,9 @@ dissect_rsn_ie(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, /* Check if OUI is 00:0F:AC (ieee80211) */ if (tvb_get_ntoh24(tvb, offset) == OUI_RSN) { - proto_tree_add_item(rsn_gmcs_tree, hf_ieee80211_rsn_gmcs_80211_type, tvb, offset + 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rsn_gmcs_tree, hf_ieee80211_rsn_gmcs_80211_type, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); } else { - proto_tree_add_item(rsn_gmcs_tree, hf_ieee80211_rsn_gmcs_type, tvb, offset + 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rsn_gmcs_tree, hf_ieee80211_rsn_gmcs_type, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); } offset += 4; @@ -11332,11 +11332,11 @@ dissect_mobility_domain(proto_tree *tree, tvbuff_t *tvb, int offset, proto_tree_add_item(tree, hf_ieee80211_tag_mobility_domain_mdid, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_mobility_domain_ft_capab, - tvb, offset + 2, 1, ENC_BIG_ENDIAN); + tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_mobility_domain_ft_capab_ft_over_ds, - tvb, offset + 2, 1, ENC_BIG_ENDIAN); + tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_mobility_domain_ft_capab_resource_req, - tvb, offset + 2, 1, ENC_BIG_ENDIAN); + tvb, offset + 2, 1, ENC_LITTLE_ENDIAN); } static void @@ -11369,12 +11369,12 @@ dissect_fast_bss_transition(proto_tree *tree, tvbuff_t *tvb, int offset, guint8 id, len; int s_end; proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_id, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); id = tvb_get_guint8(tvb, offset); offset += 1; proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_len, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); len = tvb_get_guint8(tvb, offset); offset += 1; @@ -11399,7 +11399,7 @@ dissect_fast_bss_transition(proto_tree *tree, tvbuff_t *tvb, int offset, if (offset > s_end) break; proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_gtk_key_length, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; if (offset > s_end) break; @@ -11427,7 +11427,7 @@ dissect_fast_bss_transition(proto_tree *tree, tvbuff_t *tvb, int offset, if (offset > s_end) break; proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_igtk_key_length, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; if (offset > s_end) break; @@ -11478,7 +11478,7 @@ dissect_ssid_list(proto_tree *tree, tvbuff_t *tvb, int offset, guint32 tag_len) first = FALSE; entry = proto_tree_add_subtree_format(tree, tvb, offset, 2 + len, ett_ssid_list, NULL, "SSID: %s", str); proto_tree_add_item(entry, hf_ieee80211_tag_number, tvb, offset, 1, - ENC_BIG_ENDIAN); + ENC_LITTLE_ENDIAN); offset++; proto_tree_add_uint(entry, hf_ieee80211_tag_length, tvb, offset, 1, len); offset++; @@ -11571,7 +11571,7 @@ dissect_pti_control(proto_tree *tree, tvbuff_t *tvb, int offset, } proto_tree_add_item(tree, hf_ieee80211_tag_pti_control_tid, tvb, - offset, 1, ENC_BIG_ENDIAN); + offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_ieee80211_tag_pti_control_sequence_control, tvb, @@ -11590,13 +11590,13 @@ dissect_pu_buffer_status(proto_tree *tree, tvbuff_t *tvb, int offset, } proto_tree_add_item(tree, hf_ieee80211_tag_pu_buffer_status_ac_bk, tvb, - offset, 1, ENC_BIG_ENDIAN); + offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_pu_buffer_status_ac_be, tvb, - offset, 1, ENC_BIG_ENDIAN); + offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_pu_buffer_status_ac_vi, tvb, - offset, 1, ENC_BIG_ENDIAN); + offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_pu_buffer_status_ac_vo, tvb, - offset, 1, ENC_BIG_ENDIAN); + offset, 1, ENC_LITTLE_ENDIAN); } static void @@ -11606,7 +11606,7 @@ dissect_timeout_interval(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, in proto_item *pi; pi = proto_tree_add_item(tree, hf_ieee80211_tag_timeout_int_type, tvb, - offset, 1, ENC_BIG_ENDIAN); + offset, 1, ENC_LITTLE_ENDIAN); if (tag_len < 5) { expert_add_info_format(pinfo, pi, &ei_ieee80211_tag_length, "Timeout Interval content length must be at least " @@ -13203,15 +13203,15 @@ dissect_interworking(packet_info *pinfo, proto_tree *tree, proto_item *item, } proto_tree_add_item(tree, hf_ieee80211_tag_interworking_access_network_type, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_interworking_internet, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_interworking_asra, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_interworking_esr, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_interworking_uesa, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; if ((len == (1 + 2)) || (len == (1 + 2 + 6))) { @@ -13338,16 +13338,16 @@ dissect_roaming_consortium(packet_info *pinfo, proto_tree *tree, } proto_tree_add_item(tree, hf_ieee80211_tag_roaming_consortium_num_anqp_oi, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; oi_lens = tvb_get_guint8(tvb, offset); oi1_len = oi_lens & 0x0f; oi2_len = (oi_lens & 0xf0) >> 4; proto_tree_add_item(tree, hf_ieee80211_tag_roaming_consortium_oi1_len, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_roaming_consortium_oi2_len, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; if (offset + oi1_len > end) { @@ -13566,7 +13566,7 @@ ieee80211_tag_supp_rates(packet_info *pinfo, proto_tree *tree, while (offset < tag_end) { proto_tree_add_item(tree, hf_ieee80211_tag_supp_rates, tvb, offset, 1, - ENC_BIG_ENDIAN); + ENC_LITTLE_ENDIAN); proto_item_append_text(ti, " %s,", val_to_str_ext_const(tvb_get_guint8(tvb, offset), &ieee80211_supported_rates_vals_ext, @@ -13628,7 +13628,7 @@ ieee80211_tag_ds_parameter(packet_info *pinfo, proto_tree *tree, offset += 2; proto_tree_add_item(tree, hf_ieee80211_tag_ds_param_channel, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(ti, ": Current Channel: %u", tvb_get_guint8(tvb, offset)); @@ -13655,12 +13655,12 @@ ieee80211_tag_cf_parameter(packet_info *pinfo, proto_tree *tree, offset += 2; proto_tree_add_item(tree, hf_ieee80211_tag_cfp_count, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(ti, ": CFP count %u", tvb_get_guint8(tvb, offset)); offset += 1; proto_tree_add_item(tree, hf_ieee80211_tag_cfp_period, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(ti, ": CFP Period %u", tvb_get_guint8(tvb, offset)); offset += 1; @@ -13779,7 +13779,7 @@ ieee80211_tag_country_info(packet_info *pinfo, proto_tree *tree, offset += 2; proto_tree_add_item(tree, hf_ieee80211_tag_country_info_env, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(ti, ", Environment %s", val_to_str(tvb_get_guint8(tvb, offset), environment_vals,"Unknown (0x%02x)")); @@ -13799,17 +13799,17 @@ ieee80211_tag_country_info(packet_info *pinfo, proto_tree *tree, sub_tree = proto_item_add_subtree(sub_item, ett_tag_country_fnm_tree); proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_fnm_fcn, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(sub_item, ": First Channel Number: %d", tvb_get_guint8(tvb, offset)); offset += 1; proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_fnm_nc, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(sub_item, ", Number of Channels: %d", tvb_get_guint8(tvb, offset)); offset += 1; proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_fnm_mtpl, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(sub_item, ", Maximum Transmit Power Level: %d dBm", tvb_get_guint8(tvb, offset)); @@ -13820,18 +13820,18 @@ ieee80211_tag_country_info(packet_info *pinfo, proto_tree *tree, sub_tree = proto_item_add_subtree(sub_item, ett_tag_country_rcc_tree); proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_rrc_oei, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(sub_item, ": Operating Extension Identifier: %d", tvb_get_guint8(tvb, offset)); offset += 1; proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_rrc_oc, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(sub_item, ", Operating Class: %d", tvb_get_guint8(tvb, offset)); offset += 1; proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_rrc_cc, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(sub_item, ", Coverage Class: %d", tvb_get_guint8(tvb, offset)); offset += 1; @@ -13859,12 +13859,12 @@ ieee80211_tag_fh_hopping_parameter(packet_info *pinfo, offset += 2; proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_parameter_prime_radix, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(ti, ": Prime Radix: %u", tvb_get_guint8(tvb, offset)); offset += 1; proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_parameter_nb_channels, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(ti, ", Number of Channels: %u", tvb_get_guint8(tvb, offset)); offset += 1; @@ -13888,19 +13888,19 @@ ieee80211_tag_fh_hopping_table(packet_info *pinfo, proto_tree *tree, offset += 2; proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_table_flag, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_table_number_of_sets, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_table_modulus, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_ieee80211_tag_fh_hopping_table_offset, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; while (offset < tag_end) { @@ -13942,7 +13942,7 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset } - ti_tag = proto_tree_add_item(tree, hf_ieee80211_tag_number, tvb, offset, 1, ENC_BIG_ENDIAN); + ti_tag = proto_tree_add_item(tree, hf_ieee80211_tag_number, tvb, offset, 1, ENC_LITTLE_ENDIAN); ti_len = proto_tree_add_uint(tree, hf_ieee80211_tag_length, tvb, offset + 1, 1, tag_len); if (tag_len > (guint)tvb_reported_length_remaining(tvb, offset)) { expert_add_info_format(pinfo, ti_len, &ei_ieee80211_tag_length, @@ -13993,7 +13993,7 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset case TAG_REQUEST: /* 7.3.2.12 Request information element (10) */ while (offset < tag_end) { - proto_tree_add_item(tree, hf_ieee80211_tag_request, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_tag_request, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; } break; @@ -14014,8 +14014,8 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset /* Extract Values */ proto_tree_add_uint(tree, hf_ieee80211_qbss_version, tvb, offset + 2, tag_len, 1); proto_tree_add_item(tree, hf_ieee80211_qbss_scount, tvb, offset + 2, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_ieee80211_qbss_cu, tvb, offset + 4, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_ieee80211_qbss_adc, tvb, offset + 5, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_qbss_cu, tvb, offset + 4, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_qbss_adc, tvb, offset + 5, 1, ENC_LITTLE_ENDIAN); } else if (tag_len == 5) @@ -14028,7 +14028,7 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset /* Extract Values */ proto_tree_add_uint(tree, hf_ieee80211_qbss_version, tvb, offset + 2, tag_len, 2); proto_tree_add_item(tree, hf_ieee80211_qbss_scount, tvb, offset + 2, 2, ENC_LITTLE_ENDIAN); - base_item = proto_tree_add_item(tree, hf_ieee80211_qbss_cu, tvb, offset + 4, 1, ENC_BIG_ENDIAN); + base_item = proto_tree_add_item(tree, hf_ieee80211_qbss_cu, tvb, offset + 4, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(base_item, " (%d%%)", 100*tvb_get_guint8(tvb, offset + 4)/255); base_item = proto_tree_add_item(tree, hf_ieee80211_qbss_adc, tvb, offset + 5, 2, ENC_LITTLE_ENDIAN); proto_item_append_text(base_item, " (%d us/s)", tvb_get_letohs(tvb, offset + 5)*32); @@ -14201,9 +14201,9 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset offset += 2; proto_tree_add_item(tree, hf_ieee80211_tclas_dst_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_ieee80211_tclas_dscp, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_tclas_dscp, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_ieee80211_tclas_protocol, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_tclas_protocol, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; } else if (version == 6) @@ -14550,17 +14550,17 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset offset += sub_length; break; case MEASURE_REQ_BEACON_SUB_BRI: /* Beacon Reporting Information (1) */ - proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_bri_reporting_condition, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_bri_reporting_condition, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_bri_threshold_offset, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_bri_threshold_offset, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; break; case MEASURE_REQ_BEACON_SUB_RD: /* Reporting Detail (2) */ - proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_reporting_detail, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_reporting_detail, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; break; case MEASURE_REQ_BEACON_SUB_REQUEST: /* Request (10) */ - proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_request, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_request, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; break; case MEASURE_REQ_BEACON_SUB_APCP: /* AP Channel Report (51) */ @@ -15175,7 +15175,7 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset tag_vs_len -= 3; if (tag_len > 0) { - proto_tree_add_item(ti, hf_ieee80211_tag_vendor_oui_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti, hf_ieee80211_tag_vendor_oui_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); } switch (oui) { @@ -15497,7 +15497,7 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset offset += 2; proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_ttl, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_count, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_targ_count, tvb, offset, 1, ENC_LITTLE_ENDIAN); targs = tvb_get_guint8 (tvb, offset); offset += 1; for (i = 0; i < targs; i++) { @@ -15521,11 +15521,11 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset case TAG_RANN: { offset += 2; - proto_tree_add_item (tree, hf_ieee80211_rann_flags, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_rann_flags, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_hopcount, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_hopcount, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_ttl, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_ieee80211_ff_hwmp_ttl, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item (tree, hf_ieee80211_rann_root_sta, tvb, offset, 6, ENC_NA); offset += 6; @@ -16129,10 +16129,10 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset /* Check if OUI is 00:0F:AC (ieee80211) */ if (tvb_get_ntoh24(tvb, offset) == OUI_RSN) { - proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_80211_type, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_80211_type, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); proto_item_append_text(rsn_pcs_item, " %s", rsn_pcs_return(tvb_get_ntohl(tvb, offset))); } else { - proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_type, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_type, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); } offset += 4; } @@ -16874,7 +16874,7 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, set_dst_addr_cols(pinfo, tvb, 4, addr1_str); if (tree) { gchar* ether_name = tvb_get_ether_name(tvb, 4); - proto_tree_add_item(hdr_tree, addr1_hf, tvb, 4, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(hdr_tree, addr1_hf, tvb, 4, 6, ENC_NA); hidden_item = proto_tree_add_string (hdr_tree, addr1_hf_resolved, tvb, 4, 6, ether_name); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_item (hdr_tree, hf_ieee80211_addr, tvb, 4, 6, ENC_NA); @@ -18884,7 +18884,7 @@ dissect_data_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) type = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_ieee80211_data_encap_payload_type, tvb, offset, - 1, ENC_BIG_ENDIAN); + 1, ENC_LITTLE_ENDIAN); offset += 1; switch (type) { case 1: |