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

merge: branch 'lr/master-activations'

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=750595
This commit is contained in:
Lubomir Rintel 2015-06-24 18:24:22 +02:00
commit 44c36f1b16
3 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/nm-active-connection.c
View file

@ -530,6 +530,7 @@ master_state_cb (NMActiveConnection *master,
gpointer user_data) gpointer user_data)
{ {
NMActiveConnection *self = NM_ACTIVE_CONNECTION (user_data); NMActiveConnection *self = NM_ACTIVE_CONNECTION (user_data);
NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (self);
NMActiveConnectionState master_state = nm_active_connection_get_state (master); NMActiveConnectionState master_state = nm_active_connection_get_state (master);
check_master_ready (self); check_master_ready (self);
@ -537,8 +538,8 @@ master_state_cb (NMActiveConnection *master,
nm_log_dbg (LOGD_DEVICE, "(%p): master ActiveConnection [%p] state now '%s' (%d)", nm_log_dbg (LOGD_DEVICE, "(%p): master ActiveConnection [%p] state now '%s' (%d)",
self, master, state_to_string (master_state), master_state); self, master, state_to_string (master_state), master_state);
if (master_state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATING && if ( master_state >= NM_ACTIVE_CONNECTION_STATE_DEACTIVATING
nm_active_connection_get_device (master) == NULL) { && !priv->master_ready) {
/* Master failed without ever creating its device */ /* Master failed without ever creating its device */
if (NM_ACTIVE_CONNECTION_GET_CLASS (self)->master_failed) if (NM_ACTIVE_CONNECTION_GET_CLASS (self)->master_failed)
NM_ACTIVE_CONNECTION_GET_CLASS (self)->master_failed (self); NM_ACTIVE_CONNECTION_GET_CLASS (self)->master_failed (self);

30
src/nm-manager.c
View file

@ -154,6 +154,7 @@ typedef struct {
char *state_file; char *state_file;
GSList *active_connections; GSList *active_connections;
GSList *authorizing_connections;
guint ac_cleanup_id; guint ac_cleanup_id;
NMActiveConnection *primary_connection; NMActiveConnection *primary_connection;
NMActiveConnection *activating_connection; NMActiveConnection *activating_connection;
@ -2696,9 +2697,9 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError *
} }
nm_active_connection_set_master (active, master_ac); nm_active_connection_set_master (active, master_ac);
nm_log_dbg (LOGD_CORE, "Activation of '%s' depends on active connection %s", nm_log_dbg (LOGD_CORE, "Activation of '%s' depends on active connection %p",
nm_connection_get_id (connection), nm_connection_get_id (connection),
nm_active_connection_get_path (master_ac)); master_ac);
} }
/* Check slaves for master connection and possibly activate them */ /* Check slaves for master connection and possibly activate them */
@ -2857,8 +2858,11 @@ _internal_activation_auth_done (NMActiveConnection *active,
gpointer user_data2) gpointer user_data2)
{ {
NMManager *self = user_data1; NMManager *self = user_data1;
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
GError *error = NULL; GError *error = NULL;
priv->authorizing_connections = g_slist_remove (priv->authorizing_connections, active);
if (success) { if (success) {
if (_internal_activate_generic (self, active, &error)) { if (_internal_activate_generic (self, active, &error)) {
g_object_unref (active); g_object_unref (active);
@ -2898,8 +2902,10 @@ nm_manager_activate_connection (NMManager *self,
NMAuthSubject *subject, NMAuthSubject *subject,
GError **error) GError **error)
{ {
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
NMActiveConnection *active; NMActiveConnection *active;
char *error_desc = NULL; char *error_desc = NULL;
GSList *iter;
g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (self != NULL, NULL);
g_return_val_if_fail (connection != NULL, NULL); g_return_val_if_fail (connection != NULL, NULL);
@ -2918,14 +2924,32 @@ nm_manager_activate_connection (NMManager *self,
return NULL; return NULL;
} }
/* Look for a active connection that's equivalent and is already pending authorization
* and eventual activation. This is used to de-duplicate concurrent activations which would
* otherwise race and cause the device to disconnect and reconnect repeatedly.
* In particular, this allows the master and multiple slaves to concurrently auto-activate
* while all the slaves would use the same active-connection. */
for (iter = priv->authorizing_connections; iter; iter = g_slist_next (iter)) {
active = iter->data;
if ( connection == nm_active_connection_get_connection (active)
&& g_strcmp0 (nm_active_connection_get_specific_object (active), specific_object) == 0
&& nm_active_connection_get_device (active) == device
&& nm_auth_subject_is_internal (nm_active_connection_get_subject (active))
&& nm_auth_subject_is_internal (subject))
return active;
}
active = _new_active_connection (self, active = _new_active_connection (self,
connection, connection,
specific_object, specific_object,
device, device,
subject, subject,
error); error);
if (active) if (active) {
priv->authorizing_connections = g_slist_prepend (priv->authorizing_connections, active);
nm_active_connection_authorize (active, _internal_activation_auth_done, self, NULL); nm_active_connection_authorize (active, _internal_activation_auth_done, self, NULL);
}
return active; return active;
} }

11
src/settings/plugins/ifcfg-rh/reader.c
View file

@ -4493,13 +4493,10 @@ make_vlan_setting (shvarFile *ifcfg,
/* Grab VLAN ID from interface name; this takes precedence over the /* Grab VLAN ID from interface name; this takes precedence over the
* separate VLAN_ID property for backwards compat. * separate VLAN_ID property for backwards compat.
*/ */
vlan_id = (gint) g_ascii_strtoll (p, &end, 10);
if (vlan_id < 0 || vlan_id > 4095 || end == p || *end) { gint device_vlan_id = (gint) g_ascii_strtoll (p, &end, 10);
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, if (device_vlan_id >= 0 && device_vlan_id <= 4095 && end != p && !*end)
"Failed to determine VLAN ID from DEVICE '%s'", vlan_id = device_vlan_id;
iface_name);
goto error;
}
} }
} }