From e4ca11dcb4f0a535fa104ba1b685fc4eb3c16970 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Mon, 14 Jun 2010 14:34:32 +0000 Subject: From Jouni Malinen: Fix: RSN capabilities field in IEEE 802.11 RSN IE is parsed in incorrect byte order Note: this bug was introduced in SVN #32342 [3/31/10] and thus was only present in Development Wireshark versions. From me: Display 'mobility_domain_mdid' as little-endian (to be verified) svn path=/trunk/; revision=33224 --- epan/dissectors/packet-ieee80211.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index b3e43d0f02..621f749c11 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -4120,16 +4120,16 @@ dissect_rsn_ie(proto_tree * tree, tvbuff_t * tag_tvb) if (i <= count || tag_off + 2 > tag_len) goto done; - cap_item = proto_tree_add_item(tree, hf_ieee80211_rsn_cap, tag_tvb, tag_off, 2, FALSE); + cap_item = proto_tree_add_item(tree, hf_ieee80211_rsn_cap, tag_tvb, tag_off, 2, ENC_LITTLE_ENDIAN); cap_tree = proto_item_add_subtree(cap_item, ett_rsn_cap_tree); - proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_preauth, tag_tvb, tag_off, 2, FALSE); - proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_no_pairwise, tag_tvb, tag_off, 2, FALSE); - proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_ptksa_replay_counter, tag_tvb, tag_off, 2, FALSE); - proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_gtksa_replay_counter, tag_tvb, tag_off, 2, FALSE); - proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_mfpr, tag_tvb, tag_off, 2, FALSE); - proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_mfpc, tag_tvb, tag_off, 2, FALSE); - proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_peerkey, tag_tvb, tag_off, 2, FALSE); + proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_preauth, tag_tvb, tag_off, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_no_pairwise, tag_tvb, tag_off, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_ptksa_replay_counter, tag_tvb, tag_off, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_gtksa_replay_counter, tag_tvb, tag_off, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_mfpr, tag_tvb, tag_off, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_mfpc, tag_tvb, tag_off, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_rsn_cap_peerkey, tag_tvb, tag_off, 2, ENC_LITTLE_ENDIAN); tag_off += 2; if (tag_off + 2 > tag_len) @@ -4180,7 +4180,7 @@ 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, FALSE); + tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_mobility_domain_ft_capab, tvb, offset + 2, 1, FALSE); proto_tree_add_item(tree, hf_ieee80211_tag_mobility_domain_ft_capab_ft_over_ds, -- cgit v1.2.3