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

cli: connection: factor out warning from "add" callback

Browse source 
We sometimes emit warnings after a connection is added. Currently
there's a warning when the connection ID collides with another one (and
a suggestion to use an UUID instead).

Let's move the check into a separate routine, so that we can reuse it
elsewhere, such as on connection "modify" (in a following commit).
This commit is contained in:
Lubomir Rintel 2022-03-08 12:02:40 +01:00
parent f377114d6e
commit b3f79ac366
1 changed files with 36 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/nmcli/connections.c
View file

@ -5240,6 +5240,41 @@ nmc_process_connection_properties(NmCli *nmc,
return TRUE;
}
static void
connection_warnings(NmCli *nmc, NMConnection *connection)
{
const GPtrArray *connections;
guint i, found;
const char *id;
connections = nm_client_get_connections(nmc->client);
if (!connections)
return;
id = nm_connection_get_id(connection);
found = 0;
for (i = 0; i < connections->len; i++) {
NMConnection *candidate = NM_CONNECTION(connections->pdata[i]);
if ((NMConnection *) connection == candidate)
continue;
if (nm_streq0(nm_connection_get_id(candidate), id))
found++;
}
if (found > 0) {
g_printerr(g_dngettext(GETTEXT_PACKAGE,
"Warning: There is another connection with the name '%1$s'. "
"Reference the connection by its uuid '%2$s'\n",
"Warning: There are %3$u other connections with the name "
"'%1$s'. Reference the connection by its uuid '%2$s'\n",
found),
id,
nm_connection_get_uuid(NM_CONNECTION(connection)),
found);
}
}
static void
add_connection_cb(GObject *client, GAsyncResult *result, gpointer user_data)
{
@ -5247,8 +5282,6 @@ add_connection_cb(GObject *client, GAsyncResult *result, gpointer user_data)
NmCli *nmc = info->nmc;
NMRemoteConnection *connection;
GError *error = NULL;
const GPtrArray *connections;
guint i, found;
connection = nm_client_add_connection2_finish(NM_CLIENT(client), result, NULL, &error);
if (error) {
@ -5259,29 +5292,7 @@ add_connection_cb(GObject *client, GAsyncResult *result, gpointer user_data)
g_error_free(error);
nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
} else {
connections = nm_client_get_connections(nmc->client);
if (connections) {
found = 0;
for (i = 0; i < connections->len; i++) {
NMConnection *candidate = NM_CONNECTION(connections->pdata[i]);
if ((NMConnection *) connection == candidate)
continue;
if (nm_streq0(nm_connection_get_id(candidate), info->new_id))
found++;
}
if (found > 0) {
g_printerr(g_dngettext(GETTEXT_PACKAGE,
"Warning: There is another connection with the name '%1$s'. "
"Reference the connection by its uuid '%2$s'\n",
"Warning: There are %3$u other connections with the name "
"'%1$s'. Reference the connection by its uuid '%2$s'\n",
found),
info->new_id,
nm_connection_get_uuid(NM_CONNECTION(connection)),
found);
}
}
connection_warnings(nmc, NM_CONNECTION(connection));
/* We print here human readable text, but as scripts might parse this output
* (with LANG=C), this is important to not change in the future. At least