3
0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 21:22:37 +01:00

network/station: add BSS blacklisting

If IWD fails to connect to a BSS we can attempt to connect to a different
BSS under the same network and blacklist the first BSS. In the case of an
incorrect PSK (MMPDU code 2 or 23) we will still fail the connection.

station_connect_cb was refactored to better handle the dbus case. Now the
netdev result switch statement is handled before deciding whether to send
a dbus reply. This allows for both cases where we are trying to connect
to the next BSS in autoconnect, as well as in the dbus case.
This commit is contained in:
James Prestwood 2019-01-29 12:36:12 -08:00 committed by Denis Kenzior
parent da485179a6
commit 45cc0fd918
2 changed files with 96 additions and 20 deletions

View File

@ -47,6 +47,7 @@
#include "src/eap.h" #include "src/eap.h"
#include "src/knownnetworks.h" #include "src/knownnetworks.h"
#include "src/network.h" #include "src/network.h"
#include "src/blacklist.h"
struct network { struct network {
char *object_path; char *object_path;
@ -670,7 +671,12 @@ struct scan_bss *network_bss_select(struct network *network)
bss_entry = bss_entry->next) { bss_entry = bss_entry->next) {
struct scan_bss *bss = bss_entry->data; struct scan_bss *bss = bss_entry->data;
if (wiphy_can_connect(wiphy, bss)) if (!wiphy_can_connect(wiphy, bss))
continue;
if (blacklist_contains_bss(bss->addr))
continue;
return bss; return bss;
} }

View File

@ -47,6 +47,8 @@
#include "src/ie.h" #include "src/ie.h"
#include "src/handshake.h" #include "src/handshake.h"
#include "src/station.h" #include "src/station.h"
#include "src/blacklist.h"
#include "src/mpdu.h"
static struct l_queue *station_list; static struct l_queue *station_list;
static uint32_t netdev_watch; static uint32_t netdev_watch;
@ -131,7 +133,11 @@ static void station_autoconnect_next(struct station *station)
entry->bss->frequency, entry->rank, entry->bss->frequency, entry->rank,
entry->bss->signal_strength); entry->bss->signal_strength);
/* TODO: Blacklist the network from auto-connect */ if (blacklist_contains_bss(entry->bss->addr)) {
l_free(entry);
continue;
}
r = network_autoconnect(entry->network, entry->bss); r = network_autoconnect(entry->network, entry->bss);
l_free(entry); l_free(entry);
@ -1142,6 +1148,9 @@ static bool station_roam_scan_notify(uint32_t ifindex, int err,
if (!wiphy_can_connect(station->wiphy, bss)) if (!wiphy_can_connect(station->wiphy, bss))
goto next; goto next;
if (blacklist_contains_bss(bss->addr))
goto next;
rank = bss->rank; rank = bss->rank;
if (hs->mde && bss->mde_present && l_get_le16(bss->mde) == mdid) if (hs->mde && bss->mde_present && l_get_le16(bss->mde) == mdid)
@ -1601,14 +1610,47 @@ static void station_netdev_event(struct netdev *netdev, enum netdev_event event,
}; };
} }
static void station_connect_cb(struct netdev *netdev, enum netdev_result result, static bool station_try_next_bss(struct station *station)
void *user_data)
{ {
struct station *station = user_data; struct scan_bss *next;
int ret;
l_debug("%u, result: %d", netdev_get_ifindex(station->netdev), result); blacklist_add_bss(station->connected_bss->addr);
if (station->connect_pending) { next = network_bss_select(station->connected_network);
if (!next)
return false;
ret = __station_connect_network(station, station->connected_network,
next);
if (ret < 0)
return false;
l_debug("Attempting to connect to next BSS "MAC, MAC_STR(next->addr));
return true;
}
static bool station_can_retry(uint16_t status_code)
{
/*
* We dont want to cause a retry and blacklist if the password was
* incorrect. Otherwise we would just continue to fail.
*
* Other status codes can be added here if its decided we want to
* fail in those cases.
*/
if (status_code != MMPDU_REASON_CODE_PREV_AUTH_NOT_VALID &&
status_code != MMPDU_REASON_CODE_IEEE8021X_FAILED)
return true;
return false;
}
static void station_connect_dbus_reply(struct station *station,
enum netdev_result result)
{
struct l_dbus_message *reply; struct l_dbus_message *reply;
switch (result) { switch (result) {
@ -1618,7 +1660,6 @@ static void station_connect_cb(struct netdev *netdev, enum netdev_result result,
case NETDEV_RESULT_OK: case NETDEV_RESULT_OK:
reply = l_dbus_message_new_method_return( reply = l_dbus_message_new_method_return(
station->connect_pending); station->connect_pending);
l_dbus_message_set_arguments(reply, "");
break; break;
default: default:
reply = dbus_error_failed(station->connect_pending); reply = dbus_error_failed(station->connect_pending);
@ -1628,6 +1669,35 @@ static void station_connect_cb(struct netdev *netdev, enum netdev_result result,
dbus_pending_reply(&station->connect_pending, reply); dbus_pending_reply(&station->connect_pending, reply);
} }
static void station_connect_cb(struct netdev *netdev, enum netdev_result result,
void *user_data)
{
struct station *station = user_data;
uint16_t status_code = netdev_get_last_status_code(netdev);
l_debug("%u, result: %d", netdev_get_ifindex(station->netdev), result);
switch (result) {
case NETDEV_RESULT_OK:
blacklist_remove_bss(station->connected_bss->addr);
break;
case NETDEV_RESULT_HANDSHAKE_FAILED:
if (!station_can_retry(status_code))
break;
/* fall through */
case NETDEV_RESULT_AUTHENTICATION_FAILED:
case NETDEV_RESULT_ASSOCIATION_FAILED:
/* Maybe there is another BSS under the same network? */
if (station_try_next_bss(station))
return;
/* fall through */
default:
break;
}
if (station->connect_pending)
station_connect_dbus_reply(station, result);
if (result != NETDEV_RESULT_OK) { if (result != NETDEV_RESULT_OK) {
if (result != NETDEV_RESULT_ABORTED) { if (result != NETDEV_RESULT_ABORTED) {
network_connect_failed(station->connected_network); network_connect_failed(station->connected_network);