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

cli/device: make "lldp list" subcommand use get_device()

Browse Source
This commit is contained in:
Lubomir Rintel
2016-06-24 19:22:36 +02:00
parent 95a13ef100
commit 39f6d5a5ba
1 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
clients/cli/devices.c
View File

@@ -3654,24 +3654,26 @@ show_device_lldp_list (NMDevice *device, NmCli *nmc, char *fields_str, int *coun
static NMCResultCode static NMCResultCode
do_device_lldp_list (NmCli *nmc, int argc, char **argv) do_device_lldp_list (NmCli *nmc, int argc, char **argv)
{ {
NMDevice *device = NULL, **devices = NULL; NMDevice *device = NULL;
GError *error = NULL; gs_free_error GError *error = NULL;
const char *ifname = NULL;
char *fields_str; char *fields_str;
int i, counter = 0; int counter = 0;
while (argc > 0) { while (argc > 0) {
if (strcmp (*argv, "ifname") == 0) { if (strcmp (*argv, "ifname") == 0) {
if (next_arg (&argc, &argv) != 0) { if (next_arg (&argc, &argv) != 0) {
g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return NMC_RESULT_ERROR_USER_INPUT;
goto error; }
device = get_device (nmc, &argc, &argv, &error);
if (!device) {
g_string_printf (nmc->return_text, _("Error: %s."), error->message);
return error->code;
} }
ifname = *argv;
} else { } else {
g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *argv); g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return NMC_RESULT_ERROR_USER_INPUT;
goto error;
} }
argc--; argc--;
@@ -3689,41 +3691,25 @@ do_device_lldp_list (NmCli *nmc, int argc, char **argv)
if (error) { if (error) {
g_string_printf (nmc->return_text, _("Error: 'device lldp list': %s"), error->message); g_string_printf (nmc->return_text, _("Error: 'device lldp list': %s"), error->message);
g_error_free (error); return NMC_RESULT_ERROR_USER_INPUT;
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return nmc->return_value;
} }
devices = get_devices_sorted (nmc->client);
if (ifname) {
for (i = 0; devices[i]; i++) {
NMDevice *candidate = devices[i];
const char *dev_iface = nm_device_get_iface (candidate);
if (!g_strcmp0 (dev_iface, ifname)) {
device = candidate;
break;
}
}
if (!device) {
g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname);
nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND;
goto error;
}
if (device) {
nmc_empty_output_fields (nmc); nmc_empty_output_fields (nmc);
show_device_lldp_list (device, nmc, fields_str, &counter); show_device_lldp_list (device, nmc, fields_str, &counter);
} else { } else {
NMDevice **devices = get_devices_sorted (nmc->client);
int i;
for (i = 0; devices[i]; i++) { for (i = 0; devices[i]; i++) {
nmc_empty_output_fields (nmc); nmc_empty_output_fields (nmc);
show_device_lldp_list (devices[i], nmc, fields_str, &counter); show_device_lldp_list (devices[i], nmc, fields_str, &counter);
} }
g_free (devices);
} }
error:
g_free (devices);
return nmc->return_value; return nmc->return_value;
} }