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

cli: make id|uuid optional for 'nmcli connection down'

Browse Source 
and also allow identifying connetions with 'path' and 'apath' that accepts either
the whole D-Dus path or just an index.

nmcli connection down [id|uuid|path|apath] <ID>

Example:
nmcli connection down con1
nmcli connection down con1 con2 apath 1 id my-wifi
This commit is contained in:
Jiří Klimeš
2012-11-17 22:42:59 +01:00
committed by Dan Williams
parent 6d5a88f02c
commit 245d86bbcb
1 changed files with 33 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
cli/src/connections.c
View File

@@ -201,7 +201,7 @@ usage (void)
#else #else
" up [id|uuid|path] <ID> [iface <iface>] [ap <BSSID>] [--nowait] [--timeout <timeout>]\n" " up [id|uuid|path] <ID> [iface <iface>] [ap <BSSID>] [--nowait] [--timeout <timeout>]\n"
#endif #endif
" down id <id> | uuid <id>\n" " down [id|uuid|path|apath] <ID>\n"
" delete [id|uuid|path] <ID>\n" " delete [id|uuid|path] <ID>\n"
"\n" "\n"
)); ));
@@ -1523,47 +1523,11 @@ error:
static NMCResultCode static NMCResultCode
do_connection_down (NmCli *nmc, int argc, char **argv) do_connection_down (NmCli *nmc, int argc, char **argv)
{ {
NMConnection *connection = NULL; NMActiveConnection *active;
NMActiveConnection *active = NULL;
const GPtrArray *active_cons; const GPtrArray *active_cons;
const char *con_path;
const char *active_path;
gboolean id_specified = FALSE;
gboolean wait = TRUE;
int i;
while (argc > 0) { if (argc == 0) {
if (strcmp (*argv, "id") == 0 || strcmp (*argv, "uuid") == 0) { g_string_printf (nmc->return_text, _("Error: No connection specified."));
const char *selector = *argv;
id_specified = TRUE;
if (next_arg (&argc, &argv) != 0) {
g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error;
}
connection = find_connection (nmc->system_connections, selector, *argv);
if (!connection) {
g_string_printf (nmc->return_text, _("Error: Unknown connection: %s."), *argv);
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
goto error;
}
}
else if (strcmp (*argv, "--nowait") == 0) {
wait = FALSE;
}
else {
fprintf (stderr, _("Unknown parameter: %s\n"), *argv);
}
argc--;
argv++;
}
if (!id_specified) {
g_string_printf (nmc->return_text, _("Error: id or uuid has to be specified."));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto error;
} }
@@ -1577,24 +1541,40 @@ do_connection_down (NmCli *nmc, int argc, char **argv)
goto error; goto error;
} }
con_path = nm_connection_get_path (connection); /* Get active connections */
active_cons = nm_client_get_active_connections (nmc->client); active_cons = nm_client_get_active_connections (nmc->client);
for (i = 0; active_cons && (i < active_cons->len); i++) { while (argc > 0) {
NMActiveConnection *candidate = g_ptr_array_index (active_cons, i); const char *selector = NULL;
active_path = nm_active_connection_get_connection (candidate); if ( strcmp (*argv, "id") == 0
if (!strcmp (active_path, con_path)) { || strcmp (*argv, "uuid") == 0
active = candidate; || strcmp (*argv, "path") == 0
break; || strcmp (*argv, "apath") == 0) {
selector = *argv;
if (next_arg (&argc, &argv) != 0) {
g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error;
}
} }
active = find_active_connection (active_cons, nmc->system_connections, selector, *argv);
if (active) {
nm_client_deactivate_connection (nmc->client, active);
} else {
g_string_printf (nmc->return_text, _("Error: '%s' is not an active connection."), *argv);
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
goto error;
}
argc--;
argv++;
} }
if (active) // FIXME: do something better then sleep()
nm_client_deactivate_connection (nmc->client, active); /* Don't quit immediatelly and give NM time to check our permissions */
else sleep (1);
fprintf (stderr, _("Warning: Connection not active\n"));
sleep (1); /* Don't quit immediatelly and give NM time to check our permissions */
error: error:
nmc->should_wait = FALSE; nmc->should_wait = FALSE;