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

cli: cleanup setting default interface-name

Browse Source
This commit is contained in:
Thomas Haller
2019-08-20 15:18:08 +02:00
parent 27d380b70e
commit e1ec22f74b
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
clients/cli/connections.c
View File

@@ -3754,29 +3754,35 @@ unique_master_iface_ifname (const GPtrArray *connections,
} }
static void static void
set_default_interface_name (NmCli *nmc, NMSettingConnection *s_con) set_default_interface_name (NmCli *nmc,
NMSettingConnection *s_con)
{ {
const GPtrArray *connections; const char *default_name;
char *ifname = NULL; const char *con_type;
const char *con_type = nm_setting_connection_get_connection_type (s_con);
if (nm_setting_connection_get_interface_name (s_con)) if (nm_setting_connection_get_interface_name (s_con))
return; return;
connections = nm_client_get_connections (nmc->client); con_type = nm_setting_connection_get_connection_type (s_con);
/* Set a sensible bond/team/bridge interface name by default */ /* Set a sensible bond/team/bridge interface name by default */
if (g_strcmp0 (con_type, NM_SETTING_BOND_SETTING_NAME) == 0) if (nm_streq (con_type, NM_SETTING_BOND_SETTING_NAME))
ifname = unique_master_iface_ifname (connections, "nm-bond"); default_name = "nm-bond";
else if (g_strcmp0 (con_type, NM_SETTING_TEAM_SETTING_NAME) == 0) else if (nm_streq (con_type, NM_SETTING_TEAM_SETTING_NAME))
ifname = unique_master_iface_ifname (connections, "nm-team"); default_name = "nm-team";
else if (g_strcmp0 (con_type, NM_SETTING_BRIDGE_SETTING_NAME) == 0) else if (nm_streq (con_type, NM_SETTING_BRIDGE_SETTING_NAME))
ifname = unique_master_iface_ifname (connections, "nm-bridge"); default_name = "nm-bridge";
else else
return; default_name = NULL;
g_object_set (s_con, NM_SETTING_CONNECTION_INTERFACE_NAME, ifname, NULL); if (default_name) {
g_free (ifname); const GPtrArray *connections;
gs_free char *ifname = NULL;
connections = nm_client_get_connections (nmc->client);
ifname = unique_master_iface_ifname (connections, default_name);
g_object_set (s_con, NM_SETTING_CONNECTION_INTERFACE_NAME, ifname, NULL);
}
} }
/*****************************************************************************/ /*****************************************************************************/
@@ -5332,11 +5338,12 @@ read_properties:
const char *ifname = nm_setting_connection_get_interface_name (s_con); const char *ifname = nm_setting_connection_get_interface_name (s_con);
const char *type = nm_setting_connection_get_connection_type (s_con); const char *type = nm_setting_connection_get_connection_type (s_con);
const char *slave_type = nm_setting_connection_get_slave_type (s_con); const char *slave_type = nm_setting_connection_get_slave_type (s_con);
char *try_name, *default_name;
/* If only bother when there's a type, which is not guaranteed at this point. /* If only bother when there's a type, which is not guaranteed at this point.
* Otherwise the validation will fail anyway. */ * Otherwise the validation will fail anyway. */
if (type) { if (type) {
gs_free char *try_name = NULL;
gs_free char *default_name = NULL;
const GPtrArray *connections; const GPtrArray *connections;
connections = nm_client_get_connections (nmc->client); connections = nm_client_get_connections (nmc->client);
@@ -5344,9 +5351,7 @@ read_properties:
? g_strdup_printf ("%s-%s", get_name_alias_toplevel (type, slave_type), ifname) ? g_strdup_printf ("%s-%s", get_name_alias_toplevel (type, slave_type), ifname)
: g_strdup (get_name_alias_toplevel (type, slave_type)); : g_strdup (get_name_alias_toplevel (type, slave_type));
default_name = nmc_unique_connection_name (connections, try_name); default_name = nmc_unique_connection_name (connections, try_name);
g_free (try_name);
g_object_set (s_con, NM_SETTING_CONNECTION_ID, default_name, NULL); g_object_set (s_con, NM_SETTING_CONNECTION_ID, default_name, NULL);
g_free (default_name);
} }
} }