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

Show the bit-encoding into the (shared) 2-Byte value for 

fragment number and sequence number

Change-Id: I38bb61471fe43c5cfa8274e728a56d4cdb132ec1
Reviewed-on: https://code.wireshark.org/review/5126
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
This commit is contained in:
Joerg Mayer 2014-11-05 04:16:22 +01:00 committed by Jörg Mayer
parent aae48be5a5
commit dfb5ddb8d6
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16346,9 +16346,8 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo,
hidden_item = proto_tree_add_string (hdr_tree, hf_ieee80211_addr_resolved, tvb, 16, 6,
get_ether_name(tvb_get_ptr(tvb, 16, 6)));
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_tree_add_uint (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, frag_number);
proto_tree_add_uint (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, seq_number);
proto_tree_add_item (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
}
break;
@ -16968,8 +16967,8 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo,
hidden_item = proto_tree_add_string (hdr_tree, hf_ieee80211_addr_bssid_resolved, tvb, 16, 6,
get_ether_name(tvb_get_ptr(tvb, 16, 6)));
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_tree_add_uint (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, frag_number);
proto_tree_add_uint (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, seq_number);
proto_tree_add_item (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
/* add items for wlan.addr filter */
hidden_item = proto_tree_add_item (hdr_tree, hf_ieee80211_addr, tvb, 4, 6, ENC_NA);
@ -17010,8 +17009,8 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo,
hidden_item = proto_tree_add_string (hdr_tree, hf_ieee80211_addr_sa_resolved, tvb, 16, 6,
get_ether_name(tvb_get_ptr(tvb, 16, 6)));
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_tree_add_uint (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, frag_number);
proto_tree_add_uint (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, seq_number);
proto_tree_add_item (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
/* add items for wlan.addr filter */
hidden_item = proto_tree_add_item (hdr_tree, hf_ieee80211_addr, tvb, 4, 6, ENC_NA);
@ -17052,8 +17051,8 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo,
hidden_item = proto_tree_add_string (hdr_tree, hf_ieee80211_addr_da_resolved, tvb, 16, 6,
get_ether_name(tvb_get_ptr(tvb, 16, 6)));
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_tree_add_uint (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, frag_number);
proto_tree_add_uint (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, seq_number);
proto_tree_add_item (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
/* add items for wlan.addr filter */
hidden_item = proto_tree_add_item (hdr_tree, hf_ieee80211_addr, tvb, 4, 6, ENC_NA);
@ -17086,8 +17085,8 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo,
hidden_item = proto_tree_add_string (hdr_tree, hf_ieee80211_addr_da_resolved, tvb, 16, 6,
get_ether_name(tvb_get_ptr(tvb, 16, 6)));
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_tree_add_uint (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, frag_number);
proto_tree_add_uint (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, seq_number);
proto_tree_add_item (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item (hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item (hdr_tree, hf_ieee80211_addr_sa, tvb, 24, 6, ENC_NA);
hidden_item = proto_tree_add_string (hdr_tree, hf_ieee80211_addr_sa_resolved, tvb, 24, 6,
get_ether_name(tvb_get_ptr(tvb, 24, 6)));
@ -18706,12 +18705,12 @@ proto_register_ieee80211 (void)
{&hf_ieee80211_frag_number,
{"Fragment number", "wlan.frag",
FT_UINT16, BASE_DEC, NULL, 0,
FT_UINT16, BASE_DEC, NULL, 0x000F,
NULL, HFILL }},
{&hf_ieee80211_seq_number,
{"Sequence number", "wlan.seq",
FT_UINT16, BASE_DEC, NULL, 0,
FT_UINT16, BASE_DEC, NULL, 0xFFF0,
NULL, HFILL }},
{&hf_ieee80211_mesh_control_field,