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

manager: change nm_manager_get_best_device_for_connection() signature

Browse source 
Add a @unavailable_devices argument that specifies an hash table of
devices to be excluded from the search.
This commit is contained in:
Beniamino Galvani 2017-02-24 09:08:02 +01:00
parent 39d0559d9a
commit 7fd987f7be
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/nm-manager.c
View file

@ -2473,7 +2473,8 @@ nm_manager_get_device_paths (NMManager *self)
static NMDevice *
nm_manager_get_best_device_for_connection (NMManager *self,
NMConnection *connection,
gboolean for_user_request)
gboolean for_user_request,
GHashTable *unavailable_devices)
{
const GSList *devices, *iter;
NMActiveConnection *ac;
@ -2494,6 +2495,9 @@ nm_manager_get_best_device_for_connection (NMManager *self,
for (iter = devices; iter; iter = g_slist_next (iter)) {
NMDevice *device = NM_DEVICE (iter->data);
if (unavailable_devices && g_hash_table_contains (unavailable_devices, device))
continue;
if (nm_device_check_connection_available (device, connection, flags, NULL))
return device;
}
@ -2977,7 +2981,8 @@ autoconnect_slaves (NMManager *self,
slave_device = nm_manager_get_best_device_for_connection (self,
NM_CONNECTION (slave_connection),
FALSE);
FALSE,
NULL);
if (!slave_device) {
_LOGD (LOGD_CORE,
"will NOT activate slave connection '%s' (%s) as a dependency for master '%s' (%s): "
@ -3617,7 +3622,7 @@ validate_activation_request (NMManager *self,
goto error;
}
} else
device = nm_manager_get_best_device_for_connection (self, connection, TRUE);
device = nm_manager_get_best_device_for_connection (self, connection, TRUE, NULL);
if (!device && !vpn) {
gboolean is_software = nm_connection_is_virtual (connection);