diff options
| author | Evan Huus <eapache@gmail.com> | 2012-10-26 01:59:17 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2012-10-26 01:59:17 +0000 |
| commit | 361aedec1f819365bd89143185892e2c7fa38efd (patch) | |
| tree | a6ac4a3aa66e73b5673b988dc6a4e8ee7fd97979 /epan/dissectors/packet-ieee80211.c | |
| parent | c6b522bc703bd91b5c473491a68e92b5319e819c (diff) | |
Create SET_ADDRESS_HF that takes an additional hf_ value that can be
used to override the filter generated from the address column.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728 (again).
svn path=/trunk/; revision=45792
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 15836c5eac..4ad70ff42c 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -11399,15 +11399,15 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, src = tvb_get_ptr (tvb, 10, 6); dst = tvb_get_ptr (tvb, 4, 6); - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, src); - SET_ADDRESS(&pinfo->src, AT_ETHER, 6, src); - SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, dst); - SET_ADDRESS(&pinfo->dst, AT_ETHER, 6, dst); + SET_ADDRESS_HF(&pinfo->dl_src, AT_ETHER, 6, src, hf_ieee80211_addr_sa); + SET_ADDRESS_HF(&pinfo->src, AT_ETHER, 6, src, hf_ieee80211_addr_sa); + SET_ADDRESS_HF(&pinfo->dl_dst, AT_ETHER, 6, dst, hf_ieee80211_addr_da); + SET_ADDRESS_HF(&pinfo->dst, AT_ETHER, 6, dst, hf_ieee80211_addr_da); /* for tap */ - SET_ADDRESS(&whdr->bssid, AT_ETHER, 6, tvb_get_ptr(tvb, 16,6)); - SET_ADDRESS(&whdr->src, AT_ETHER, 6, src); - SET_ADDRESS(&whdr->dst, AT_ETHER, 6, dst); + SET_ADDRESS_HF(&whdr->bssid, AT_ETHER, 6, tvb_get_ptr(tvb, 16,6), hf_ieee80211_addr_bssid); + SET_ADDRESS_HF(&whdr->src, AT_ETHER, 6, src, hf_ieee80211_addr_sa); + SET_ADDRESS_HF(&whdr->dst, AT_ETHER, 6, dst, hf_ieee80211_addr_da); whdr->type = frame_type_subtype; seq_control = tvb_get_letohs(tvb, 22); @@ -11779,16 +11779,16 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, break; } - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, src); - SET_ADDRESS(&pinfo->src, AT_ETHER, 6, src); - SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, dst); - SET_ADDRESS(&pinfo->dst, AT_ETHER, 6, dst); + SET_ADDRESS_HF(&pinfo->dl_src, AT_ETHER, 6, src, hf_ieee80211_addr_sa); + SET_ADDRESS_HF(&pinfo->src, AT_ETHER, 6, src, hf_ieee80211_addr_sa); + SET_ADDRESS_HF(&pinfo->dl_dst, AT_ETHER, 6, dst, hf_ieee80211_addr_da); + SET_ADDRESS_HF(&pinfo->dst, AT_ETHER, 6, dst, hf_ieee80211_addr_da); /* for tap */ - SET_ADDRESS(&whdr->bssid, AT_ETHER, 6, bssid); - SET_ADDRESS(&whdr->src, AT_ETHER, 6, src); - SET_ADDRESS(&whdr->dst, AT_ETHER, 6, dst); + SET_ADDRESS_HF(&whdr->bssid, AT_ETHER, 6, bssid, hf_ieee80211_addr_bssid); + SET_ADDRESS_HF(&whdr->src, AT_ETHER, 6, src, hf_ieee80211_addr_sa); + SET_ADDRESS_HF(&whdr->dst, AT_ETHER, 6, dst, hf_ieee80211_addr_da); whdr->type = frame_type_subtype; seq_control = tvb_get_letohs(tvb, 22); |