fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 12:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: also deactivate ACs that are not authorized yet

Browse source 
If we are deactivating active-connections for a specific
settings-connection, also consider active-connections that are waiting
for authorization. Otherwise, when the connection is deleted, a
active-connection might still reference it.
This commit is contained in:
Beniamino Galvani 2023-03-28 23:12:32 +02:00
parent e6b3a6a2b6
commit 6d6bd92510
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/core/nm-manager.c
View file

@ -5981,9 +5981,12 @@ fail:
void
nm_manager_deactivate_ac(NMManager *self, NMSettingsConnection *connection)
{
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE(self);
NMActiveConnection *ac;
const CList *tmp_list, *tmp_safe;
GError *error = NULL;
AsyncOpData *async_op_data;
AsyncOpData *async_op_data_safe;
nm_assert(NM_IS_SETTINGS_CONNECTION(connection));
@ -6003,6 +6006,25 @@ nm_manager_deactivate_ac(NMManager *self, NMSettingsConnection *connection)
}
}
}
c_list_for_each_entry_safe (async_op_data,
async_op_data_safe,
&priv->async_op_lst_head,
async_op_lst) {
if (!NM_IN_SET(async_op_data->async_op_type,
ASYNC_OP_TYPE_AC_AUTH_ACTIVATE_INTERNAL,
ASYNC_OP_TYPE_AC_AUTH_ACTIVATE_USER,
ASYNC_OP_TYPE_AC_AUTH_ADD_AND_ACTIVATE,
ASYNC_OP_TYPE_AC_AUTH_ADD_AND_ACTIVATE2))
continue;
ac = async_op_data->ac_auth.active;
if (nm_active_connection_get_settings_connection(ac) == connection) {
nm_active_connection_set_state(ac,
NM_ACTIVE_CONNECTION_STATE_DEACTIVATED,
NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED);
}
}
}
/**