fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 03:48:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

manager: trust the state file more when assuming connections

Browse source 
If we can't generate a connection and maybe_later is TRUE, it means
that the device can generate/assume connections but it failed for the
moment due to missing master/slaves/addresses. In this case, just
assume the connection from state file.

https://bugzilla.redhat.com/show_bug.cgi?id=1551958
(cherry picked from commit 236edfc908)
This commit is contained in:
Beniamino Galvani 2018-04-05 11:19:54 +02:00
parent 8e64c4fa76
commit 7eedaea83c
1 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/nm-manager.c
View file

@ -2117,13 +2117,14 @@ get_existing_connection (NMManager *self,
gs_unref_object NMConnection *connection = NULL; gs_unref_object NMConnection *connection = NULL;
NMSettingsConnection *added = NULL; NMSettingsConnection *added = NULL;
GError *error = NULL; GError *error = NULL;
gs_free_error GError *gen_error = NULL;
NMDevice *master = NULL; NMDevice *master = NULL;
int ifindex = nm_device_get_ifindex (device); int ifindex = nm_device_get_ifindex (device);
NMSettingsConnection *matched; NMSettingsConnection *matched;
NMSettingsConnection *connection_checked = NULL; NMSettingsConnection *connection_checked = NULL;
gboolean assume_state_guess_assume = FALSE; gboolean assume_state_guess_assume = FALSE;
const char *assume_state_connection_uuid = NULL; const char *assume_state_connection_uuid = NULL;
gboolean maybe_later; gboolean maybe_later, only_by_uuid = FALSE;
if (out_generated) if (out_generated)
*out_generated = FALSE; *out_generated = FALSE;
@ -2156,14 +2157,18 @@ get_existing_connection (NMManager *self,
* update_connection() implemented, otherwise nm_device_generate_connection() * update_connection() implemented, otherwise nm_device_generate_connection()
* returns NULL. * returns NULL.
*/ */
connection = nm_device_generate_connection (device, master, &maybe_later, &error); connection = nm_device_generate_connection (device, master, &maybe_later, &gen_error);
if (!connection) { if (!connection) {
if (!maybe_later) if (maybe_later) {
/* The device can generate a connection, but it failed for now.
* Give it a chance to match a connection from the state file. */
only_by_uuid = TRUE;
} else {
nm_device_assume_state_reset (device); nm_device_assume_state_reset (device);
_LOG2D (LOGD_DEVICE, device, "assume: cannot generate connection: %s", _LOG2D (LOGD_DEVICE, device, "assume: cannot generate connection: %s",
error->message); gen_error->message);
g_error_free (error); return NULL;
return NULL; }
} }
nm_device_assume_state_get (device, nm_device_assume_state_get (device,
@ -2184,21 +2189,31 @@ get_existing_connection (NMManager *self,
&& !active_connection_find_first (self, connection_checked, NULL, && !active_connection_find_first (self, connection_checked, NULL,
NM_ACTIVE_CONNECTION_STATE_DEACTIVATING) NM_ACTIVE_CONNECTION_STATE_DEACTIVATING)
&& nm_device_check_connection_compatible (device, NM_CONNECTION (connection_checked))) { && nm_device_check_connection_compatible (device, NM_CONNECTION (connection_checked))) {
NMConnection *const connections[] = {
NM_CONNECTION (connection_checked),
NULL,
};
matched = NM_SETTINGS_CONNECTION (nm_utils_match_connection (connections, if (connection) {
connection, NMConnection *const connections[] = {
TRUE, NM_CONNECTION (connection_checked),
nm_device_has_carrier (device), NULL,
nm_device_get_route_metric (device, AF_INET), };
nm_device_get_route_metric (device, AF_INET6),
NULL, NULL)); matched = NM_SETTINGS_CONNECTION (nm_utils_match_connection (connections,
connection,
TRUE,
nm_device_has_carrier (device),
nm_device_get_route_metric (device, AF_INET),
nm_device_get_route_metric (device, AF_INET6),
NULL, NULL));
} else
matched = connection_checked;
} else } else
matched = NULL; matched = NULL;
if (!matched && only_by_uuid) {
_LOG2D (LOGD_DEVICE, device, "assume: cannot generate connection: %s",
gen_error->message);
return NULL;
}
if (!matched && assume_state_guess_assume) { if (!matched && assume_state_guess_assume) {
gs_free NMSettingsConnection **connections = NULL; gs_free NMSettingsConnection **connections = NULL;
guint len, i, j; guint len, i, j;