DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions
hostapd/wpa_supplicant/bss.c

682 lines
16 KiB
C
Raw Normal View History

Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
/*
* BSS table
Only expire scanned BSSes based on new scan results Get more information about scans when updating BSS table information. This allows the missing-from-scans expiration rule to work properly when only partial set of channels or SSIDs are being scanned.
2010-01-02 12:57:44 +01:00
* Copyright (c) 2009-2010, Jouni Malinen <j@w1.fi>
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
*
Remove the GPL notification from files contributed by Jouni Malinen Remove the GPL notification text from the files that were initially contributed by myself. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-11 15:46:35 +01:00
* This software may be distributed under the terms of the BSD license.
* See README for more details.
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
*/
#include "utils/includes.h"
#include "utils/common.h"
#include "utils/eloop.h"
#include "common/ieee802_11_defs.h"
#include "drivers/driver.h"
#include "wpa_supplicant_i.h"
Make maximum BSS table size configurable New global configuration parameter bss_max_count can now be used to change the maximum BSS table size. The old fixed size limit (200) is used as the default value for this parameter.
2010-03-05 19:20:09 +01:00
#include "config.h"
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
#include "notify.h"
Remove src/drivers/scan_helpers.c Most of this file was already moved into wpa_supplicant/scan.c and we can remove the file completely by having couple of small helper functions copied to the remaining users outside core wpa_supplicant code.
2010-01-03 19:27:32 +01:00
#include "scan.h"
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
#include "bss.h"
/**
* WPA_BSS_EXPIRATION_PERIOD - Period of expiration run in seconds
*/
#define WPA_BSS_EXPIRATION_PERIOD 10
dbus: Add BSS property change notifications
2010-01-06 19:03:01 +01:00
#define WPA_BSS_FREQ_CHANGED_FLAG BIT(0)
#define WPA_BSS_SIGNAL_CHANGED_FLAG BIT(1)
#define WPA_BSS_PRIVACY_CHANGED_FLAG BIT(2)
#define WPA_BSS_MODE_CHANGED_FLAG BIT(3)
#define WPA_BSS_WPAIE_CHANGED_FLAG BIT(4)
#define WPA_BSS_RSNIE_CHANGED_FLAG BIT(5)
#define WPA_BSS_WPS_CHANGED_FLAG BIT(6)
#define WPA_BSS_RATES_CHANGED_FLAG BIT(7)
dbus: Change WPA/RSNIE byte array props to dicts Expose RSN and WPA properties for BSS objects containing information about key management and cipher suites. Get rid of WPA/RSN/WPSIE byte array properties and add IEs byte array property with all IE data instead.
2010-01-16 15:37:37 +01:00
#define WPA_BSS_IES_CHANGED_FLAG BIT(8)
dbus: Add BSS property change notifications
2010-01-06 19:03:01 +01:00
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
static void wpa_bss_remove(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
{
dl_list_del(&bss->list);
Add BSS list sorted by id and add some helper functions This allows the BSS list to be iterated in order of increasing id to avoid problems with new scans reordering entries. The order on the wpa_s->bss list changes with most recently updated entries being moved to the tail of the list while wpa_s->bss_id list maintains its order with new entries being added to the tail and old entries being removed when they expire.
2009-12-27 23:30:38 +01:00
dl_list_del(&bss->list_id);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
wpa_s->num_bss--;
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "BSS: Remove id %u BSSID " MACSTR
" SSID '%s'", bss->id, MAC2STR(bss->bssid),
wpa_ssid_txt(bss->ssid, bss->ssid_len));
Add ctrl_iface events for BSS added/removed
2009-12-27 23:42:51 +01:00
wpas_notify_bss_removed(wpa_s, bss->bssid, bss->id);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
#ifdef CONFIG_INTERWORKING
wpabuf_free(bss->anqp_venue_name);
wpabuf_free(bss->anqp_network_auth_type);
wpabuf_free(bss->anqp_roaming_consortium);
wpabuf_free(bss->anqp_ip_addr_type_availability);
wpabuf_free(bss->anqp_nai_realm);
wpabuf_free(bss->anqp_3gpp);
wpabuf_free(bss->anqp_domain_name);
#endif /* CONFIG_INTERWORKING */
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
os_free(bss);
}
WPS: Use BSS table instead of raw scan results
2010-01-02 12:36:12 +01:00
struct wpa_bss * wpa_bss_get(struct wpa_supplicant *wpa_s, const u8 *bssid,
const u8 *ssid, size_t ssid_len)
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
{
struct wpa_bss *bss;
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
if (os_memcmp(bss->bssid, bssid, ETH_ALEN) == 0 &&
bss->ssid_len == ssid_len &&
os_memcmp(bss->ssid, ssid, ssid_len) == 0)
return bss;
}
return NULL;
}
static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src)
{
os_time_t usec;
dst->flags = src->flags;
os_memcpy(dst->bssid, src->bssid, ETH_ALEN);
dst->freq = src->freq;
dst->beacon_int = src->beacon_int;
dst->caps = src->caps;
dst->qual = src->qual;
dst->noise = src->noise;
dst->level = src->level;
dst->tsf = src->tsf;
os_get_time(&dst->last_update);
dst->last_update.sec -= src->age / 1000;
usec = (src->age % 1000) * 1000;
if (dst->last_update.usec < usec) {
dst->last_update.sec--;
dst->last_update.usec += 1000000;
}
dst->last_update.usec -= usec;
}
Drop oldest unknown BSS table entries first When the BSS table size limit has been reached, drop first the oldest BSS entries for which there is not a matching network in the configuration based on SSID (wildcards are ignored). This makes it less likely to hit connection issues in environments with huge number of visible APs.
2011-07-16 12:22:58 +02:00
static int wpa_bss_known(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
{
struct wpa_ssid *ssid;
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
if (ssid->ssid == NULL || ssid->ssid_len == 0)
continue;
if (ssid->ssid_len == bss->ssid_len &&
os_memcmp(ssid->ssid, bss->ssid, ssid->ssid_len) == 0)
return 1;
}
return 0;
}
static int wpa_bss_remove_oldest_unknown(struct wpa_supplicant *wpa_s)
{
struct wpa_bss *bss;
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
if (!wpa_bss_known(wpa_s, bss)) {
wpa_bss_remove(wpa_s, bss);
return 0;
}
}
return -1;
}
static void wpa_bss_remove_oldest(struct wpa_supplicant *wpa_s)
{
/*
* Remove the oldest entry that does not match with any configured
* network.
*/
if (wpa_bss_remove_oldest_unknown(wpa_s) == 0)
return;
/*
* Remove the oldest entry since no better candidate for removal was
* found.
*/
wpa_bss_remove(wpa_s, dl_list_first(&wpa_s->bss,
struct wpa_bss, list));
}
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
static void wpa_bss_add(struct wpa_supplicant *wpa_s,
const u8 *ssid, size_t ssid_len,
struct wpa_scan_res *res)
{
struct wpa_bss *bss;
Fetch IEs from both Beacon and Probe Response frames if available This allows the driver wrappers to return two sets of IEs, so that the BSS code can use information from both Beacon and Probe Response frames if needed. For example, some Cisco APs seem to include more information in Wireless Provisioning Services IE when it is in the Beacon frame.
2010-01-16 15:11:05 +01:00
bss = os_zalloc(sizeof(*bss) + res->ie_len + res->beacon_ie_len);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
if (bss == NULL)
return;
bss->id = wpa_s->bss_next_id++;
bss->last_update_idx = wpa_s->bss_update_idx;
wpa_bss_copy_res(bss, res);
os_memcpy(bss->ssid, ssid, ssid_len);
bss->ssid_len = ssid_len;
bss->ie_len = res->ie_len;
Fetch IEs from both Beacon and Probe Response frames if available This allows the driver wrappers to return two sets of IEs, so that the BSS code can use information from both Beacon and Probe Response frames if needed. For example, some Cisco APs seem to include more information in Wireless Provisioning Services IE when it is in the Beacon frame.
2010-01-16 15:11:05 +01:00
bss->beacon_ie_len = res->beacon_ie_len;
os_memcpy(bss + 1, res + 1, res->ie_len + res->beacon_ie_len);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
dl_list_add_tail(&wpa_s->bss, &bss->list);
Add BSS list sorted by id and add some helper functions This allows the BSS list to be iterated in order of increasing id to avoid problems with new scans reordering entries. The order on the wpa_s->bss list changes with most recently updated entries being moved to the tail of the list while wpa_s->bss_id list maintains its order with new entries being added to the tail and old entries being removed when they expire.
2009-12-27 23:30:38 +01:00
dl_list_add_tail(&wpa_s->bss_id, &bss->list_id);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
wpa_s->num_bss++;
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "BSS: Add new id %u BSSID " MACSTR
" SSID '%s'",
bss->id, MAC2STR(bss->bssid), wpa_ssid_txt(ssid, ssid_len));
Add ctrl_iface events for BSS added/removed
2009-12-27 23:42:51 +01:00
wpas_notify_bss_added(wpa_s, bss->bssid, bss->id);
Drop oldest unknown BSS table entries first When the BSS table size limit has been reached, drop first the oldest BSS entries for which there is not a matching network in the configuration based on SSID (wildcards are ignored). This makes it less likely to hit connection issues in environments with huge number of visible APs.
2011-07-16 12:22:58 +02:00
if (wpa_s->num_bss > wpa_s->conf->bss_max_count)
wpa_bss_remove_oldest(wpa_s);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
}
dbus: Add BSS property change notifications
2010-01-06 19:03:01 +01:00
static int are_ies_equal(const struct wpa_bss *old,
const struct wpa_scan_res *new, u32 ie)
{
const u8 *old_ie, *new_ie;
struct wpabuf *old_ie_buff = NULL;
struct wpabuf *new_ie_buff = NULL;
int new_ie_len, old_ie_len, ret, is_multi;
switch (ie) {
case WPA_IE_VENDOR_TYPE:
old_ie = wpa_bss_get_vendor_ie(old, ie);
new_ie = wpa_scan_get_vendor_ie(new, ie);
is_multi = 0;
break;
case WPS_IE_VENDOR_TYPE:
old_ie_buff = wpa_bss_get_vendor_ie_multi(old, ie);
new_ie_buff = wpa_scan_get_vendor_ie_multi(new, ie);
is_multi = 1;
break;
case WLAN_EID_RSN:
case WLAN_EID_SUPP_RATES:
case WLAN_EID_EXT_SUPP_RATES:
old_ie = wpa_bss_get_ie(old, ie);
new_ie = wpa_scan_get_ie(new, ie);
is_multi = 0;
break;
default:
wpa_printf(MSG_DEBUG, "bss: %s: cannot compare IEs", __func__);
return 0;
}
if (is_multi) {
/* in case of multiple IEs stored in buffer */
old_ie = old_ie_buff ? wpabuf_head_u8(old_ie_buff) : NULL;
new_ie = new_ie_buff ? wpabuf_head_u8(new_ie_buff) : NULL;
old_ie_len = old_ie_buff ? wpabuf_len(old_ie_buff) : 0;
new_ie_len = new_ie_buff ? wpabuf_len(new_ie_buff) : 0;
} else {
/* in case of single IE */
old_ie_len = old_ie ? old_ie[1] + 2 : 0;
new_ie_len = new_ie ? new_ie[1] + 2 : 0;
}
Distinguish empty concatenated vendor-specific IE from missing one When comparing BSS table entries, handle empty concatenated vendor-specific IE differently from completely missing IE. This does not change anything for the only currently compared IE that can be fragmented (WPS IE), but it is better to have the generic code here ready for any possible new IE that could be used in with zero-length data.
2011-04-14 01:25:43 +02:00
if (!old_ie || !new_ie)
ret = !old_ie && !new_ie;
else
ret = (old_ie_len == new_ie_len &&
os_memcmp(old_ie, new_ie, old_ie_len) == 0);
dbus: Add BSS property change notifications
2010-01-06 19:03:01 +01:00
wpabuf_free(old_ie_buff);
wpabuf_free(new_ie_buff);
return ret;
}
static u32 wpa_bss_compare_res(const struct wpa_bss *old,
const struct wpa_scan_res *new)
{
u32 changes = 0;
int caps_diff = old->caps ^ new->caps;
if (old->freq != new->freq)
changes |= WPA_BSS_FREQ_CHANGED_FLAG;
if (old->level != new->level)
changes |= WPA_BSS_SIGNAL_CHANGED_FLAG;
if (caps_diff & IEEE80211_CAP_PRIVACY)
changes |= WPA_BSS_PRIVACY_CHANGED_FLAG;
if (caps_diff & IEEE80211_CAP_IBSS)
changes |= WPA_BSS_MODE_CHANGED_FLAG;
dbus: Change WPA/RSNIE byte array props to dicts Expose RSN and WPA properties for BSS objects containing information about key management and cipher suites. Get rid of WPA/RSN/WPSIE byte array properties and add IEs byte array property with all IE data instead.
2010-01-16 15:37:37 +01:00
if (old->ie_len == new->ie_len &&
os_memcmp(old + 1, new + 1, old->ie_len) == 0)
return changes;
changes |= WPA_BSS_IES_CHANGED_FLAG;
dbus: Add BSS property change notifications
2010-01-06 19:03:01 +01:00
if (!are_ies_equal(old, new, WPA_IE_VENDOR_TYPE))
changes |= WPA_BSS_WPAIE_CHANGED_FLAG;
if (!are_ies_equal(old, new, WLAN_EID_RSN))
changes |= WPA_BSS_RSNIE_CHANGED_FLAG;
if (!are_ies_equal(old, new, WPS_IE_VENDOR_TYPE))
changes |= WPA_BSS_WPS_CHANGED_FLAG;
if (!are_ies_equal(old, new, WLAN_EID_SUPP_RATES) ||
!are_ies_equal(old, new, WLAN_EID_EXT_SUPP_RATES))
changes |= WPA_BSS_RATES_CHANGED_FLAG;
return changes;
}
static void notify_bss_changes(struct wpa_supplicant *wpa_s, u32 changes,
const struct wpa_bss *bss)
{
if (changes & WPA_BSS_FREQ_CHANGED_FLAG)
wpas_notify_bss_freq_changed(wpa_s, bss->id);
if (changes & WPA_BSS_SIGNAL_CHANGED_FLAG)
wpas_notify_bss_signal_changed(wpa_s, bss->id);
if (changes & WPA_BSS_PRIVACY_CHANGED_FLAG)
wpas_notify_bss_privacy_changed(wpa_s, bss->id);
if (changes & WPA_BSS_MODE_CHANGED_FLAG)
wpas_notify_bss_mode_changed(wpa_s, bss->id);
if (changes & WPA_BSS_WPAIE_CHANGED_FLAG)
wpas_notify_bss_wpaie_changed(wpa_s, bss->id);
if (changes & WPA_BSS_RSNIE_CHANGED_FLAG)
wpas_notify_bss_rsnie_changed(wpa_s, bss->id);
if (changes & WPA_BSS_WPS_CHANGED_FLAG)
wpas_notify_bss_wps_changed(wpa_s, bss->id);
dbus: Change WPA/RSNIE byte array props to dicts Expose RSN and WPA properties for BSS objects containing information about key management and cipher suites. Get rid of WPA/RSN/WPSIE byte array properties and add IEs byte array property with all IE data instead.
2010-01-16 15:37:37 +01:00
if (changes & WPA_BSS_IES_CHANGED_FLAG)
wpas_notify_bss_ies_changed(wpa_s, bss->id);
dbus: Add BSS property change notifications
2010-01-06 19:03:01 +01:00
if (changes & WPA_BSS_RATES_CHANGED_FLAG)
wpas_notify_bss_rates_changed(wpa_s, bss->id);
}
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
static void wpa_bss_update(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
struct wpa_scan_res *res)
{
dbus: Add BSS property change notifications
2010-01-06 19:03:01 +01:00
u32 changes;
changes = wpa_bss_compare_res(bss, res);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
bss->scan_miss_count = 0;
bss->last_update_idx = wpa_s->bss_update_idx;
wpa_bss_copy_res(bss, res);
/* Move the entry to the end of the list */
dl_list_del(&bss->list);
Fetch IEs from both Beacon and Probe Response frames if available This allows the driver wrappers to return two sets of IEs, so that the BSS code can use information from both Beacon and Probe Response frames if needed. For example, some Cisco APs seem to include more information in Wireless Provisioning Services IE when it is in the Beacon frame.
2010-01-16 15:11:05 +01:00
if (bss->ie_len + bss->beacon_ie_len >=
res->ie_len + res->beacon_ie_len) {
os_memcpy(bss + 1, res + 1, res->ie_len + res->beacon_ie_len);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
bss->ie_len = res->ie_len;
Fetch IEs from both Beacon and Probe Response frames if available This allows the driver wrappers to return two sets of IEs, so that the BSS code can use information from both Beacon and Probe Response frames if needed. For example, some Cisco APs seem to include more information in Wireless Provisioning Services IE when it is in the Beacon frame.
2010-01-16 15:11:05 +01:00
bss->beacon_ie_len = res->beacon_ie_len;
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
} else {
struct wpa_bss *nbss;
Fix memory corruption on BSS entry reallocation The wpa_s->bss_id list was being corrupted when the BSS entry needed to be reallocated due to longer IE data. The entry has to be removed from all lists before reallocation to avoid this (it was only removed from the wpa_s->bss list).
2010-01-03 00:25:43 +01:00
struct dl_list *prev = bss->list_id.prev;
dl_list_del(&bss->list_id);
Fetch IEs from both Beacon and Probe Response frames if available This allows the driver wrappers to return two sets of IEs, so that the BSS code can use information from both Beacon and Probe Response frames if needed. For example, some Cisco APs seem to include more information in Wireless Provisioning Services IE when it is in the Beacon frame.
2010-01-16 15:11:05 +01:00
nbss = os_realloc(bss, sizeof(*bss) + res->ie_len +
res->beacon_ie_len);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
if (nbss) {
bss = nbss;
Fetch IEs from both Beacon and Probe Response frames if available This allows the driver wrappers to return two sets of IEs, so that the BSS code can use information from both Beacon and Probe Response frames if needed. For example, some Cisco APs seem to include more information in Wireless Provisioning Services IE when it is in the Beacon frame.
2010-01-16 15:11:05 +01:00
os_memcpy(bss + 1, res + 1,
res->ie_len + res->beacon_ie_len);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
bss->ie_len = res->ie_len;
Fetch IEs from both Beacon and Probe Response frames if available This allows the driver wrappers to return two sets of IEs, so that the BSS code can use information from both Beacon and Probe Response frames if needed. For example, some Cisco APs seem to include more information in Wireless Provisioning Services IE when it is in the Beacon frame.
2010-01-16 15:11:05 +01:00
bss->beacon_ie_len = res->beacon_ie_len;
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
}
Fix memory corruption on BSS entry reallocation The wpa_s->bss_id list was being corrupted when the BSS entry needed to be reallocated due to longer IE data. The entry has to be removed from all lists before reallocation to avoid this (it was only removed from the wpa_s->bss list).
2010-01-03 00:25:43 +01:00
dl_list_add(prev, &bss->list_id);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
}
dl_list_add_tail(&wpa_s->bss, &bss->list);
dbus: Add BSS property change notifications
2010-01-06 19:03:01 +01:00
notify_bss_changes(wpa_s, changes, bss);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
}
Use shared function for figuring out if BSS is in use The BSS that is currently in use must not be freed even if it does not show up in scan results.
2010-01-03 09:55:31 +01:00
static int wpa_bss_in_use(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
{
return bss == wpa_s->current_bss ||
os_memcmp(bss->bssid, wpa_s->bssid, ETH_ALEN) == 0 ||
os_memcmp(bss->bssid, wpa_s->pending_bssid, ETH_ALEN) == 0;
}
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
void wpa_bss_update_start(struct wpa_supplicant *wpa_s)
{
wpa_s->bss_update_idx++;
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "BSS: Start scan result update %u",
wpa_s->bss_update_idx);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
}
void wpa_bss_update_scan_res(struct wpa_supplicant *wpa_s,
struct wpa_scan_res *res)
{
P2P: Show P2P info in ctrl_iface scan results
2010-07-18 23:30:25 +02:00
const u8 *ssid, *p2p;
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
struct wpa_bss *bss;
ssid = wpa_scan_get_ie(res, WLAN_EID_SSID);
if (ssid == NULL) {
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "BSS: No SSID IE included for "
MACSTR, MAC2STR(res->bssid));
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
return;
}
if (ssid[1] > 32) {
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "BSS: Too long SSID IE included for "
MACSTR, MAC2STR(res->bssid));
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
return;
}
P2P: Show P2P info in ctrl_iface scan results
2010-07-18 23:30:25 +02:00
p2p = wpa_scan_get_vendor_ie(res, P2P_IE_VENDOR_TYPE);
if (p2p && ssid[1] == P2P_WILDCARD_SSID_LEN &&
os_memcmp(ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN) == 0)
return; /* Skip P2P listen discovery results here */
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
/* TODO: add option for ignoring BSSes we are not interested in
* (to save memory) */
bss = wpa_bss_get(wpa_s, res->bssid, ssid + 2, ssid[1]);
if (bss == NULL)
wpa_bss_add(wpa_s, ssid + 2, ssid[1], res);
else
wpa_bss_update(wpa_s, bss, res);
}
Only expire scanned BSSes based on new scan results Get more information about scans when updating BSS table information. This allows the missing-from-scans expiration rule to work properly when only partial set of channels or SSIDs are being scanned.
2010-01-02 12:57:44 +01:00
static int wpa_bss_included_in_scan(const struct wpa_bss *bss,
const struct scan_info *info)
{
int found;
size_t i;
if (info == NULL)
return 1;
if (info->num_freqs) {
found = 0;
for (i = 0; i < info->num_freqs; i++) {
if (bss->freq == info->freqs[i]) {
found = 1;
break;
}
}
if (!found)
return 0;
}
if (info->num_ssids) {
found = 0;
for (i = 0; i < info->num_ssids; i++) {
const struct wpa_driver_scan_ssid *s = &info->ssids[i];
if ((s->ssid == NULL || s->ssid_len == 0) ||
(s->ssid_len == bss->ssid_len &&
os_memcmp(s->ssid, bss->ssid, bss->ssid_len) ==
0)) {
found = 1;
break;
}
}
if (!found)
return 0;
}
return 1;
}
void wpa_bss_update_end(struct wpa_supplicant *wpa_s, struct scan_info *info,
int new_scan)
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
{
struct wpa_bss *bss, *n;
Only expire scanned BSSes based on new scan results Get more information about scans when updating BSS table information. This allows the missing-from-scans expiration rule to work properly when only partial set of channels or SSIDs are being scanned.
2010-01-02 12:57:44 +01:00
if (!new_scan)
return; /* do not expire entries without new scan */
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
dl_list_for_each_safe(bss, n, &wpa_s->bss, struct wpa_bss, list) {
Use shared function for figuring out if BSS is in use The BSS that is currently in use must not be freed even if it does not show up in scan results.
2010-01-03 09:55:31 +01:00
if (wpa_bss_in_use(wpa_s, bss))
continue;
Only expire scanned BSSes based on new scan results Get more information about scans when updating BSS table information. This allows the missing-from-scans expiration rule to work properly when only partial set of channels or SSIDs are being scanned.
2010-01-02 12:57:44 +01:00
if (!wpa_bss_included_in_scan(bss, info))
continue; /* expire only BSSes that were scanned */
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
if (bss->last_update_idx < wpa_s->bss_update_idx)
bss->scan_miss_count++;
wpa_supplicant: Parameterize BSS table expiration age + count Replace compile-time BSS cache expiration age and scan count by config parameters that can be set via wpa_cli and the new D-Bus API. The latter is done with interface properties BSSExpireAge and BSSExpireCount.
2011-03-20 11:40:59 +01:00
if (bss->scan_miss_count >=
wpa_s->conf->bss_expiration_scan_count) {
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "BSS: Expire BSS %u due to "
"no match in scan", bss->id);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
wpa_bss_remove(wpa_s, bss);
}
}
}
dbus: Add D-Bus methods to flush the BSS cache Add an "Interface.FlushBSS" method to the new D-Bus API and a "flush" method to the old API. Both take an age parameter that is a threshold (in seconds) for selecting entries to evict. Setting this parameter to zero flushes all entries from the cache. This mechanism is useful for a connection manager to clear state at startup and on resume (where the age parameter may be used to hold onto recent/valid data).
2011-03-20 11:02:33 +01:00
void wpa_bss_flush_by_age(struct wpa_supplicant *wpa_s, int age)
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
{
struct wpa_bss *bss, *n;
struct os_time t;
if (dl_list_empty(&wpa_s->bss))
return;
os_get_time(&t);
dbus: Add D-Bus methods to flush the BSS cache Add an "Interface.FlushBSS" method to the new D-Bus API and a "flush" method to the old API. Both take an age parameter that is a threshold (in seconds) for selecting entries to evict. Setting this parameter to zero flushes all entries from the cache. This mechanism is useful for a connection manager to clear state at startup and on resume (where the age parameter may be used to hold onto recent/valid data).
2011-03-20 11:02:33 +01:00
t.sec -= age;
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
dl_list_for_each_safe(bss, n, &wpa_s->bss, struct wpa_bss, list) {
Use shared function for figuring out if BSS is in use The BSS that is currently in use must not be freed even if it does not show up in scan results.
2010-01-03 09:55:31 +01:00
if (wpa_bss_in_use(wpa_s, bss))
continue;
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
if (os_time_before(&bss->last_update, &t)) {
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "BSS: Expire BSS %u due to "
"age", bss->id);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
wpa_bss_remove(wpa_s, bss);
} else
break;
}
dbus: Add D-Bus methods to flush the BSS cache Add an "Interface.FlushBSS" method to the new D-Bus API and a "flush" method to the old API. Both take an age parameter that is a threshold (in seconds) for selecting entries to evict. Setting this parameter to zero flushes all entries from the cache. This mechanism is useful for a connection manager to clear state at startup and on resume (where the age parameter may be used to hold onto recent/valid data).
2011-03-20 11:02:33 +01:00
}
static void wpa_bss_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
wpa_supplicant: Parameterize BSS table expiration age + count Replace compile-time BSS cache expiration age and scan count by config parameters that can be set via wpa_cli and the new D-Bus API. The latter is done with interface properties BSSExpireAge and BSSExpireCount.
2011-03-20 11:40:59 +01:00
wpa_bss_flush_by_age(wpa_s, wpa_s->conf->bss_expiration_age);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
eloop_register_timeout(WPA_BSS_EXPIRATION_PERIOD, 0,
wpa_bss_timeout, wpa_s, NULL);
}
int wpa_bss_init(struct wpa_supplicant *wpa_s)
{
dl_list_init(&wpa_s->bss);
Add BSS list sorted by id and add some helper functions This allows the BSS list to be iterated in order of increasing id to avoid problems with new scans reordering entries. The order on the wpa_s->bss list changes with most recently updated entries being moved to the tail of the list while wpa_s->bss_id list maintains its order with new entries being added to the tail and old entries being removed when they expire.
2009-12-27 23:30:38 +01:00
dl_list_init(&wpa_s->bss_id);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
eloop_register_timeout(WPA_BSS_EXPIRATION_PERIOD, 0,
wpa_bss_timeout, wpa_s, NULL);
return 0;
}
dbus: Add D-Bus methods to flush the BSS cache Add an "Interface.FlushBSS" method to the new D-Bus API and a "flush" method to the old API. Both take an age parameter that is a threshold (in seconds) for selecting entries to evict. Setting this parameter to zero flushes all entries from the cache. This mechanism is useful for a connection manager to clear state at startup and on resume (where the age parameter may be used to hold onto recent/valid data).
2011-03-20 11:02:33 +01:00
void wpa_bss_flush(struct wpa_supplicant *wpa_s)
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
{
struct wpa_bss *bss, *n;
dbus: Add D-Bus methods to flush the BSS cache Add an "Interface.FlushBSS" method to the new D-Bus API and a "flush" method to the old API. Both take an age parameter that is a threshold (in seconds) for selecting entries to evict. Setting this parameter to zero flushes all entries from the cache. This mechanism is useful for a connection manager to clear state at startup and on resume (where the age parameter may be used to hold onto recent/valid data).
2011-03-20 11:02:33 +01:00
Fix crash on BSS deinit getting called before BSS init
2009-12-28 11:11:23 +01:00
if (wpa_s->bss.next == NULL)
return; /* BSS table not yet initialized */
dbus: Add D-Bus methods to flush the BSS cache Add an "Interface.FlushBSS" method to the new D-Bus API and a "flush" method to the old API. Both take an age parameter that is a threshold (in seconds) for selecting entries to evict. Setting this parameter to zero flushes all entries from the cache. This mechanism is useful for a connection manager to clear state at startup and on resume (where the age parameter may be used to hold onto recent/valid data).
2011-03-20 11:02:33 +01:00
dl_list_for_each_safe(bss, n, &wpa_s->bss, struct wpa_bss, list) {
if (wpa_bss_in_use(wpa_s, bss))
continue;
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
wpa_bss_remove(wpa_s, bss);
dbus: Add D-Bus methods to flush the BSS cache Add an "Interface.FlushBSS" method to the new D-Bus API and a "flush" method to the old API. Both take an age parameter that is a threshold (in seconds) for selecting entries to evict. Setting this parameter to zero flushes all entries from the cache. This mechanism is useful for a connection manager to clear state at startup and on resume (where the age parameter may be used to hold onto recent/valid data).
2011-03-20 11:02:33 +01:00
}
}
void wpa_bss_deinit(struct wpa_supplicant *wpa_s)
{
eloop_cancel_timeout(wpa_bss_timeout, wpa_s, NULL);
wpa_bss_flush(wpa_s);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
}
Add BSS list sorted by id and add some helper functions This allows the BSS list to be iterated in order of increasing id to avoid problems with new scans reordering entries. The order on the wpa_s->bss list changes with most recently updated entries being moved to the tail of the list while wpa_s->bss_id list maintains its order with new entries being added to the tail and old entries being removed when they expire.
2009-12-27 23:30:38 +01:00
struct wpa_bss * wpa_bss_get_bssid(struct wpa_supplicant *wpa_s,
const u8 *bssid)
{
struct wpa_bss *bss;
wpa_supplicant: Search BSS list from back to front This fixes an issue seen in our wifi testbed, where we frequently switch the SSID of the AP. wpa_supplicant's BSS list will have, for example both <bssid, "Check11b"> (from the previous test) and <bssid, "Check11g"> (from the current test) - note that the bssid is the same for both. The (old) D-Bus API for fetching scan responses from wpa_supplicant is fetch-by-bssid, so the caller (flimflam) incorrectly believes we're associated with <bssid, "Check11b">.
2011-03-20 11:06:36 +01:00
dl_list_for_each_reverse(bss, &wpa_s->bss, struct wpa_bss, list) {
Add BSS list sorted by id and add some helper functions This allows the BSS list to be iterated in order of increasing id to avoid problems with new scans reordering entries. The order on the wpa_s->bss list changes with most recently updated entries being moved to the tail of the list while wpa_s->bss_id list maintains its order with new entries being added to the tail and old entries being removed when they expire.
2009-12-27 23:30:38 +01:00
if (os_memcmp(bss->bssid, bssid, ETH_ALEN) == 0)
return bss;
}
return NULL;
}
P2P: Allow BSS entry to be fetched based on GO P2P Device Address "BSS p2p_dev_addr=<P2P Device Address>" can now be used to fetch a specific BSS entry based on the P2P Device Address of the GO to avoid having to iterate through the full BSS table when an external program needs to figure out whether a specific peer is currently operating as a GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-07 15:23:21 +01:00
#ifdef CONFIG_P2P
struct wpa_bss * wpa_bss_get_p2p_dev_addr(struct wpa_supplicant *wpa_s,
const u8 *dev_addr)
{
struct wpa_bss *bss;
dl_list_for_each_reverse(bss, &wpa_s->bss, struct wpa_bss, list) {
u8 addr[ETH_ALEN];
if (p2p_parse_dev_addr((const u8 *) (bss + 1), bss->ie_len,
addr) == 0 &&
os_memcmp(addr, dev_addr, ETH_ALEN) == 0)
return bss;
}
return NULL;
}
#endif /* CONFIG_P2P */
Add BSS list sorted by id and add some helper functions This allows the BSS list to be iterated in order of increasing id to avoid problems with new scans reordering entries. The order on the wpa_s->bss list changes with most recently updated entries being moved to the tail of the list while wpa_s->bss_id list maintains its order with new entries being added to the tail and old entries being removed when they expire.
2009-12-27 23:30:38 +01:00
struct wpa_bss * wpa_bss_get_id(struct wpa_supplicant *wpa_s, unsigned int id)
{
struct wpa_bss *bss;
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
if (bss->id == id)
return bss;
}
return NULL;
}
const u8 * wpa_bss_get_ie(const struct wpa_bss *bss, u8 ie)
{
const u8 *end, *pos;
pos = (const u8 *) (bss + 1);
end = pos + bss->ie_len;
while (pos + 1 < end) {
if (pos + 2 + pos[1] > end)
break;
if (pos[0] == ie)
return pos;
pos += 2 + pos[1];
}
return NULL;
}
const u8 * wpa_bss_get_vendor_ie(const struct wpa_bss *bss, u32 vendor_type)
{
const u8 *end, *pos;
pos = (const u8 *) (bss + 1);
end = pos + bss->ie_len;
while (pos + 1 < end) {
if (pos + 2 + pos[1] > end)
break;
if (pos[0] == WLAN_EID_VENDOR_SPECIFIC && pos[1] >= 4 &&
vendor_type == WPA_GET_BE32(&pos[2]))
return pos;
pos += 2 + pos[1];
}
return NULL;
}
struct wpabuf * wpa_bss_get_vendor_ie_multi(const struct wpa_bss *bss,
u32 vendor_type)
{
struct wpabuf *buf;
const u8 *end, *pos;
buf = wpabuf_alloc(bss->ie_len);
if (buf == NULL)
return NULL;
pos = (const u8 *) (bss + 1);
end = pos + bss->ie_len;
while (pos + 1 < end) {
if (pos + 2 + pos[1] > end)
break;
if (pos[0] == WLAN_EID_VENDOR_SPECIFIC && pos[1] >= 4 &&
vendor_type == WPA_GET_BE32(&pos[2]))
wpabuf_put_data(buf, pos + 2 + 4, pos[1] - 4);
pos += 2 + pos[1];
}
if (wpabuf_len(buf) == 0) {
wpabuf_free(buf);
buf = NULL;
}
return buf;
}
Add wpa_bss_get_max_rate() to match with old scan_res helpers
2009-12-28 00:09:32 +01:00
int wpa_bss_get_max_rate(const struct wpa_bss *bss)
{
int rate = 0;
const u8 *ie;
int i;
ie = wpa_bss_get_ie(bss, WLAN_EID_SUPP_RATES);
for (i = 0; ie && i < ie[1]; i++) {
if ((ie[i + 2] & 0x7f) > rate)
rate = ie[i + 2] & 0x7f;
}
ie = wpa_bss_get_ie(bss, WLAN_EID_EXT_SUPP_RATES);
for (i = 0; ie && i < ie[1]; i++) {
if ((ie[i + 2] & 0x7f) > rate)
rate = ie[i + 2] & 0x7f;
}
return rate;
}
dbus: Change BSS property MaxRate to Rates Instead of exposing maximum BSS bit rate, expose sorted array of all supported rates.
2010-01-04 15:52:30 +01:00
int wpa_bss_get_bit_rates(const struct wpa_bss *bss, u8 **rates)
{
const u8 *ie, *ie2;
Make wpa_bss_get_max_rate() a bit more readable with a local variable
2010-01-10 21:53:36 +01:00
int i, j;
unsigned int len;
u8 *r;
dbus: Change BSS property MaxRate to Rates Instead of exposing maximum BSS bit rate, expose sorted array of all supported rates.
2010-01-04 15:52:30 +01:00
ie = wpa_bss_get_ie(bss, WLAN_EID_SUPP_RATES);
ie2 = wpa_bss_get_ie(bss, WLAN_EID_EXT_SUPP_RATES);
len = (ie ? ie[1] : 0) + (ie2 ? ie2[1] : 0);
Make wpa_bss_get_max_rate() a bit more readable with a local variable
2010-01-10 21:53:36 +01:00
r = os_malloc(len);
if (!r)
dbus: Change BSS property MaxRate to Rates Instead of exposing maximum BSS bit rate, expose sorted array of all supported rates.
2010-01-04 15:52:30 +01:00
return -1;
for (i = 0; ie && i < ie[1]; i++)
Make wpa_bss_get_max_rate() a bit more readable with a local variable
2010-01-10 21:53:36 +01:00
r[i] = ie[i + 2] & 0x7f;
dbus: Change BSS property MaxRate to Rates Instead of exposing maximum BSS bit rate, expose sorted array of all supported rates.
2010-01-04 15:52:30 +01:00
for (j = 0; ie2 && j < ie2[1]; j++)
Make wpa_bss_get_max_rate() a bit more readable with a local variable
2010-01-10 21:53:36 +01:00
r[i + j] = ie2[j + 2] & 0x7f;
dbus: Change BSS property MaxRate to Rates Instead of exposing maximum BSS bit rate, expose sorted array of all supported rates.
2010-01-04 15:52:30 +01:00
Make wpa_bss_get_max_rate() a bit more readable with a local variable
2010-01-10 21:53:36 +01:00
*rates = r;
dbus: Change BSS property MaxRate to Rates Instead of exposing maximum BSS bit rate, expose sorted array of all supported rates.
2010-01-04 15:52:30 +01:00
return len;
}
Reference in a new issue Copy permalink