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

cli/device: convert wifi subcommand to nmc_do_cmd()

Browse Source
This commit is contained in:
Lubomir Rintel
2016-06-24 19:03:33 +02:00
parent 46806d403c
commit 05108ca975
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
clients/cli/devices.c
View File

@@ -3575,6 +3575,14 @@ error:
return nmc->return_value; return nmc->return_value;
} }
static NMCCommand device_wifi_cmds[] = {
{"list", do_device_wifi_list, NULL },
{"connect", do_device_wifi_connect_network, NULL },
{"hotspot", do_device_wifi_hotspot, NULL },
{"rescan", do_device_wifi_rescan, NULL },
{NULL, do_device_wifi_list, NULL }
};
static NMCResultCode static NMCResultCode
do_device_wifi (NmCli *nmc, int argc, char **argv) do_device_wifi (NmCli *nmc, int argc, char **argv)
{ {
@@ -3590,24 +3598,7 @@ do_device_wifi (NmCli *nmc, int argc, char **argv)
return NMC_RESULT_ERROR_USER_INPUT; return NMC_RESULT_ERROR_USER_INPUT;
} }
if (argc == 0) return nmc_do_cmd (nmc, device_wifi_cmds, *argv, argc, argv);
nmc->return_value = do_device_wifi_list (nmc, argc-1, argv+1);
else if (argc > 0) {
if (matches (*argv, "list") == 0) {
nmc->return_value = do_device_wifi_list (nmc, argc-1, argv+1);
} else if (matches (*argv, "connect") == 0) {
nmc->return_value = do_device_wifi_connect_network (nmc, argc-1, argv+1);
} else if (matches (*argv, "hotspot") == 0) {
nmc->return_value = do_device_wifi_hotspot (nmc, argc-1, argv+1);
} else if (matches (*argv, "rescan") == 0) {
nmc->return_value = do_device_wifi_rescan (nmc, argc-1, argv+1);
} else {
g_string_printf (nmc->return_text, _("Error: 'device wifi' command '%s' is not valid."), *argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
}
}
return nmc->return_value;
} }
static int static int