Cumulative patch from commit 06c7b7f0b5f4deed675a7b81e33830311da7339a
06c7b7f HS 2.0R2: Fix temporary network disabling in Deauth Req case
c5c2d94 P2P: Cancel offchannel TX wait on PD Response TX status
1578796 TDLS: Work around interop issues with supported operating class
b7fb98f Interworking: Fix already-connected check to verify network priority
7c373ac Interworking: Fix last-network preference to not override priority
f54e924 HS 2.0R2: Fix req_conn_capab example
Change-Id: I17953fc05421bc5d454f4081fbfe303f4bf2d6fd
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/wpa_supplicant/README-HS20 b/wpa_supplicant/README-HS20
index b6f0673..d0b0b50 100644
--- a/wpa_supplicant/README-HS20
+++ b/wpa_supplicant/README-HS20
@@ -260,7 +260,7 @@
# Format: <protocol>[:<comma-separated list of ports]
# Multiple entries can be used to list multiple requirements.
# For example, number of common TCP protocols:
-# req_conn_capab=6,22,80,443
+# req_conn_capab=6:22,80,443
# For example, IPSec/IKE:
# req_conn_capab=17:500
# req_conn_capab=50
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index c0f55ee..bea7f8a 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -993,30 +993,33 @@
{
struct wpa_bss *selected = NULL;
int prio;
+ struct wpa_ssid *next_ssid = NULL;
if (wpa_s->last_scan_res == NULL ||
wpa_s->last_scan_res_used == 0)
return NULL; /* no scan results from last update */
+ if (wpa_s->next_ssid) {
+ struct wpa_ssid *ssid;
+
+ /* check that next_ssid is still valid */
+ for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
+ if (ssid == wpa_s->next_ssid)
+ break;
+ }
+ next_ssid = ssid;
+ wpa_s->next_ssid = NULL;
+ }
+
while (selected == NULL) {
- if (wpa_s->next_ssid) {
- struct wpa_ssid *ssid;
-
- /* check that next_ssid is still valid */
- for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next)
- if (ssid == wpa_s->next_ssid)
- break;
- wpa_s->next_ssid = NULL;
-
- if (ssid) {
+ for (prio = 0; prio < wpa_s->conf->num_prio; prio++) {
+ if (next_ssid && next_ssid->priority ==
+ wpa_s->conf->pssid[prio]->priority) {
selected = wpa_supplicant_select_bss(
- wpa_s, ssid, selected_ssid, 1);
+ wpa_s, next_ssid, selected_ssid, 1);
if (selected)
break;
}
- }
-
- for (prio = 0; prio < wpa_s->conf->num_prio; prio++) {
selected = wpa_supplicant_select_bss(
wpa_s, wpa_s->conf->pssid[prio],
selected_ssid, 0);
diff --git a/wpa_supplicant/hs20_supplicant.c b/wpa_supplicant/hs20_supplicant.c
index b873c7c..b342d5d 100644
--- a/wpa_supplicant/hs20_supplicant.c
+++ b/wpa_supplicant/hs20_supplicant.c
@@ -885,8 +885,8 @@
/* TODO: For now, disable full ESS since some drivers may not
* support disabling per BSS. */
if (wpa_s->current_ssid) {
- struct os_time now;
- os_get_time(&now);
+ struct os_reltime now;
+ os_get_reltime(&now);
if (now.sec + reauth_delay <=
wpa_s->current_ssid->disabled_until.sec)
return;
@@ -898,8 +898,8 @@
}
if (code == HS20_DEAUTH_REASON_CODE_ESS && wpa_s->current_ssid) {
- struct os_time now;
- os_get_time(&now);
+ struct os_reltime now;
+ os_get_reltime(&now);
if (now.sec + reauth_delay <=
wpa_s->current_ssid->disabled_until.sec)
return;
diff --git a/wpa_supplicant/interworking.c b/wpa_supplicant/interworking.c
index abf5dee..42fefb6 100644
--- a/wpa_supplicant/interworking.c
+++ b/wpa_supplicant/interworking.c
@@ -814,7 +814,8 @@
static int already_connected(struct wpa_supplicant *wpa_s,
struct wpa_cred *cred, struct wpa_bss *bss)
{
- struct wpa_ssid *ssid;
+ struct wpa_ssid *ssid, *sel_ssid;
+ struct wpa_bss *selected;
if (wpa_s->wpa_state < WPA_ASSOCIATED || wpa_s->current_ssid == NULL)
return 0;
@@ -827,6 +828,11 @@
os_memcmp(ssid->ssid, bss->ssid, bss->ssid_len) != 0)
return 0;
+ sel_ssid = NULL;
+ selected = wpa_supplicant_pick_network(wpa_s, &sel_ssid);
+ if (selected && sel_ssid && sel_ssid->priority > ssid->priority)
+ return 0; /* higher priority network in scan results */
+
return 1;
}