From 1c671c5542625eac9e0906fbcbd4f0859f35d40c Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 1 Oct 2015 20:55:19 -0400 Subject: [PATCH] Conversation filter address types for IEEE 802.11 should include WLAN Address types Bug: 11562 Change-Id: I49338e12c80963403c1253ec9251a3a3767f2526 Reviewed-on: https://code.wireshark.org/review/10738 Reviewed-by: Anders Broman --- epan/dissectors/packet-ieee80211.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index aae42afa67..a61b7d769f 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -5257,13 +5257,13 @@ static const value_string ff_psmp_sta_info_flags[] = { static const char* wlan_conv_get_filter_type(conv_item_t* conv, conv_filter_type_e filter) { - if ((filter == CONV_FT_SRC_ADDRESS) && (conv->src_address.type == AT_ETHER)) + if ((filter == CONV_FT_SRC_ADDRESS) && ((conv->src_address.type == AT_ETHER) || (conv->src_address.type == wlan_address_type))) return "wlan.sa"; - if ((filter == CONV_FT_DST_ADDRESS) && (conv->dst_address.type == AT_ETHER)) + if ((filter == CONV_FT_DST_ADDRESS) && ((conv->dst_address.type == AT_ETHER) || (conv->dst_address.type == wlan_address_type))) return "wlan.da"; - if ((filter == CONV_FT_ANY_ADDRESS) && (conv->src_address.type == AT_ETHER)) + if ((filter == CONV_FT_ANY_ADDRESS) && ((conv->src_address.type == AT_ETHER) || (conv->src_address.type == wlan_address_type))) return "wlan.addr"; return CONV_FILTER_INVALID;