Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

network: Hide hidden networks on connection error

Browse Source 
If a user connection fails on a freshly scanned psk or open hidden
network, during passphrase request or after, it shall be removed from
the network list.  Otherwise, it would be possible to directly connect
to that known network, which will appear as not hidden.
This commit is contained in:
Emmanuel VAUTRIN 2022-04-05 10:21:33 +02:00 committed by Denis Kenzior
parent 57ae02ab71
commit 85d9d6461f
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/network.c
View File

@ -85,6 +85,7 @@ struct network {
bool is_hs20:1; bool is_hs20:1;
bool anqp_pending:1; /* Set if there is a pending ANQP request */ bool anqp_pending:1; /* Set if there is a pending ANQP request */
bool owe_hidden_pending:1; bool owe_hidden_pending:1;
bool provisioning_hidden:1;
uint8_t transition_disable; /* Temporary cache until info is set */ uint8_t transition_disable; /* Temporary cache until info is set */
bool have_transition_disable:1; bool have_transition_disable:1;
int rank; int rank;
@ -188,6 +189,8 @@ void network_connected(struct network *network)
network_secret_check_cacheable, network); network_secret_check_cacheable, network);
l_queue_clear(network->blacklist, NULL); l_queue_clear(network->blacklist, NULL);
network->provisioning_hidden = false;
} }
void network_disconnected(struct network *network) void network_disconnected(struct network *network)
@ -980,6 +983,9 @@ void network_connect_failed(struct network *network, bool in_handshake)
l_queue_destroy(network->secrets, eap_secret_info_free); l_queue_destroy(network->secrets, eap_secret_info_free);
network->secrets = NULL; network->secrets = NULL;
if (network->provisioning_hidden)
station_hide_network(network->station, network);
} }
static bool hotspot_info_matches(struct network *network, static bool hotspot_info_matches(struct network *network,
@ -1242,6 +1248,9 @@ static void passphrase_callback(enum agent_result result,
return; return;
err: err:
if (network->provisioning_hidden)
station_hide_network(station, network);
network_settings_close(network); network_settings_close(network);
} }
@ -1661,8 +1670,10 @@ struct l_dbus_message *network_connect_new_hidden_network(
switch (network_get_security(network)) { switch (network_get_security(network)) {
case SECURITY_PSK: case SECURITY_PSK:
network->provisioning_hidden = true;
return network_connect_psk(network, bss, message); return network_connect_psk(network, bss, message);
case SECURITY_NONE: case SECURITY_NONE:
network->provisioning_hidden = true;
station_connect_network(station, network, bss, message); station_connect_network(station, network, bss, message);
return NULL; return NULL;
default: default:

2
src/station.c
View File

@ -3198,6 +3198,8 @@ next:
} }
if (network_psk && network_open) { if (network_psk && network_open) {
station_hide_network(station, network_psk);
station_hide_network(station, network_open);
dbus_pending_reply(&msg, dbus_error_service_set_overlap(msg)); dbus_pending_reply(&msg, dbus_error_service_set_overlap(msg));
return true; return true;
} }