fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 15:20:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: add device-generated connection to settings

Browse source 
Only NMSettingsConnections can be activated on device, and
get_connection() wasn't doing that.  So the generated connection
must be added to NMSettings.  That also triggers the
ConnectionProvider's 'connection-added' signal with the happy
result of adding the new connection to the device's
AvailableConnections list.

Acked-by: Dan Williams <dcbw@redhat.com>
This commit is contained in:
Pavel Šimerda 2013-08-23 15:45:17 +02:00 • committed by Dan Williams
parent 9d00229447
commit 2b2383e9c5
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/nm-manager.c
View file

@ -1775,9 +1775,12 @@ local_slist_free (void *loc)
static NMConnection *
get_connection (NMManager *manager, NMDevice *device)
{
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
free_slist GSList *connections = nm_manager_get_activatable_connections (manager);
NMConnection *connection = NULL;
NMSettingsConnection *added = NULL;
GSList *iter;
GError *error = NULL;
/* We still support the older API to match a NMDevice object to an
* existing connection using nm_device_find_assumable_connection().
@ -1835,7 +1838,18 @@ get_connection (NMManager *manager, NMDevice *device)
nm_log_info (LOGD_DEVICE, "(%s): Using generated connection: '%s'",
nm_device_get_iface (device),
nm_connection_get_id (connection));
return connection;
added = nm_settings_add_connection (priv->settings, connection, FALSE, &error);
if (!added) {
nm_log_warn (LOGD_SETTINGS, "(%s) Couldn't save generated connection '%s': %s",
nm_device_get_iface (device),
nm_connection_get_id (connection),
(error && error->message) ? error->message : "(unknown)");
g_clear_error (&error);
}
g_object_unref (connection);
return added ? NM_CONNECTION (added) : NULL;
}
static void