colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manager: sort slaves to be autoconnected by device name

Browse Source 
Autoconnect slaves based on device name order instead of activation
timestamp.
This commit is contained in:
Beniamino Galvani
2017-03-02 16:14:18 +01:00
parent 826f510303
commit 529a0a1a7f
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nm-manager.c
View File

@@ -2967,6 +2967,22 @@ out:
return FALSE;
}
static gint
compare_slaves (gconstpointer a, gconstpointer b, gpointer _unused)
{
const SlaveConnectionInfo *a_info = a;
const SlaveConnectionInfo *b_info = b;
/* Slaves without a device at the end */
if (!a_info->device)
return 1;
if (!b_info->device)
return -1;
return g_strcmp0 (nm_device_get_iface (a_info->device),
nm_device_get_iface (b_info->device));
}
static void
autoconnect_slaves (NMManager *self,
NMSettingsConnection *master_connection,
@@ -2980,6 +2996,10 @@ autoconnect_slaves (NMManager *self,
guint i, n_slaves = 0;
slaves = find_slaves (self, master_connection, master_device, &n_slaves);
if (n_slaves > 1) {
g_qsort_with_data (slaves, n_slaves, sizeof (slaves[0]),
compare_slaves, NULL);
}
for (i = 0; i < n_slaves; i++) {
SlaveConnectionInfo *slave = &slaves[i];