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

merge: branch 'lr/completion-2'

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=768737
This commit is contained in:
Lubomir Rintel
2016-08-01 16:11:35 +02:00
parent 570e8ee296 8cc6ce7e44
commit 2956fd5fcb
13 changed files with 1264 additions and 1103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
clients/cli/agent.c
View File

@@ -138,6 +138,9 @@ secrets_requested (NMSecretAgentSimple *agent,
static NMCResultCode static NMCResultCode
do_agent_secret (NmCli *nmc, int argc, char **argv) do_agent_secret (NmCli *nmc, int argc, char **argv)
{ {
if (nmc->complete)
return nmc->return_value;
/* Create secret agent */ /* Create secret agent */
nmc->secret_agent = nm_secret_agent_simple_new ("nmcli-agent"); nmc->secret_agent = nm_secret_agent_simple_new ("nmcli-agent");
if (nmc->secret_agent) { if (nmc->secret_agent) {
@@ -160,6 +163,9 @@ do_agent_polkit (NmCli *nmc, int argc, char **argv)
{ {
GError *error = NULL; GError *error = NULL;
if (nmc->complete)
return nmc->return_value;
/* Initialize polkit agent */ /* Initialize polkit agent */
if (!nmc_polkit_agent_init (nmc, TRUE, &error)) { if (!nmc_polkit_agent_init (nmc, TRUE, &error)) {
g_dbus_error_strip_remote_error (error); g_dbus_error_strip_remote_error (error);
@@ -182,6 +188,9 @@ do_agent_all (NmCli *nmc, int argc, char **argv)
{ {
NMCResultCode secret_res; NMCResultCode secret_res;
if (nmc->complete)
return nmc->return_value;
/* Run both secret and polkit agent */ /* Run both secret and polkit agent */
secret_res = do_agent_secret (nmc, argc, argv); secret_res = do_agent_secret (nmc, argc, argv);
if (secret_res != NMC_RESULT_SUCCESS) if (secret_res != NMC_RESULT_SUCCESS)
@@ -195,6 +204,14 @@ do_agent_all (NmCli *nmc, int argc, char **argv)
return nmc->return_value; return nmc->return_value;
} }
static const NMCCommand agent_cmds[] = {
{"secret", do_agent_secret, usage_agent_secret },
{"polkit", do_agent_polkit, usage_agent_polkit },
{"all", do_agent_all, usage_agent_all },
{NULL, do_agent_all, usage }
};
NMCResultCode NMCResultCode
do_agent (NmCli *nmc, int argc, char **argv) do_agent (NmCli *nmc, int argc, char **argv)
{ {
@@ -208,39 +225,5 @@ do_agent (NmCli *nmc, int argc, char **argv)
return nmc->return_value; return nmc->return_value;
} }
if (argc == 0) { return nmc_do_cmd (nmc, agent_cmds, *argv, argc, argv);
nmc->return_value = do_agent_all (nmc, 0, NULL);
}
if (argc > 0) {
if (nmc_arg_is_help (*argv)) {
usage ();
goto usage_exit;
} else if (matches (*argv, "secret") == 0) {
if (nmc_arg_is_help (*(argv+1))) {
usage_agent_secret ();
goto usage_exit;
}
nmc->return_value = do_agent_secret (nmc, argc-1, argv+1);
} else if (matches (*argv, "polkit") == 0) {
if (nmc_arg_is_help (*(argv+1))) {
usage_agent_polkit ();
goto usage_exit;
}
nmc->return_value = do_agent_polkit (nmc, argc-1, argv+1);
} else if (matches (*argv, "all") == 0) {
if (nmc_arg_is_help (*(argv+1))) {
usage_agent_all ();
goto usage_exit;
}
nmc->return_value = do_agent_all (nmc, argc-1, argv+1);
} else {
usage ();
g_string_printf (nmc->return_text, _("Error: 'agent' command '%s' is not valid."), *argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
}
}
usage_exit:
return nmc->return_value;
} }

41
clients/cli/common.c
View File

@@ -872,6 +872,7 @@ nmc_team_check_config (const char *config, char **out_config, GError **error)
* @filter_val: connection to find (connection name, UUID or path) * @filter_val: connection to find (connection name, UUID or path)
* @start: where to start in @list. The location is updated so that the function * @start: where to start in @list. The location is updated so that the function
* can be called multiple times (for connections with the same name). * can be called multiple times (for connections with the same name).
* @complete: print possible completions
* *
* Find a connection in @list according to @filter_val. @filter_type determines * Find a connection in @list according to @filter_val. @filter_type determines
* what property is used for comparison. When @filter_type is NULL, compare * what property is used for comparison. When @filter_type is NULL, compare
@@ -885,7 +886,8 @@ NMConnection *
nmc_find_connection (const GPtrArray *connections, nmc_find_connection (const GPtrArray *connections,
const char *filter_type, const char *filter_type,
const char *filter_val, const char *filter_val,
int *start) int *start,
gboolean complete)
{ {
NMConnection *connection; NMConnection *connection;
NMConnection *found = NULL; NMConnection *found = NULL;
@@ -907,12 +909,29 @@ nmc_find_connection (const GPtrArray *connections,
* type. If 'path' filter type is specified, comparison against * type. If 'path' filter type is specified, comparison against
* numeric index (in addition to the whole path) is allowed. * numeric index (in addition to the whole path) is allowed.
*/ */
if ( ( (!filter_type || strcmp (filter_type, "id") == 0) if (!filter_type || strcmp (filter_type, "id") == 0) {
&& strcmp (filter_val, id) == 0) if (complete)
|| ( (!filter_type || strcmp (filter_type, "uuid") == 0) nmc_complete_strings (filter_val, id, NULL);
&& strcmp (filter_val, uuid) == 0) if (strcmp (filter_val, id) == 0)
|| ( (!filter_type || strcmp (filter_type, "path") == 0) goto found;
&& (g_strcmp0 (filter_val, path) == 0 || (filter_type && g_strcmp0 (filter_val, path_num) == 0)))) { }
if (!filter_type || strcmp (filter_type, "uuid") == 0) {
if (complete && (filter_type || *filter_val))
nmc_complete_strings (filter_val, uuid, NULL);
if (strcmp (filter_val, uuid) == 0)
goto found;
}
if (!filter_type || strcmp (filter_type, "path") == 0) {
if (complete && (filter_type || *filter_val))
nmc_complete_strings (filter_val, path, filter_type ? path_num : NULL, NULL);
if (g_strcmp0 (filter_val, path) == 0 || (filter_type && g_strcmp0 (filter_val, path_num) == 0))
goto found;
}
continue;
found:
if (!start) if (!start)
return connection; return connection;
if (found) { if (found) {
@@ -921,7 +940,6 @@ nmc_find_connection (const GPtrArray *connections,
} }
found = connection; found = connection;
} }
}
if (start) if (start)
*start = 0; *start = 0;
@@ -1096,7 +1114,7 @@ nmc_secrets_requested (NMSecretAgentSimple *agent,
p = strrchr (path, '/'); p = strrchr (path, '/');
if (p) if (p)
*p = '\0'; *p = '\0';
connection = nmc_find_connection (nmc->connections, "path", path, NULL); connection = nmc_find_connection (nmc->connections, "path", path, NULL, FALSE);
g_free (path); g_free (path);
} }
@@ -1416,6 +1434,9 @@ nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char
{ {
const NMCCommand *c; const NMCCommand *c;
if (argc == 0 && nmc->complete)
return nmc->return_value;
if (argc == 1 && nmc->complete) { if (argc == 1 && nmc->complete) {
for (c = cmds; c->cmd; ++c) { for (c = cmds; c->cmd; ++c) {
if (!*cmd || matches (cmd, c->cmd) == 0) if (!*cmd || matches (cmd, c->cmd) == 0)
@@ -1445,7 +1466,7 @@ nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char
} }
} else if (c->func) { } else if (c->func) {
/* No command, run the default handler. */ /* No command, run the default handler. */
nmc->return_value = c->func (nmc, argc-1, argv+1); nmc->return_value = c->func (nmc, argc, argv);
} else { } else {
/* No command and no default handler. */ /* No command and no default handler. */
g_string_printf (nmc->return_text, _("Error: missing argument. Try passing --help.")); g_string_printf (nmc->return_text, _("Error: missing argument. Try passing --help."));

8
clients/cli/common.h
View File

@@ -48,7 +48,8 @@ gboolean nmc_team_check_config (const char *config, char **out_config, GError **
NMConnection *nmc_find_connection (const GPtrArray *connections, NMConnection *nmc_find_connection (const GPtrArray *connections,
const char *filter_type, const char *filter_type,
const char *filter_val, const char *filter_val,
int *start); int *start,
gboolean complete);
void nmc_secrets_requested (NMSecretAgentSimple *agent, void nmc_secrets_requested (NMSecretAgentSimple *agent,
const char *request_id, const char *request_id,
@@ -85,4 +86,9 @@ void nmc_complete_strings (const char *prefix, ...) G_GNUC_NULL_TERMINATED;
void nmc_complete_bool (const char *prefix); void nmc_complete_bool (const char *prefix);
extern NmcOutputField nmc_fields_ip4_config[];
extern NmcOutputField nmc_fields_dhcp4_config[];
extern NmcOutputField nmc_fields_ip6_config[];
extern NmcOutputField nmc_fields_dhcp6_config[];
#endif /* NMC_COMMON_H */ #endif /* NMC_COMMON_H */

1010
clients/cli/connections.c
View File

File diff suppressed because it is too large Load Diff

6
clients/cli/connections.h
View File

@@ -35,4 +35,10 @@ nmc_read_connection_properties (NmCli *nmc,
void nmc_active_connection_state_to_color (NMActiveConnectionState state, NmcTermColor *color); void nmc_active_connection_state_to_color (NMActiveConnectionState state, NmcTermColor *color);
extern NmcOutputField nmc_fields_con_show[];
extern NmcOutputField nmc_fields_settings_names[];
extern NmcOutputField nmc_fields_con_active_details_general[];
extern NmcOutputField nmc_fields_con_active_details_vpn[];
extern NmcOutputField nmc_fields_con_active_details_groups[];
#endif /* NMC_CONNECTIONS_H */ #endif /* NMC_CONNECTIONS_H */

482
clients/cli/devices.c
View File

@@ -37,7 +37,7 @@
#define PROMPT_INTERFACES _("Interface(s): ") #define PROMPT_INTERFACES _("Interface(s): ")
/* Available fields for 'device status' */ /* Available fields for 'device status' */
static NmcOutputField nmc_fields_dev_status[] = { NmcOutputField nmc_fields_dev_status[] = {
{"DEVICE", N_("DEVICE")}, /* 0 */ {"DEVICE", N_("DEVICE")}, /* 0 */
{"TYPE", N_("TYPE")}, /* 1 */ {"TYPE", N_("TYPE")}, /* 1 */
{"STATE", N_("STATE")}, /* 2 */ {"STATE", N_("STATE")}, /* 2 */
@@ -52,7 +52,7 @@ static NmcOutputField nmc_fields_dev_status[] = {
/* Available fields for 'device show' - GENERAL part */ /* Available fields for 'device show' - GENERAL part */
static NmcOutputField nmc_fields_dev_show_general[] = { NmcOutputField nmc_fields_dev_show_general[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"DEVICE", N_("DEVICE")}, /* 1 */ {"DEVICE", N_("DEVICE")}, /* 1 */
{"TYPE", N_("TYPE")}, /* 2 */ {"TYPE", N_("TYPE")}, /* 2 */
@@ -86,7 +86,7 @@ static NmcOutputField nmc_fields_dev_show_general[] = {
#define NMC_FIELDS_DEV_SHOW_GENERAL_COMMON "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,HWADDR,STATE" #define NMC_FIELDS_DEV_SHOW_GENERAL_COMMON "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,HWADDR,STATE"
/* Available fields for 'device show' - CONNECTIONS part */ /* Available fields for 'device show' - CONNECTIONS part */
static NmcOutputField nmc_fields_dev_show_connections[] = { NmcOutputField nmc_fields_dev_show_connections[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"AVAILABLE-CONNECTION-PATHS", N_("AVAILABLE-CONNECTION-PATHS")}, /* 1 */ {"AVAILABLE-CONNECTION-PATHS", N_("AVAILABLE-CONNECTION-PATHS")}, /* 1 */
{"AVAILABLE-CONNECTIONS", N_("AVAILABLE-CONNECTIONS")}, /* 2 */ {"AVAILABLE-CONNECTIONS", N_("AVAILABLE-CONNECTIONS")}, /* 2 */
@@ -96,7 +96,7 @@ static NmcOutputField nmc_fields_dev_show_connections[] = {
#define NMC_FIELDS_DEV_SHOW_CONNECTIONS_COMMON "AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS" #define NMC_FIELDS_DEV_SHOW_CONNECTIONS_COMMON "AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS"
/* Available fields for 'device show' - CAPABILITIES part */ /* Available fields for 'device show' - CAPABILITIES part */
static NmcOutputField nmc_fields_dev_show_cap[] = { NmcOutputField nmc_fields_dev_show_cap[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"CARRIER-DETECT", N_("CARRIER-DETECT")}, /* 1 */ {"CARRIER-DETECT", N_("CARRIER-DETECT")}, /* 1 */
{"SPEED", N_("SPEED")}, /* 2 */ {"SPEED", N_("SPEED")}, /* 2 */
@@ -107,7 +107,7 @@ static NmcOutputField nmc_fields_dev_show_cap[] = {
#define NMC_FIELDS_DEV_SHOW_CAP_COMMON "NAME,CARRIER-DETECT,SPEED,IS-SOFTWARE" #define NMC_FIELDS_DEV_SHOW_CAP_COMMON "NAME,CARRIER-DETECT,SPEED,IS-SOFTWARE"
/* Available fields for 'device show' - wired properties part */ /* Available fields for 'device show' - wired properties part */
static NmcOutputField nmc_fields_dev_show_wired_prop[] = { NmcOutputField nmc_fields_dev_show_wired_prop[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"CARRIER", N_("CARRIER")}, /* 1 */ {"CARRIER", N_("CARRIER")}, /* 1 */
{"S390-SUBCHANNELS", N_("S390-SUBCHANNELS")}, /* 2 */ {"S390-SUBCHANNELS", N_("S390-SUBCHANNELS")}, /* 2 */
@@ -117,7 +117,7 @@ static NmcOutputField nmc_fields_dev_show_wired_prop[] = {
#define NMC_FIELDS_DEV_SHOW_WIRED_PROP_COMMON "NAME,CARRIER,S390-SUBCHANNELS" #define NMC_FIELDS_DEV_SHOW_WIRED_PROP_COMMON "NAME,CARRIER,S390-SUBCHANNELS"
/* Available fields for 'device show' - wireless properties part */ /* Available fields for 'device show' - wireless properties part */
static NmcOutputField nmc_fields_dev_show_wifi_prop[] = { NmcOutputField nmc_fields_dev_show_wifi_prop[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"WEP", N_("WEP")}, /* 1 */ {"WEP", N_("WEP")}, /* 1 */
{"WPA", N_("WPA")}, /* 2 */ {"WPA", N_("WPA")}, /* 2 */
@@ -134,7 +134,7 @@ static NmcOutputField nmc_fields_dev_show_wifi_prop[] = {
#define NMC_FIELDS_DEV_SHOW_WIFI_PROP_COMMON "NAME,WEP,WPA,WPA2,TKIP,CCMP,AP,ADHOC" #define NMC_FIELDS_DEV_SHOW_WIFI_PROP_COMMON "NAME,WEP,WPA,WPA2,TKIP,CCMP,AP,ADHOC"
/* Available fields for 'device show' - wimax properties part */ /* Available fields for 'device show' - wimax properties part */
static NmcOutputField nmc_fields_dev_show_wimax_prop[] = { NmcOutputField nmc_fields_dev_show_wimax_prop[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"CTR-FREQ", N_("CTR-FREQ")}, /* 1 */ {"CTR-FREQ", N_("CTR-FREQ")}, /* 1 */
{"RSSI", N_("RSSI")}, /* 2 */ {"RSSI", N_("RSSI")}, /* 2 */
@@ -147,7 +147,7 @@ static NmcOutputField nmc_fields_dev_show_wimax_prop[] = {
#define NMC_FIELDS_DEV_SHOW_WIMAX_PROP_COMMON "NAME,CTR-FREQ,RSSI,CINR,TX-POW,BSID" #define NMC_FIELDS_DEV_SHOW_WIMAX_PROP_COMMON "NAME,CTR-FREQ,RSSI,CINR,TX-POW,BSID"
/* Available fields for 'device wifi list' */ /* Available fields for 'device wifi list' */
static NmcOutputField nmc_fields_dev_wifi_list[] = { NmcOutputField nmc_fields_dev_wifi_list[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"SSID", N_("SSID")}, /* 1 */ {"SSID", N_("SSID")}, /* 1 */
{"SSID-HEX", N_("SSID-HEX")}, /* 2 */ {"SSID-HEX", N_("SSID-HEX")}, /* 2 */
@@ -173,7 +173,7 @@ static NmcOutputField nmc_fields_dev_wifi_list[] = {
#define NMC_FIELDS_DEV_WIFI_LIST_FOR_DEV_LIST "NAME,"NMC_FIELDS_DEV_WIFI_LIST_COMMON #define NMC_FIELDS_DEV_WIFI_LIST_FOR_DEV_LIST "NAME,"NMC_FIELDS_DEV_WIFI_LIST_COMMON
/* Available fields for 'device wimax list' */ /* Available fields for 'device wimax list' */
static NmcOutputField nmc_fields_dev_wimax_list[] = { NmcOutputField nmc_fields_dev_wimax_list[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"NSP", N_("NSP")}, /* 1 */ {"NSP", N_("NSP")}, /* 1 */
{"SIGNAL", N_("SIGNAL")}, /* 2 */ {"SIGNAL", N_("SIGNAL")}, /* 2 */
@@ -188,7 +188,7 @@ static NmcOutputField nmc_fields_dev_wimax_list[] = {
#define NMC_FIELDS_DEV_WIMAX_LIST_FOR_DEV_LIST "NAME,"NMC_FIELDS_DEV_WIMAX_LIST_COMMON #define NMC_FIELDS_DEV_WIMAX_LIST_FOR_DEV_LIST "NAME,"NMC_FIELDS_DEV_WIMAX_LIST_COMMON
/* Available fields for 'device show' - BOND, BRIDGE part */ /* Available fields for 'device show' - BOND, BRIDGE part */
static NmcOutputField nmc_fields_dev_show_master_prop[] = { NmcOutputField nmc_fields_dev_show_master_prop[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"SLAVES", N_("SLAVES")}, /* 1 */ {"SLAVES", N_("SLAVES")}, /* 1 */
{NULL, NULL} {NULL, NULL}
@@ -197,7 +197,7 @@ static NmcOutputField nmc_fields_dev_show_master_prop[] = {
#define NMC_FIELDS_DEV_SHOW_MASTER_PROP_COMMON "NAME,SLAVES" #define NMC_FIELDS_DEV_SHOW_MASTER_PROP_COMMON "NAME,SLAVES"
/* Available fields for 'device show' - TEAM part */ /* Available fields for 'device show' - TEAM part */
static NmcOutputField nmc_fields_dev_show_team_prop[] = { NmcOutputField nmc_fields_dev_show_team_prop[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"SLAVES", N_("SLAVES")}, /* 1 */ {"SLAVES", N_("SLAVES")}, /* 1 */
{"CONFIG", N_("CONFIG")}, /* 2 */ {"CONFIG", N_("CONFIG")}, /* 2 */
@@ -207,7 +207,7 @@ static NmcOutputField nmc_fields_dev_show_team_prop[] = {
#define NMC_FIELDS_DEV_SHOW_TEAM_PROP_COMMON "NAME,SLAVES,CONFIG" #define NMC_FIELDS_DEV_SHOW_TEAM_PROP_COMMON "NAME,SLAVES,CONFIG"
/* Available fields for 'device show' - VLAN part */ /* Available fields for 'device show' - VLAN part */
static NmcOutputField nmc_fields_dev_show_vlan_prop[] = { NmcOutputField nmc_fields_dev_show_vlan_prop[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"PARENT", N_("PARENT")}, /* 1 */ {"PARENT", N_("PARENT")}, /* 1 */
{"ID", N_("ID")}, /* 2 */ {"ID", N_("ID")}, /* 2 */
@@ -217,7 +217,7 @@ static NmcOutputField nmc_fields_dev_show_vlan_prop[] = {
#define NMC_FIELDS_DEV_SHOW_VLAN_PROP_COMMON "NAME,PARENT,ID" #define NMC_FIELDS_DEV_SHOW_VLAN_PROP_COMMON "NAME,PARENT,ID"
/* Available fields for 'device show' - BLUETOOTH part */ /* Available fields for 'device show' - BLUETOOTH part */
static NmcOutputField nmc_fields_dev_show_bluetooth[] = { NmcOutputField nmc_fields_dev_show_bluetooth[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"CAPABILITIES", N_("CAPABILITIES")}, /* 1 */ {"CAPABILITIES", N_("CAPABILITIES")}, /* 1 */
{NULL, NULL} {NULL, NULL}
@@ -232,7 +232,7 @@ extern NmcOutputField nmc_fields_dhcp4_config[];
extern NmcOutputField nmc_fields_dhcp6_config[]; extern NmcOutputField nmc_fields_dhcp6_config[];
/* Available sections for 'device show' */ /* Available sections for 'device show' */
static NmcOutputField nmc_fields_dev_show_sections[] = { NmcOutputField nmc_fields_dev_show_sections[] = {
{"GENERAL", N_("GENERAL"), 0, nmc_fields_dev_show_general + 1 }, /* 0 */ {"GENERAL", N_("GENERAL"), 0, nmc_fields_dev_show_general + 1 }, /* 0 */
{"CAPABILITIES", N_("CAPABILITIES"), 0, nmc_fields_dev_show_cap + 1 }, /* 1 */ {"CAPABILITIES", N_("CAPABILITIES"), 0, nmc_fields_dev_show_cap + 1 }, /* 1 */
{"WIFI-PROPERTIES", N_("WIFI-PROPERTIES"), 0, nmc_fields_dev_show_wifi_prop + 1 }, /* 2 */ {"WIFI-PROPERTIES", N_("WIFI-PROPERTIES"), 0, nmc_fields_dev_show_wifi_prop + 1 }, /* 2 */
@@ -258,7 +258,7 @@ static NmcOutputField nmc_fields_dev_show_sections[] = {
"GENERAL.CONNECTION,GENERAL.CON-PATH,WIRED-PROPERTIES,IP4,IP6" "GENERAL.CONNECTION,GENERAL.CON-PATH,WIRED-PROPERTIES,IP4,IP6"
/* Available fields for 'device lldp' */ /* Available fields for 'device lldp' */
static NmcOutputField nmc_fields_dev_lldp_list[] = { NmcOutputField nmc_fields_dev_lldp_list[] = {
{"NAME", N_("NAME")}, /* 0 */ {"NAME", N_("NAME")}, /* 0 */
{"DEVICE", N_("DEVICE")}, /* 1 */ {"DEVICE", N_("DEVICE")}, /* 1 */
{"CHASSIS-ID", N_("CHASSIS-ID")}, /* 2 */ {"CHASSIS-ID", N_("CHASSIS-ID")}, /* 2 */
@@ -538,18 +538,30 @@ nmc_get_devices_sorted (NMClient *client)
} }
static void static void
complete_device (NMDevice **devices, const char *prefix) complete_device (NMDevice **devices, const char *prefix, gboolean wifi_only)
{ {
int i; int i;
for (i = 0; devices[i]; i++) { for (i = 0; devices[i]; i++) {
const char *iface = nm_device_get_iface (devices[i]); const char *iface = nm_device_get_iface (devices[i]);
if (wifi_only && !NM_IS_DEVICE_WIFI (devices[i]))
continue;
if (g_str_has_prefix (iface, prefix)) if (g_str_has_prefix (iface, prefix))
g_print ("%s\n", iface); g_print ("%s\n", iface);
} }
} }
void
nmc_complete_device (NMClient *client, const char *prefix, gboolean wifi_only)
{
gs_free NMDevice **devices = NULL;
devices = nmc_get_devices_sorted (client);
complete_device (devices, prefix, wifi_only);
}
static GSList * static GSList *
get_device_list (NmCli *nmc, int argc, char **argv) get_device_list (NmCli *nmc, int argc, char **argv)
{ {
@@ -578,7 +590,7 @@ get_device_list (NmCli *nmc, int argc, char **argv)
devices = nmc_get_devices_sorted (nmc->client); devices = nmc_get_devices_sorted (nmc->client);
while (arg_num > 0) { while (arg_num > 0) {
if (arg_num == 1 && nmc->complete) if (arg_num == 1 && nmc->complete)
complete_device (devices, *arg_ptr); complete_device (devices, *arg_ptr, FALSE);
device = NULL; device = NULL;
for (i = 0; devices[i]; i++) { for (i = 0; devices[i]; i++) {
@@ -640,7 +652,7 @@ get_device (NmCli *nmc, int *argc, char ***argv, GError **error)
} }
if (nmc->complete && !*argc) if (nmc->complete && !*argc)
complete_device (devices, ifname); complete_device (devices, ifname, FALSE);
if (devices[i] == NULL) { if (devices[i] == NULL) {
g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_NOT_FOUND, g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_NOT_FOUND,
@@ -2484,6 +2496,118 @@ show_access_point_info (NMDevice *device, NmCli *nmc)
g_free (info); g_free (info);
} }
/*
* Find a Wi-Fi device with 'iface' in 'devices' array. If 'iface' is NULL,
* the first Wi-Fi device is returned. 'idx' parameter is updated to the point
* where the function finished so that the function can be called repeatedly
* to get next matching device.
* Returns: found device or NULL
*/
static NMDevice *
find_wifi_device_by_iface (NMDevice **devices, const char *iface, int *idx)
{
int i;
for (i = idx ? *idx : 0; devices[i]; i++) {
const char *dev_iface = nm_device_get_iface (devices[i]);
if (!NM_IS_DEVICE_WIFI (devices[i]))
continue;
if (iface) {
/* If a iface was specified then use it. */
if (g_strcmp0 (dev_iface, iface) == 0)
break;
} else {
/* Else return the first Wi-Fi device. */
break;
}
}
if (idx)
*idx = i + 1;
return devices[i];
}
/*
* Find AP on 'device' according to 'bssid' or 'ssid' parameter.
* Returns: found AP or NULL
*/
static NMAccessPoint *
find_ap_on_device (NMDevice *device, const char *bssid, const char *ssid, gboolean complete)
{
const GPtrArray *aps;
NMAccessPoint *ap = NULL;
int i;
g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL);
aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device));
for (i = 0; i < aps->len; i++) {
NMAccessPoint *candidate_ap = g_ptr_array_index (aps, i);
if (bssid) {
/* Parameter is BSSID */
const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap);
/* Compare BSSIDs */
if (complete) {
if (g_str_has_prefix (candidate_bssid, bssid))
g_print ("%s\n", candidate_bssid);
} else if (strcmp (bssid, candidate_bssid) == 0) {
ap = candidate_ap;
break;
}
}
if (ssid) {
/* Parameter is SSID */
GBytes *candidate_ssid;
char *ssid_tmp;
candidate_ssid = nm_access_point_get_ssid (candidate_ap);
if (!candidate_ssid)
continue;
ssid_tmp = nm_utils_ssid_to_utf8 (g_bytes_get_data (candidate_ssid, NULL),
g_bytes_get_size (candidate_ssid));
/* Compare SSIDs */
if (complete) {
if (g_str_has_prefix (ssid_tmp, ssid))
g_print ("%s\n", ssid_tmp);
} else if (strcmp (ssid, ssid_tmp) == 0) {
ap = candidate_ap;
g_free (ssid_tmp);
break;
}
g_free (ssid_tmp);
}
}
return ap;
}
static void
complete_aps (NMDevice **devices, const char *ifname,
const char *bssid_prefix, const char *ssid_prefix)
{
int devices_idx = 0;
NMDevice *device;
while ((device = find_wifi_device_by_iface (devices, ifname, &devices_idx)))
find_ap_on_device (device, bssid_prefix, ssid_prefix, TRUE);
}
void
nmc_complete_bssid (NMClient *client, const char *ifname, const char *bssid_prefix)
{
gs_free NMDevice **devices = NULL;
devices = nmc_get_devices_sorted (client);
complete_aps (devices, ifname, bssid_prefix, NULL);
}
static NMCResultCode static NMCResultCode
do_device_wifi_list (NmCli *nmc, int argc, char **argv) do_device_wifi_list (NmCli *nmc, int argc, char **argv)
{ {
@@ -2492,7 +2616,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
NMAccessPoint *ap = NULL; NMAccessPoint *ap = NULL;
const char *ifname = NULL; const char *ifname = NULL;
const char *bssid_user = NULL; const char *bssid_user = NULL;
NMDevice **devices = NULL; gs_free NMDevice **devices = NULL;
const GPtrArray *aps; const GPtrArray *aps;
APInfo *info; APInfo *info;
int i, j; int i, j;
@@ -2503,27 +2627,29 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
size_t tmpl_len; size_t tmpl_len;
const char *base_hdr = _("Wi-Fi scan list"); const char *base_hdr = _("Wi-Fi scan list");
/* Not (yet?) supported */ devices = nmc_get_devices_sorted (nmc->client);
if (nmc->complete)
return nmc->return_value;
while (argc > 0) { while (argc > 0) {
if (argc == 1 && nmc->complete)
nmc_complete_strings (*argv, "ifname", "bssid", NULL);
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;
} }
ifname = *argv; ifname = *argv;
complete_device (devices, ifname, TRUE);
} else if (strcmp (*argv, "bssid") == 0 || strcmp (*argv, "hwaddr") == 0) { } else if (strcmp (*argv, "bssid") == 0 || strcmp (*argv, "hwaddr") == 0) {
/* hwaddr is deprecated and will be removed later */ /* hwaddr is deprecated and will be removed later */
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;
} }
bssid_user = *argv; bssid_user = *argv;
} else { if (argc == 1 && nmc->complete)
complete_aps (devices, NULL, bssid_user, NULL);
} else if (!nmc->complete) {
g_printerr (_("Unknown parameter: %s\n"), *argv); g_printerr (_("Unknown parameter: %s\n"), *argv);
} }
@@ -2545,28 +2671,18 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
if (error) { if (error) {
g_string_printf (nmc->return_text, _("Error: 'device wifi': %s"), error->message); g_string_printf (nmc->return_text, _("Error: 'device wifi': %s"), error->message);
g_error_free (error); g_error_free (error);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return NMC_RESULT_ERROR_USER_INPUT;
goto error;
} }
devices = nmc_get_devices_sorted (nmc->client); if (nmc->complete)
return nmc->return_value;
if (ifname) { if (ifname) {
/* Device specified - list only APs of this interface */ device = find_wifi_device_by_iface (devices, ifname, NULL);
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) { if (!device) {
g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname);
nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; return NMC_RESULT_ERROR_NOT_FOUND;
goto error;
} }
/* Main header name */ /* Main header name */
nmc->print_fields.header_name = (char *) construct_header_name (base_hdr, ifname); nmc->print_fields.header_name = (char *) construct_header_name (base_hdr, ifname);
@@ -2587,8 +2703,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
if (!ap) { if (!ap) {
g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."),
bssid_user); bssid_user);
nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; return NMC_RESULT_ERROR_NOT_FOUND;
goto error;
} }
/* Add headers (field names) */ /* Add headers (field names) */
arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES);
@@ -2619,8 +2734,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
_("Error: Device '%s' is not a Wi-Fi device."), _("Error: Device '%s' is not a Wi-Fi device."),
ifname); ifname);
} }
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; return NMC_RESULT_ERROR_UNKNOWN;
goto error;
} }
} else { } else {
gboolean empty_line = FALSE; gboolean empty_line = FALSE;
@@ -2671,8 +2785,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
if (!ap) { if (!ap) {
g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."),
bssid_user); bssid_user);
nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; return NMC_RESULT_ERROR_NOT_FOUND;
goto error;
} }
} else { } else {
for (i = 0; devices[i]; i++) { for (i = 0; devices[i]; i++) {
@@ -2693,101 +2806,9 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
} }
} }
error:
g_free (devices);
return nmc->return_value; return nmc->return_value;
} }
/*
* Find a Wi-Fi device with 'iface' in 'devices' array. If 'iface' is NULL,
* the first Wi-Fi device is returned. 'idx' parameter is updated to the point
* where the function finished so that the function can be called repeatedly
* to get next matching device.
* Returns: found device or NULL
*/
static NMDevice *
find_wifi_device_by_iface (const GPtrArray *devices, const char *iface, int *idx)
{
NMDevice *device = NULL;
int i;
for (i = *idx; i < devices->len; i++) {
NMDevice *candidate = g_ptr_array_index (devices, i);
const char *dev_iface = nm_device_get_iface (candidate);
if (!NM_IS_DEVICE_WIFI (candidate))
continue;
if (iface) {
/* If a iface was specified then use it. */
if (g_strcmp0 (dev_iface, iface) == 0) {
device = candidate;
break;
}
} else {
/* Else return the first Wi-Fi device. */
device = candidate;
break;
}
}
*idx = i + 1;
return device;
}
/*
* Find AP on 'device' according to 'bssid' or 'ssid' parameter.
* Returns: found AP or NULL
*/
static NMAccessPoint *
find_ap_on_device (NMDevice *device, GByteArray *bssid, const char *ssid)
{
const GPtrArray *aps;
NMAccessPoint *ap = NULL;
int i;
g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL);
g_return_val_if_fail ((bssid && !ssid) || (!bssid && ssid), NULL);
aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device));
for (i = 0; i < aps->len; i++) {
NMAccessPoint *candidate_ap = g_ptr_array_index (aps, i);
if (ssid) {
/* Parameter is SSID */
GBytes *candidate_ssid;
candidate_ssid = nm_access_point_get_ssid (candidate_ap);
if (candidate_ssid) {
char *ssid_tmp = nm_utils_ssid_to_utf8 (g_bytes_get_data (candidate_ssid, NULL),
g_bytes_get_size (candidate_ssid));
/* Compare SSIDs */
if (strcmp (ssid, ssid_tmp) == 0) {
ap = candidate_ap;
g_free (ssid_tmp);
break;
}
g_free (ssid_tmp);
}
} else if (bssid) {
/* Parameter is BSSID */
const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap);
char *bssid_up = nm_utils_hwaddr_ntoa (bssid->data, bssid->len);
/* Compare BSSIDs */
if (strcmp (bssid_up, candidate_bssid) == 0) {
ap = candidate_ap;
g_free (bssid_up);
break;
}
g_free (bssid_up);
}
}
return ap;
}
static NMCResultCode static NMCResultCode
do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
{ {
@@ -2811,27 +2832,31 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
gboolean wep_passphrase = FALSE; gboolean wep_passphrase = FALSE;
GByteArray *bssid1_arr = NULL; GByteArray *bssid1_arr = NULL;
GByteArray *bssid2_arr = NULL; GByteArray *bssid2_arr = NULL;
const GPtrArray *devices; gs_free NMDevice **devices = NULL;
int devices_idx; int devices_idx;
char *ssid_ask = NULL; char *ssid_ask = NULL;
char *passwd_ask = NULL; char *passwd_ask = NULL;
/* Not (yet?) supported */
if (nmc->complete)
return nmc->return_value;
/* Set default timeout waiting for operation completion. */ /* Set default timeout waiting for operation completion. */
if (nmc->timeout == -1) if (nmc->timeout == -1)
nmc->timeout = 90; nmc->timeout = 90;
devices = nmc_get_devices_sorted (nmc->client);
/* Get the first compulsory argument (SSID or BSSID) */ /* Get the first compulsory argument (SSID or BSSID) */
if (argc > 0) { if (argc > 0) {
param_user = *argv; param_user = *argv;
bssid1_arr = nm_utils_hwaddr_atoba (param_user, ETH_ALEN); bssid1_arr = nm_utils_hwaddr_atoba (param_user, ETH_ALEN);
if (argc == 1 && nmc->complete)
complete_aps (devices, NULL, param_user, param_user);
argc--; argc--;
argv++; argv++;
} else { } else {
/* nmc_do_cmd() should not call this with argc=0. */
g_assert (!nmc->complete);
if (nmc->ask) { if (nmc->ask) {
ssid_ask = nmc_readline (_("SSID or BSSID: ")); ssid_ask = nmc_readline (_("SSID or BSSID: "));
param_user = ssid_ask ? ssid_ask : ""; param_user = ssid_ask ? ssid_ask : "";
@@ -2840,46 +2865,56 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
if (!ssid_ask) { if (!ssid_ask) {
g_string_printf (nmc->return_text, _("Error: SSID or BSSID are missing.")); g_string_printf (nmc->return_text, _("Error: SSID or BSSID are missing."));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
} }
/* Get the rest of the parameters */ /* Get the rest of the parameters */
while (argc > 0) { while (argc > 0) {
if (argc == 1 && nmc->complete) {
nmc_complete_strings (*argv, "ifname", "bssid", "password", "wep-key-type",
"name", "private", "hidden", NULL);
}
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; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
ifname = *argv; ifname = *argv;
complete_device (devices, ifname, TRUE);
} else if (strcmp (*argv, "bssid") == 0) { } else if (strcmp (*argv, "bssid") == 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; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
bssid = *argv; bssid = *argv;
if (argc == 1 && nmc->complete)
complete_aps (devices, NULL, bssid, NULL);
bssid2_arr = nm_utils_hwaddr_atoba (bssid, ETH_ALEN); bssid2_arr = nm_utils_hwaddr_atoba (bssid, ETH_ALEN);
if (!bssid2_arr) { if (!bssid2_arr) {
g_string_printf (nmc->return_text, _("Error: bssid argument value '%s' is not a valid BSSID."), g_string_printf (nmc->return_text, _("Error: bssid argument value '%s' is not a valid BSSID."),
bssid); bssid);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
} else if (strcmp (*argv, "password") == 0) { } else if (strcmp (*argv, "password") == 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; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
password = *argv; password = *argv;
} else if (strcmp (*argv, "wep-key-type") == 0) { } else if (strcmp (*argv, "wep-key-type") == 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; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
if (argc == 1 && nmc->complete)
nmc_complete_strings (*argv, "key", "phrase", NULL);
if (strcmp (*argv, "key") == 0) if (strcmp (*argv, "key") == 0)
wep_passphrase = FALSE; wep_passphrase = FALSE;
else if (strcmp (*argv, "phrase") == 0) else if (strcmp (*argv, "phrase") == 0)
@@ -2889,13 +2924,13 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
_("Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."), _("Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."),
*argv); *argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
} else if (strcmp (*argv, "name") == 0) { } else if (strcmp (*argv, "name") == 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; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
con_name = *argv; con_name = *argv;
} else if (strcmp (*argv, "private") == 0) { } else if (strcmp (*argv, "private") == 0) {
@@ -2903,28 +2938,32 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
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; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
if (argc == 1 && nmc->complete)
nmc_complete_bool (*argv);
if (!nmc_string_to_bool (*argv, &private, &err_tmp)) { if (!nmc_string_to_bool (*argv, &private, &err_tmp)) {
g_string_printf (nmc->return_text, _("Error: %s: %s."), *(argv-1), err_tmp->message); g_string_printf (nmc->return_text, _("Error: %s: %s."), *(argv-1), err_tmp->message);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
g_clear_error (&err_tmp); g_clear_error (&err_tmp);
goto error; goto finish;
} }
} else if (strcmp (*argv, "hidden") == 0) { } else if (strcmp (*argv, "hidden") == 0) {
GError *err_tmp = NULL; GError *err_tmp = NULL;
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; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
if (argc == 1 && nmc->complete)
nmc_complete_bool (*argv);
if (!nmc_string_to_bool (*argv, &hidden, &err_tmp)) { if (!nmc_string_to_bool (*argv, &hidden, &err_tmp)) {
g_string_printf (nmc->return_text, _("Error: %s: %s."), *(argv-1), err_tmp->message); g_string_printf (nmc->return_text, _("Error: %s: %s."), *(argv-1), err_tmp->message);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
g_clear_error (&err_tmp); g_clear_error (&err_tmp);
goto error; goto finish;
} }
} else { } else if (!nmc->complete) {
g_printerr (_("Unknown parameter: %s\n"), *argv); g_printerr (_("Unknown parameter: %s\n"), *argv);
} }
@@ -2932,21 +2971,22 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
argv++; argv++;
} }
if (nmc->complete)
goto finish;
/* Verify SSID/BSSID parameters */ /* Verify SSID/BSSID parameters */
if (bssid1_arr && bssid2_arr && memcmp (bssid1_arr->data, bssid2_arr->data, ETH_ALEN)) { if (bssid1_arr && bssid2_arr && memcmp (bssid1_arr->data, bssid2_arr->data, ETH_ALEN)) {
g_string_printf (nmc->return_text, _("Error: BSSID to connect to (%s) differs from bssid argument (%s)."), g_string_printf (nmc->return_text, _("Error: BSSID to connect to (%s) differs from bssid argument (%s)."),
param_user, bssid); param_user, bssid);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
if (!bssid1_arr && strlen (param_user) > 32) { if (!bssid1_arr && strlen (param_user) > 32) {
g_string_printf (nmc->return_text, _("Error: Parameter '%s' is neither SSID nor BSSID."), param_user); g_string_printf (nmc->return_text, _("Error: Parameter '%s' is neither SSID nor BSSID."), param_user);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
devices = nm_client_get_devices (nmc->client);
/* Find a device to activate the connection on */ /* Find a device to activate the connection on */
devices_idx = 0; devices_idx = 0;
device = find_wifi_device_by_iface (devices, ifname, &devices_idx); device = find_wifi_device_by_iface (devices, ifname, &devices_idx);
@@ -2957,7 +2997,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
else else
g_string_printf (nmc->return_text, _("Error: No Wi-Fi device found.")); g_string_printf (nmc->return_text, _("Error: No Wi-Fi device found."));
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
goto error; goto finish;
} }
/* For hidden SSID first scan it so that NM learns about the AP */ /* For hidden SSID first scan it so that NM learns about the AP */
@@ -2979,18 +3019,20 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
scan_err->message); scan_err->message);
g_clear_error (&scan_err); g_clear_error (&scan_err);
nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND;
goto error; goto finish;
} }
} }
/* Find an AP to connect to */ /* Find an AP to connect to */
ap = find_ap_on_device (device, bssid1_arr, bssid1_arr ? NULL : param_user); ap = find_ap_on_device (device, bssid1_arr ? param_user : NULL,
bssid1_arr ? NULL : param_user, FALSE);
if (!ap && !ifname) { if (!ap && !ifname) {
NMDevice *dev; NMDevice *dev;
/* AP not found, ifname was not specified, so try finding the AP on another device. */ /* AP not found, ifname was not specified, so try finding the AP on another device. */
while ((dev = find_wifi_device_by_iface (devices, NULL, &devices_idx)) != NULL) { while ((dev = find_wifi_device_by_iface (devices, NULL, &devices_idx)) != NULL) {
ap = find_ap_on_device (dev, bssid1_arr, bssid1_arr ? NULL : param_user); ap = find_ap_on_device (dev, bssid1_arr ? param_user : NULL,
bssid1_arr ? NULL : param_user, FALSE);
if (ap) { if (ap) {
device = dev; device = dev;
break; break;
@@ -3004,7 +3046,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
else else
g_string_printf (nmc->return_text, _("Error: No access point with BSSID '%s' found."), param_user); g_string_printf (nmc->return_text, _("Error: No access point with BSSID '%s' found."), param_user);
nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND;
goto error; goto finish;
} }
/* If there are some connection data from user, create a connection and /* If there are some connection data from user, create a connection and
@@ -3107,7 +3149,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
add_and_activate_cb, add_and_activate_cb,
info); info);
error: finish:
if (bssid1_arr) if (bssid1_arr)
g_byte_array_free (bssid1_arr, TRUE); g_byte_array_free (bssid1_arr, TRUE);
if (bssid2_arr) if (bssid2_arr)
@@ -3260,8 +3302,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
const char *password = NULL; const char *password = NULL;
gboolean show_password = FALSE; gboolean show_password = FALSE;
NMDevice *device = NULL; NMDevice *device = NULL;
int devices_idx; gs_free NMDevice **devices = NULL;
const GPtrArray *devices;
NMDeviceWifiCapabilities caps; NMDeviceWifiCapabilities caps;
NMConnection *connection = NULL; NMConnection *connection = NULL;
NMSettingConnection *s_con; NMSettingConnection *s_con;
@@ -3271,66 +3312,65 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
GBytes *ssid_bytes; GBytes *ssid_bytes;
GError *error = NULL; GError *error = NULL;
/* Not (yet?) supported */
if (nmc->complete)
return nmc->return_value;
/* Set default timeout waiting for operation completion. */ /* Set default timeout waiting for operation completion. */
if (nmc->timeout == -1) if (nmc->timeout == -1)
nmc->timeout = 60; nmc->timeout = 60;
devices = nmc_get_devices_sorted (nmc->client);
while (argc > 0) { while (argc > 0) {
if (argc == 1 && nmc->complete) {
nmc_complete_strings (*argv, "ifname", "con-name", "ssid", "band",
"channel", "password", NULL);
}
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;
} }
ifname = *argv; ifname = *argv;
if (argc == 1 && nmc->complete)
complete_device (devices, ifname, TRUE);
} else if (strcmp (*argv, "con-name") == 0) { } else if (strcmp (*argv, "con-name") == 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;
} }
con_name = *argv; con_name = *argv;
} else if (strcmp (*argv, "ssid") == 0) { } else if (strcmp (*argv, "ssid") == 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;
} }
ssid = *argv; ssid = *argv;
if (strlen (ssid) > 32) { if (strlen (ssid) > 32) {
g_string_printf (nmc->return_text, _("Error: ssid is too long.")); g_string_printf (nmc->return_text, _("Error: ssid is too long."));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return NMC_RESULT_ERROR_USER_INPUT;
goto error;
} }
} else if (strcmp (*argv, "band") == 0) { } else if (strcmp (*argv, "band") == 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;
} }
band = *argv; band = *argv;
if (argc == 1 && nmc->complete)
nmc_complete_strings (band, "a", "bg", NULL);
if (strcmp (band, "a") && strcmp (band, "bg")) { if (strcmp (band, "a") && strcmp (band, "bg")) {
g_string_printf (nmc->return_text, _("Error: band argument value '%s' is invalid; use 'a' or 'bg'."), g_string_printf (nmc->return_text, _("Error: band argument value '%s' is invalid; use 'a' or 'bg'."),
band); band);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return NMC_RESULT_ERROR_USER_INPUT;
goto error;
} }
} else if (strcmp (*argv, "channel") == 0) { } else if (strcmp (*argv, "channel") == 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;
} }
channel = *argv; channel = *argv;
} else if (strcmp (*argv, "password") == 0) { } else if (strcmp (*argv, "password") == 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;
} }
password = *argv; password = *argv;
/* --show-password is deprecated in favour of global --show-secrets option */ /* --show-password is deprecated in favour of global --show-secrets option */
@@ -3339,8 +3379,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
show_password = TRUE; show_password = TRUE;
} else { } else {
g_string_printf (nmc->return_text, _("Error: Unknown parameter %s."), *argv); g_string_printf (nmc->return_text, _("Error: Unknown parameter %s."), *argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return NMC_RESULT_ERROR_USER_INPUT;
goto error;
} }
argc--; argc--;
@@ -3348,6 +3387,9 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
} }
show_password = nmc->show_secrets || show_password; show_password = nmc->show_secrets || show_password;
if (nmc->complete)
return nmc->return_value;
/* Verify band and channel parameters */ /* Verify band and channel parameters */
if (!channel) { if (!channel) {
if (g_strcmp0 (band, "bg") == 0) if (g_strcmp0 (band, "bg") == 0)
@@ -3358,30 +3400,25 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
if (channel) { if (channel) {
if (!band) { if (!band) {
g_string_printf (nmc->return_text, _("Error: channel requires band too.")); g_string_printf (nmc->return_text, _("Error: channel requires band too."));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return NMC_RESULT_ERROR_USER_INPUT;
goto error;
} }
if ( !nmc_string_to_uint (channel, TRUE, 1, 5825, &channel_int) if ( !nmc_string_to_uint (channel, TRUE, 1, 5825, &channel_int)
|| !nm_utils_wifi_is_channel_valid (channel_int, band)) { || !nm_utils_wifi_is_channel_valid (channel_int, band)) {
g_string_printf (nmc->return_text, _("Error: channel '%s' not valid for band '%s'."), g_string_printf (nmc->return_text, _("Error: channel '%s' not valid for band '%s'."),
channel, band); channel, band);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return NMC_RESULT_ERROR_USER_INPUT;
goto error;
} }
} }
/* Find Wi-Fi device. When no ifname is provided, the first Wi-Fi is used. */ /* Find Wi-Fi device. When no ifname is provided, the first Wi-Fi is used. */
devices = nm_client_get_devices (nmc->client); device = find_wifi_device_by_iface (devices, ifname, NULL);
devices_idx = 0;
device = find_wifi_device_by_iface (devices, ifname, &devices_idx);
if (!device) { if (!device) {
if (ifname) if (ifname)
g_string_printf (nmc->return_text, _("Error: Device '%s' is not a Wi-Fi device."), ifname); g_string_printf (nmc->return_text, _("Error: Device '%s' is not a Wi-Fi device."), ifname);
else else
g_string_printf (nmc->return_text, _("Error: No Wi-Fi device found.")); g_string_printf (nmc->return_text, _("Error: No Wi-Fi device found."));
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; return NMC_RESULT_ERROR_UNKNOWN;
goto error;
} }
/* Check device supported mode */ /* Check device supported mode */
@@ -3393,8 +3430,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
else { else {
g_string_printf (nmc->return_text, _("Error: Device '%s' supports neither AP nor Ad-Hoc mode."), g_string_printf (nmc->return_text, _("Error: Device '%s' supports neither AP nor Ad-Hoc mode."),
nm_device_get_iface (device)); nm_device_get_iface (device));
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; return NMC_RESULT_ERROR_UNKNOWN;
goto error;
} }
/* Create a connection with appropriate parameters */ /* Create a connection with appropriate parameters */
@@ -3427,9 +3463,8 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
if (!set_wireless_security_for_hotspot (s_wsec, wifi_mode, caps, password, show_password, &error)) { if (!set_wireless_security_for_hotspot (s_wsec, wifi_mode, caps, password, show_password, &error)) {
g_object_unref (connection); g_object_unref (connection);
g_string_printf (nmc->return_text, _("Error: Invalid 'password': %s."), error->message); g_string_printf (nmc->return_text, _("Error: Invalid 'password': %s."), error->message);
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
g_clear_error (&error); g_clear_error (&error);
goto error; return NMC_RESULT_ERROR_UNKNOWN;
} }
s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new (); s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new ();
@@ -3457,7 +3492,6 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
add_and_activate_cb, add_and_activate_cb,
info); info);
error:
return nmc->return_value; return nmc->return_value;
} }
@@ -3482,51 +3516,53 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv)
NMDevice *device; NMDevice *device;
const char *ifname = NULL; const char *ifname = NULL;
GPtrArray *ssids; GPtrArray *ssids;
const GPtrArray *devices; gs_free NMDevice **devices = NULL;
int devices_idx;
GVariantBuilder builder, array_builder; GVariantBuilder builder, array_builder;
GVariant *options; GVariant *options;
const char *ssid; const char *ssid;
int i; int i;
/* Not (yet?) supported */
if (nmc->complete)
return nmc->return_value;
ssids = g_ptr_array_new (); ssids = g_ptr_array_new ();
devices = nmc_get_devices_sorted (nmc->client);
/* Get the parameters */ /* Get the parameters */
while (argc > 0) { while (argc > 0) {
if (argc == 1 && nmc->complete)
nmc_complete_strings (*argv, "ifname", "ssid", NULL);
if (strcmp (*argv, "ifname") == 0) { if (strcmp (*argv, "ifname") == 0) {
if (ifname) { if (ifname) {
g_string_printf (nmc->return_text, _("Error: '%s' cannot repeat."), *(argv-1)); g_string_printf (nmc->return_text, _("Error: '%s' cannot repeat."), *(argv-1));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
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; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
ifname = *argv; ifname = *argv;
if (argc == 1 && nmc->complete)
complete_device (devices, ifname, TRUE);
} else if (strcmp (*argv, "ssid") == 0) { } else if (strcmp (*argv, "ssid") == 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; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto finish;
} }
g_ptr_array_add (ssids, *argv); g_ptr_array_add (ssids, *argv);
} else } else if (!nmc->complete)
g_printerr (_("Unknown parameter: %s\n"), *argv); g_printerr (_("Unknown parameter: %s\n"), *argv);
argc--; argc--;
argv++; argv++;
} }
if (nmc->complete)
goto finish;
/* Find Wi-Fi device to scan on. When no ifname is provided, the first Wi-Fi is used. */ /* Find Wi-Fi device to scan on. When no ifname is provided, the first Wi-Fi is used. */
devices = nm_client_get_devices (nmc->client); device = find_wifi_device_by_iface (devices, ifname, NULL);
devices_idx = 0;
device = find_wifi_device_by_iface (devices, ifname, &devices_idx);
if (!device) { if (!device) {
if (ifname) if (ifname)
@@ -3534,7 +3570,7 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv)
else else
g_string_printf (nmc->return_text, _("Error: No Wi-Fi device found.")); g_string_printf (nmc->return_text, _("Error: No Wi-Fi device found."));
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
goto error; goto finish;
} }
@@ -3557,10 +3593,8 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv)
nm_device_wifi_request_scan_async (NM_DEVICE_WIFI (device), nm_device_wifi_request_scan_async (NM_DEVICE_WIFI (device),
NULL, request_rescan_cb, nmc); NULL, request_rescan_cb, nmc);
g_ptr_array_free (ssids, FALSE);
return nmc->return_value;
error:
nmc->should_wait++; nmc->should_wait++;
finish:
g_ptr_array_free (ssids, FALSE); g_ptr_array_free (ssids, FALSE);
return nmc->return_value; return nmc->return_value;
} }

20
clients/cli/devices.h
View File

@@ -24,10 +24,30 @@
NMCResultCode do_devices (NmCli *nmc, int argc, char **argv); NMCResultCode do_devices (NmCli *nmc, int argc, char **argv);
void nmc_complete_device (NMClient *client, const char *prefix, gboolean wifi_only);
void nmc_complete_bssid (NMClient *client, const char *ifname, const char *bssid_prefix);
void monitor_devices (NmCli *nmc); void monitor_devices (NmCli *nmc);
NMDevice ** nmc_get_devices_sorted (NMClient *client); NMDevice ** nmc_get_devices_sorted (NMClient *client);
void nmc_device_state_to_color (NMDeviceState state, NmcTermColor *color, NmcTermFormat *color_fmt); void nmc_device_state_to_color (NMDeviceState state, NmcTermColor *color, NmcTermFormat *color_fmt);
extern NmcOutputField nmc_fields_dev_status[];
extern NmcOutputField nmc_fields_dev_show_general[];
extern NmcOutputField nmc_fields_dev_show_connections[];
extern NmcOutputField nmc_fields_dev_show_cap[];
extern NmcOutputField nmc_fields_dev_show_wired_prop[];
extern NmcOutputField nmc_fields_dev_show_wifi_prop[];
extern NmcOutputField nmc_fields_dev_show_wimax_prop[];
extern NmcOutputField nmc_fields_dev_wifi_list[];
extern NmcOutputField nmc_fields_dev_wimax_list[];
extern NmcOutputField nmc_fields_dev_show_master_prop[];
extern NmcOutputField nmc_fields_dev_show_team_prop[];
extern NmcOutputField nmc_fields_dev_show_vlan_prop[];
extern NmcOutputField nmc_fields_dev_show_bluetooth[];
extern NmcOutputField nmc_fields_dev_show_sections[];
extern NmcOutputField nmc_fields_dev_lldp_list[];
#endif /* NMC_DEVICES_H */ #endif /* NMC_DEVICES_H */

353
clients/cli/general.c
View File

@@ -24,6 +24,7 @@
#include "polkit-agent.h" #include "polkit-agent.h"
#include "utils.h" #include "utils.h"
#include "common.h"
#include "general.h" #include "general.h"
#include "common.h" #include "common.h"
#include "nm-common-macros.h" #include "nm-common-macros.h"
@@ -389,6 +390,23 @@ show_nm_status (NmCli *nmc, const char *pretty_header_name, const char *print_fl
return TRUE; return TRUE;
} }
static NMCResultCode
do_general_status (NmCli *nmc, int argc, char **argv)
{
gs_free_error GError *error = NULL;
if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) {
g_string_printf (nmc->return_text, _("Error: %s."), error->message);
return NMC_RESULT_ERROR_USER_INPUT;
}
if (nmc->complete)
return nmc->return_value;
show_nm_status (nmc, NULL, NULL);
return nmc->return_value;
}
static const char * static const char *
permission_to_string (NMClientPermission perm) permission_to_string (NMClientPermission perm)
{ {
@@ -493,6 +511,23 @@ show_nm_permissions (NmCli *nmc)
return TRUE; return TRUE;
} }
static NMCResultCode
do_general_permissions (NmCli *nmc, int argc, char **argv)
{
gs_free_error GError *error = NULL;
if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) {
g_string_printf (nmc->return_text, _("Error: %s."), error->message);
return NMC_RESULT_ERROR_USER_INPUT;
}
if (nmc->complete)
return nmc->return_value;
show_nm_permissions (nmc);
return nmc->return_value;
}
static gboolean static gboolean
show_general_logging (NmCli *nmc) show_general_logging (NmCli *nmc)
{ {
@@ -546,6 +581,51 @@ show_general_logging (NmCli *nmc)
return TRUE; return TRUE;
} }
static NMCResultCode
do_general_logging (NmCli *nmc, int argc, char **argv)
{
gs_free_error GError *error = NULL;
if (argc == 0) {
if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) {
g_string_printf (nmc->return_text, _("Error: %s."), error->message);
g_error_free (error);
return NMC_RESULT_ERROR_USER_INPUT;
}
if (nmc->complete)
return nmc->return_value;
show_general_logging (nmc);
} else {
/* arguments provided -> set logging level and domains */
const char *level = NULL;
const char *domains = NULL;
nmc_arg_t exp_args[] = { {"level", TRUE, &level, TRUE},
{"domains", TRUE, &domains, TRUE},
{NULL} };
/* TODO: nmc_parse_args needs completion */
if (nmc->complete)
return nmc->return_value;
if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, &error)) {
g_string_assign (nmc->return_text, error->message);
return error->code;
}
nmc->get_client (nmc); /* create NMClient */
nm_client_set_logging (nmc->client, level, domains, &error);
if (error) {
g_string_printf (nmc->return_text, _("Error: failed to set logging: %s"),
error->message);
return NMC_RESULT_ERROR_UNKNOWN;
}
}
return nmc->return_value;
}
static void static void
save_hostname_cb (GObject *object, GAsyncResult *result, gpointer user_data) save_hostname_cb (GObject *object, GAsyncResult *result, gpointer user_data)
{ {
@@ -562,49 +642,13 @@ save_hostname_cb (GObject *object, GAsyncResult *result, gpointer user_data)
quit (); quit ();
} }
/* static NMCResultCode
* Entry point function for general operations 'nmcli general' do_general_hostname (NmCli *nmc, int argc, char **argv)
*/
NMCResultCode
do_general (NmCli *nmc, int argc, char **argv)
{ {
GError *error = NULL; if (nmc->complete)
return nmc->return_value;
/* Register polkit agent */
nmc_start_polkit_agent_start_try (nmc);
if (argc == 0) { if (argc == 0) {
if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) {
g_string_printf (nmc->return_text, _("Error: %s."), error->message);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto finish;
}
show_nm_status (nmc, NULL, NULL);
}
if (argc > 0) {
if (nmc_arg_is_help (*argv)) {
usage_general ();
}
else if (matches (*argv, "status") == 0) {
if (nmc_arg_is_help (*(argv+1))) {
usage_general_status ();
goto finish;
}
if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) {
g_string_printf (nmc->return_text, _("Error: %s."), error->message);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto finish;
}
show_nm_status (nmc, NULL, NULL);
}
else if (matches (*argv, "hostname") == 0) {
if (nmc_arg_is_help (*(argv+1))) {
usage_general_hostname ();
goto finish;
}
if (next_arg (&argc, &argv) != 0) {
/* no arguments -> get hostname */ /* no arguments -> get hostname */
char *hostname = NULL; char *hostname = NULL;
@@ -624,67 +668,29 @@ do_general (NmCli *nmc, int argc, char **argv)
nmc->get_client (nmc); /* create NMClient */ nmc->get_client (nmc); /* create NMClient */
nm_client_save_hostname_async (nmc->client, hostname, NULL, save_hostname_cb, nmc); nm_client_save_hostname_async (nmc->client, hostname, NULL, save_hostname_cb, nmc);
} }
}
else if (matches (*argv, "permissions") == 0) {
if (nmc_arg_is_help (*(argv+1))) {
usage_general_permissions ();
goto finish;
}
if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) {
g_string_printf (nmc->return_text, _("Error: %s."), error->message);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto finish;
}
show_nm_permissions (nmc);
}
else if (matches (*argv, "logging") == 0) {
if (nmc_arg_is_help (*(argv+1))) {
usage_general_logging ();
goto finish;
}
if (next_arg (&argc, &argv) != 0) {
/* no arguments -> get logging level and domains */
if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) {
g_string_printf (nmc->return_text, _("Error: %s."), error->message);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto finish;
}
show_general_logging (nmc);
} else {
/* arguments provided -> set logging level and domains */
const char *level = NULL;
const char *domains = NULL;
nmc_arg_t exp_args[] = { {"level", TRUE, &level, TRUE},
{"domains", TRUE, &domains, TRUE},
{NULL} };
if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, &error)) {
g_string_assign (nmc->return_text, error->message);
nmc->return_value = error->code;
goto finish;
}
nmc->get_client (nmc); /* create NMClient */
nm_client_set_logging (nmc->client, level, domains, &error);
if (error) {
g_string_printf (nmc->return_text, _("Error: failed to set logging: %s"),
error->message);
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
goto finish;
}
}
}
else {
usage_general ();
g_string_printf (nmc->return_text, _("Error: 'general' command '%s' is not valid."), *argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
}
}
finish:
if (error)
g_error_free (error);
return nmc->return_value; return nmc->return_value;
}
static const NMCCommand general_cmds[] = {
{"status", do_general_status, usage_general_status },
{"hostname", do_general_hostname, usage_general_hostname },
{"permissions", do_general_permissions, usage_general_permissions },
{"logging", do_general_logging, usage_general_logging },
{NULL, do_general_status, usage_general }
};
/*
* Entry point function for general operations 'nmcli general'
*/
NMCResultCode
do_general (NmCli *nmc, int argc, char **argv)
{
/* Register polkit agent */
nmc_start_polkit_agent_start_try (nmc);
return nmc_do_cmd (nmc, general_cmds, *argv, argc, argv);
} }
static gboolean static gboolean
@@ -744,12 +750,28 @@ do_networking (NmCli *nmc, int argc, char **argv)
/* Register polkit agent */ /* Register polkit agent */
nmc_start_polkit_agent_start_try (nmc); nmc_start_polkit_agent_start_try (nmc);
if (argc == 0) if (argc == 0) {
if (nmc->complete)
return nmc->return_value;
nmc_switch_show (nmc, NMC_FIELDS_NM_NETWORKING, _("Networking")); nmc_switch_show (nmc, NMC_FIELDS_NM_NETWORKING, _("Networking"));
else if (argc > 0) { } else if (argc > 0) {
if (argc == 1 && nmc->complete) {
nmc_complete_strings (*argv, "connectivity", NULL);
nmc_complete_bool (*argv);
return nmc->return_value;
}
if (nmc_arg_is_help (*argv)) { if (nmc_arg_is_help (*argv)) {
if (nmc->complete)
return nmc->return_value;
usage_networking (); usage_networking ();
} else if (matches (*argv, "connectivity") == 0) { } else if (matches (*argv, "connectivity") == 0) {
if (nmc->complete) {
if (argc == 2)
nmc_complete_strings (*(argv+1), "check", NULL);
return nmc->return_value;
}
if (nmc_arg_is_help (*(argv+1))) { if (nmc_arg_is_help (*(argv+1))) {
usage_networking_connectivity (); usage_networking_connectivity ();
goto finish; goto finish;
@@ -774,6 +796,8 @@ do_networking (NmCli *nmc, int argc, char **argv)
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
} }
} else if (nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag)) { } else if (nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag)) {
if (nmc->complete)
return nmc->return_value;
if (nmc_arg_is_help (*(argv+1))) { if (nmc_arg_is_help (*(argv+1))) {
if (enable_flag) if (enable_flag)
usage_networking_on (); usage_networking_on ();
@@ -785,6 +809,8 @@ do_networking (NmCli *nmc, int argc, char **argv)
nmc->get_client (nmc); /* create NMClient */ nmc->get_client (nmc); /* create NMClient */
nm_client_networking_set_enabled (nmc->client, enable_flag, NULL); nm_client_networking_set_enabled (nmc->client, enable_flag, NULL);
} else { } else {
if (nmc->complete)
return nmc->return_value;
usage_networking (); usage_networking ();
g_string_printf (nmc->return_text, _("Error: 'networking' command '%s' is not valid."), *argv); g_string_printf (nmc->return_text, _("Error: 'networking' command '%s' is not valid."), *argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
@@ -796,98 +822,112 @@ finish:
return nmc->return_value; return nmc->return_value;
} }
/* static NMCResultCode
* Entry point function for radio switch commands 'nmcli radio' do_radio_all (NmCli *nmc, int argc, char **argv)
*/
NMCResultCode
do_radio (NmCli *nmc, int argc, char **argv)
{ {
GError *error = NULL;
gboolean enable_flag; gboolean enable_flag;
gs_free_error GError *error = NULL;
/* Register polkit agent */
nmc_start_polkit_agent_start_try (nmc);
if (argc == 0) { if (argc == 0) {
if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { if (nmc->complete)
g_string_printf (nmc->return_text, _("Error: %s."), error->message); return nmc->return_value;
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
g_error_free (error);
goto finish;
}
show_nm_status (nmc, _("Radio switches"), NMC_FIELDS_NM_STATUS_RADIO);
}
if (argc > 0) {
if (nmc_arg_is_help (*argv)) {
usage_radio ();
}
else if (matches (*argv, "all") == 0) {
if (nmc_arg_is_help (*(argv+1))) {
usage_radio_all ();
goto finish;
}
if (next_arg (&argc, &argv) != 0) {
/* no argument, show all radio switches */ /* no argument, show all radio switches */
if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) {
g_string_printf (nmc->return_text, _("Error: %s."), error->message); g_string_printf (nmc->return_text, _("Error: %s."), error->message);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; return NMC_RESULT_ERROR_USER_INPUT;
g_error_free (error);
goto finish;
} }
show_nm_status (nmc, _("Radio switches"), NMC_FIELDS_NM_STATUS_RADIO); show_nm_status (nmc, _("Radio switches"), NMC_FIELDS_NM_STATUS_RADIO);
} else { } else {
if (nmc->complete) {
if (argc == 1)
nmc_complete_bool (*argv);
return nmc->return_value;
}
if (!nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag)) if (!nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag))
goto finish; return nmc->return_value;
nmc->get_client (nmc); /* create NMClient */ nmc->get_client (nmc); /* create NMClient */
nm_client_wireless_set_enabled (nmc->client, enable_flag); nm_client_wireless_set_enabled (nmc->client, enable_flag);
nm_client_wimax_set_enabled (nmc->client, enable_flag); nm_client_wimax_set_enabled (nmc->client, enable_flag);
nm_client_wwan_set_enabled (nmc->client, enable_flag); nm_client_wwan_set_enabled (nmc->client, enable_flag);
} }
return nmc->return_value;
} }
else if (matches (*argv, "wifi") == 0) {
if (nmc_arg_is_help (*(argv+1))) { static NMCResultCode
usage_radio_wifi (); do_radio_wifi (NmCli *nmc, int argc, char **argv)
goto finish; {
} gboolean enable_flag;
if (next_arg (&argc, &argv) != 0) {
if (argc == 0) {
if (nmc->complete)
return nmc->return_value;
/* no argument, show current WiFi state */ /* no argument, show current WiFi state */
nmc_switch_show (nmc, NMC_FIELDS_NM_WIFI, _("Wi-Fi radio switch")); nmc_switch_show (nmc, NMC_FIELDS_NM_WIFI, _("Wi-Fi radio switch"));
} else { } else {
if (nmc->complete) {
if (argc == 1)
nmc_complete_bool (*argv);
return nmc->return_value;
}
if (!nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag)) if (!nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag))
goto finish; return nmc->return_value;
nmc->get_client (nmc); /* create NMClient */ nmc->get_client (nmc); /* create NMClient */
nm_client_wireless_set_enabled (nmc->client, enable_flag); nm_client_wireless_set_enabled (nmc->client, enable_flag);
} }
return nmc->return_value;
} }
else if (matches (*argv, "wwan") == 0) {
if (nmc_arg_is_help (*(argv+1))) { static NMCResultCode
usage_radio_wwan (); do_radio_wwan (NmCli *nmc, int argc, char **argv)
goto finish; {
} gboolean enable_flag;
if (next_arg (&argc, &argv) != 0) {
if (argc == 0) {
if (nmc->complete)
return nmc->return_value;
/* no argument, show current WWAN (mobile broadband) state */ /* no argument, show current WWAN (mobile broadband) state */
nmc_switch_show (nmc, NMC_FIELDS_NM_WWAN, _("WWAN radio switch")); nmc_switch_show (nmc, NMC_FIELDS_NM_WWAN, _("WWAN radio switch"));
} else { } else {
if (nmc->complete) {
if (argc == 1)
nmc_complete_bool (*argv);
return nmc->return_value;
}
if (!nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag)) if (!nmc_switch_parse_on_off (nmc, *(argv-1), *argv, &enable_flag))
goto finish; return nmc->return_value;
nmc->get_client (nmc); /* create NMClient */ nmc->get_client (nmc); /* create NMClient */
nm_client_wwan_set_enabled (nmc->client, enable_flag); nm_client_wwan_set_enabled (nmc->client, enable_flag);
} }
}
else { return nmc->return_value;
usage_radio ();
g_string_printf (nmc->return_text, _("Error: 'radio' command '%s' is not valid."), *argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
}
} }
finish: static const NMCCommand radio_cmds[] = {
quit (); {"all", do_radio_all, usage_radio_all },
return nmc->return_value; {"wifi", do_radio_wifi, usage_radio_wifi },
{"wwan", do_radio_wwan, usage_radio_wwan },
{NULL, do_radio_all, usage_radio }
};
/*
* Entry point function for radio switch commands 'nmcli radio'
*/
NMCResultCode
do_radio (NmCli *nmc, int argc, char **argv)
{
/* Register polkit agent */
nmc_start_polkit_agent_start_try (nmc);
return nmc_do_cmd (nmc, radio_cmds, *argv, argc, argv);
} }
static void static void
@@ -1181,6 +1221,9 @@ do_overview (NmCli *nmc, int argc, char **argv)
NMCResultCode NMCResultCode
do_monitor (NmCli *nmc, int argc, char **argv) do_monitor (NmCli *nmc, int argc, char **argv)
{ {
if (nmc->complete)
return nmc->return_value;
if (argc > 0) { if (argc > 0) {
if (!nmc_arg_is_help (*argv)) { if (!nmc_arg_is_help (*argv)) {
g_string_printf (nmc->return_text, _("Error: 'monitor' command '%s' is not valid."), *argv); g_string_printf (nmc->return_text, _("Error: 'monitor' command '%s' is not valid."), *argv);

211
clients/cli/nmcli.c
View File

@@ -41,6 +41,7 @@
#include "devices.h" #include "devices.h"
#include "general.h" #include "general.h"
#include "agent.h" #include "agent.h"
#include "settings.h"
#if defined(NM_DIST_VERSION) #if defined(NM_DIST_VERSION)
# define NMCLI_VERSION NM_DIST_VERSION # define NMCLI_VERSION NM_DIST_VERSION
@@ -64,6 +65,105 @@ GMainLoop *loop = NULL;
static sigset_t signal_set; static sigset_t signal_set;
struct termios termios_orig; struct termios termios_orig;
static void
complete_field (GHashTable *h, const char *setting, NmcOutputField field[])
{
int i;
for (i = 0; field[i].name; i++) {
if (setting)
g_hash_table_add (h, g_strdup_printf ("%s.%s", setting, field[i].name));
else
g_hash_table_add (h, g_strdup (field[i].name));
}
}
static void
complete_one (gpointer key, gpointer value, gpointer user_data)
{
const char *prefix = user_data;
const char *name = key;
const char *last;
last = strrchr (prefix, ',');
if (last)
last++;
else
last = prefix;
if ((!*last && !strchr (name, '.')) || matches (last, name) == 0) {
g_print ("%.*s%s%s\n", (int)(last-prefix), prefix, name,
strcmp (last, name) == 0 ? "," : "");
}
}
static void
complete_fields (const char *prefix)
{
GHashTable *h;
h = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
complete_field (h, NULL, nmc_fields_ip4_config);
complete_field (h, NULL, nmc_fields_dhcp4_config);
complete_field (h, NULL, nmc_fields_ip6_config);
complete_field (h, NULL, nmc_fields_dhcp6_config);
complete_field (h, NULL, nmc_fields_con_show);
complete_field (h, NULL, nmc_fields_settings_names);
complete_field (h, NULL, nmc_fields_con_active_details_general);
complete_field (h, NULL, nmc_fields_con_active_details_vpn);
complete_field (h, NULL, nmc_fields_con_active_details_groups);
complete_field (h, NULL, nmc_fields_dev_status);
complete_field (h, NULL, nmc_fields_dev_show_general);
complete_field (h, NULL, nmc_fields_dev_show_connections);
complete_field (h, NULL, nmc_fields_dev_show_cap);
complete_field (h, NULL, nmc_fields_dev_show_wired_prop);
complete_field (h, NULL, nmc_fields_dev_show_wifi_prop);
complete_field (h, NULL, nmc_fields_dev_show_wimax_prop);
complete_field (h, NULL, nmc_fields_dev_wifi_list);
complete_field (h, NULL, nmc_fields_dev_wimax_list);
complete_field (h, NULL, nmc_fields_dev_show_master_prop);
complete_field (h, NULL, nmc_fields_dev_show_team_prop);
complete_field (h, NULL, nmc_fields_dev_show_vlan_prop);
complete_field (h, NULL, nmc_fields_dev_show_bluetooth);
complete_field (h, NULL, nmc_fields_dev_show_sections);
complete_field (h, NULL, nmc_fields_dev_lldp_list);
complete_field (h, "connection", nmc_fields_setting_connection);
complete_field (h, "wired", nmc_fields_setting_wired);
complete_field (h, "8021X", nmc_fields_setting_8021X);
complete_field (h, "wireless", nmc_fields_setting_wireless);
complete_field (h, "wireless_security", nmc_fields_setting_wireless_security);
complete_field (h, "ip4-config", nmc_fields_setting_ip4_config);
complete_field (h, "ip6-config", nmc_fields_setting_ip6_config);
complete_field (h, "serial", nmc_fields_setting_serial);
complete_field (h, "ppp", nmc_fields_setting_ppp);
complete_field (h, "pppoe", nmc_fields_setting_pppoe);
complete_field (h, "adsl", nmc_fields_setting_adsl);
complete_field (h, "gsm", nmc_fields_setting_gsm);
complete_field (h, "cdma", nmc_fields_setting_cdma);
complete_field (h, "bluetooth", nmc_fields_setting_bluetooth);
complete_field (h, "olpc-mesh", nmc_fields_setting_olpc_mesh);
complete_field (h, "vpn", nmc_fields_setting_vpn);
complete_field (h, "wimax", nmc_fields_setting_wimax);
complete_field (h, "infiniband", nmc_fields_setting_infiniband);
complete_field (h, "bond", nmc_fields_setting_bond);
complete_field (h, "vlan", nmc_fields_setting_vlan);
complete_field (h, "bridge", nmc_fields_setting_bridge);
complete_field (h, "bridge-port", nmc_fields_setting_bridge_port);
complete_field (h, "team", nmc_fields_setting_team);
complete_field (h, "team0port", nmc_fields_setting_team_port);
complete_field (h, "dcb", nmc_fields_setting_dcb);
complete_field (h, "tun", nmc_fields_setting_tun);
complete_field (h, "ip-tunnel", nmc_fields_setting_ip_tunnel);
complete_field (h, "macvlan", nmc_fields_setting_macvlan);
complete_field (h, "vxlan", nmc_fields_setting_vxlan);
g_hash_table_foreach (h, complete_one, (gpointer) prefix);
g_hash_table_destroy (h);
}
/* Get an error quark for use with GError */ /* Get an error quark for use with GError */
GQuark GQuark
@@ -78,9 +178,9 @@ nmcli_error_quark (void)
} }
static void static void
usage (const char *prog_name) usage (void)
{ {
g_printerr (_("Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" g_printerr (_("Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
"\n" "\n"
"OPTIONS\n" "OPTIONS\n"
" -t[erse] terse output\n" " -t[erse] terse output\n"
@@ -103,15 +203,7 @@ usage (const char *prog_name)
" d[evice] devices managed by NetworkManager\n" " d[evice] devices managed by NetworkManager\n"
" a[gent] NetworkManager secret agent or polkit agent\n" " a[gent] NetworkManager secret agent or polkit agent\n"
" m[onitor] monitor NetworkManager changes\n" " m[onitor] monitor NetworkManager changes\n"
"\n"), "\n"));
prog_name);
}
static NMCResultCode
do_help (NmCli *nmc, int argc, char **argv)
{
usage ("nmcli");
return NMC_RESULT_SUCCESS;
} }
static const NMCCommand nmcli_cmds[] = { static const NMCCommand nmcli_cmds[] = {
@@ -122,8 +214,7 @@ static const NMCCommand nmcli_cmds[] = {
{ "connection", do_connections, NULL }, { "connection", do_connections, NULL },
{ "device", do_devices, NULL }, { "device", do_devices, NULL },
{ "agent", do_agent, NULL }, { "agent", do_agent, NULL },
{ "help", do_help, NULL }, { NULL, do_overview, usage }
{ NULL, do_overview, NULL },
}; };
static NMCResultCode static NMCResultCode
@@ -137,29 +228,33 @@ parse_command_line (NmCli *nmc, int argc, char **argv)
else else
base++; base++;
if (argc > 1 && nm_streq (argv[1], "--complete-args")) { if (argc > 1 && nm_streq (argv[1], "--complete-args")) {
/* We (currently?) support --complete-args for "connection" command only:
* ignore any other command when this option is enabled as means we are in
* autocompletion mode (so we should just quit and don't print anything).
* This would help us to ensure shell autocompletion after NM package downgrade
* if we ever will enable --complete-args for other commands */
if ((argc == 2) || !(nm_streq0 (argv[2], "connection") || nm_streq0 (argv[2], "device")))
return nmc->return_value;
nmc->complete = TRUE; nmc->complete = TRUE;
argv[1] = argv[0]; argv[1] = argv[0];
argc--; argv++; argc--; argv++;
} }
argc--; argv++;
/* parse options */ /* parse options */
while (argc > 1) { while (argc) {
char *opt = argv[1]; char *opt = argv[0];
if (opt[0] != '-')
break;
if (argc == 1 && nmc->complete) {
nmc_complete_strings (opt, "--terse", "--pretty", "--mode", "--colors", "--escape",
"--fields", "--nocheck", "--ask", "--show-secrets",
"--wait", "--version", "--help", NULL);
}
if (opt[1] == '-') {
opt++;
/* '--' ends options */ /* '--' ends options */
if (strcmp (opt, "--") == 0) { if (opt[1] == '\0') {
argc--; argv++; argc--; argv++;
break; break;
} }
if (opt[0] != '-') }
break;
if (opt[1] == '-')
opt++;
if (matches (opt, "-terse") == 0) { if (matches (opt, "-terse") == 0) {
if (nmc->print_output == NMC_PRINT_TERSE) { if (nmc->print_output == NMC_PRINT_TERSE) {
g_string_printf (nmc->return_text, _("Error: Option '--terse' is specified the second time.")); g_string_printf (nmc->return_text, _("Error: Option '--terse' is specified the second time."));
@@ -188,63 +283,67 @@ parse_command_line (NmCli *nmc, int argc, char **argv)
nmc->print_output = NMC_PRINT_PRETTY; nmc->print_output = NMC_PRINT_PRETTY;
} else if (matches (opt, "-mode") == 0) { } else if (matches (opt, "-mode") == 0) {
nmc->mode_specified = TRUE; nmc->mode_specified = TRUE;
next_arg (&argc, &argv); if (next_arg (&argc, &argv) != 0) {
if (argc <= 1) {
g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt); g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return nmc->return_value; return nmc->return_value;
} }
if (matches (argv[1], "tabular") == 0) if (argc == 1 && nmc->complete)
nmc_complete_strings (argv[0], "tabular", "multiline", NULL);
if (matches (argv[0], "tabular") == 0)
nmc->multiline_output = FALSE; nmc->multiline_output = FALSE;
else if (matches (argv[1], "multiline") == 0) else if (matches (argv[0], "multiline") == 0)
nmc->multiline_output = TRUE; nmc->multiline_output = TRUE;
else { else {
g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[1], opt); g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[0], opt);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return nmc->return_value; return nmc->return_value;
} }
} else if (matches (opt, "-colors") == 0) { } else if (matches (opt, "-colors") == 0) {
next_arg (&argc, &argv); if (next_arg (&argc, &argv) != 0) {
if (argc <= 1) {
g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt); g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return nmc->return_value; return nmc->return_value;
} }
if (matches (argv[1], "auto") == 0) if (argc == 1 && nmc->complete)
nmc_complete_strings (argv[0], "yes", "no", "auto", NULL);
if (matches (argv[0], "auto") == 0)
nmc->use_colors = NMC_USE_COLOR_AUTO; nmc->use_colors = NMC_USE_COLOR_AUTO;
else if (matches (argv[1], "yes") == 0) else if (matches (argv[0], "yes") == 0)
nmc->use_colors = NMC_USE_COLOR_YES; nmc->use_colors = NMC_USE_COLOR_YES;
else if (matches (argv[1], "no") == 0) else if (matches (argv[0], "no") == 0)
nmc->use_colors = NMC_USE_COLOR_NO; nmc->use_colors = NMC_USE_COLOR_NO;
else { else {
g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[1], opt); g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[0], opt);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return nmc->return_value; return nmc->return_value;
} }
} else if (matches (opt, "-escape") == 0) { } else if (matches (opt, "-escape") == 0) {
next_arg (&argc, &argv); if (next_arg (&argc, &argv) != 0) {
if (argc <= 1) {
g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt); g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return nmc->return_value; return nmc->return_value;
} }
if (matches (argv[1], "yes") == 0) if (argc == 1 && nmc->complete)
nmc_complete_strings (argv[0], "yes", "no", NULL);
if (matches (argv[0], "yes") == 0)
nmc->escape_values = TRUE; nmc->escape_values = TRUE;
else if (matches (argv[1], "no") == 0) else if (matches (argv[0], "no") == 0)
nmc->escape_values = FALSE; nmc->escape_values = FALSE;
else { else {
g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[1], opt); g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[0], opt);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return nmc->return_value; return nmc->return_value;
} }
} else if (matches (opt, "-fields") == 0) { } else if (matches (opt, "-fields") == 0) {
next_arg (&argc, &argv); if (next_arg (&argc, &argv) != 0) {
if (argc <= 1) {
g_string_printf (nmc->return_text, _("Error: fields for '%s' options are missing."), opt); g_string_printf (nmc->return_text, _("Error: fields for '%s' options are missing."), opt);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return nmc->return_value; return nmc->return_value;
} }
nmc->required_fields = g_strdup (argv[1]); if (argc == 1 && nmc->complete)
complete_fields (argv[0]);
nmc->required_fields = g_strdup (argv[0]);
} else if (matches (opt, "-nocheck") == 0) { } else if (matches (opt, "-nocheck") == 0) {
/* ignore for backward compatibility */ /* ignore for backward compatibility */
} else if (matches (opt, "-ask") == 0) { } else if (matches (opt, "-ask") == 0) {
@@ -253,24 +352,25 @@ parse_command_line (NmCli *nmc, int argc, char **argv)
nmc->show_secrets = TRUE; nmc->show_secrets = TRUE;
} else if (matches (opt, "-wait") == 0) { } else if (matches (opt, "-wait") == 0) {
unsigned long timeout; unsigned long timeout;
next_arg (&argc, &argv); if (next_arg (&argc, &argv) != 0) {
if (argc <= 1) {
g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt); g_string_printf (nmc->return_text, _("Error: missing argument for '%s' option."), opt);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return nmc->return_value; return nmc->return_value;
} }
if (!nmc_string_to_uint (argv[1], TRUE, 0, G_MAXINT, &timeout)) { if (!nmc_string_to_uint (argv[0], TRUE, 0, G_MAXINT, &timeout)) {
g_string_printf (nmc->return_text, _("Error: '%s' is not a valid timeout for '%s' option."), g_string_printf (nmc->return_text, _("Error: '%s' is not a valid timeout for '%s' option."),
argv[1], opt); argv[0], opt);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return nmc->return_value; return nmc->return_value;
} }
nmc->timeout = (int) timeout; nmc->timeout = (int) timeout;
} else if (matches (opt, "-version") == 0) { } else if (matches (opt, "-version") == 0) {
if (!nmc->complete)
g_print (_("nmcli tool, version %s\n"), NMCLI_VERSION); g_print (_("nmcli tool, version %s\n"), NMCLI_VERSION);
return NMC_RESULT_SUCCESS; return NMC_RESULT_SUCCESS;
} else if (matches (opt, "-help") == 0) { } else if (matches (opt, "-help") == 0) {
usage (base); if (!nmc->complete)
usage ();
return NMC_RESULT_SUCCESS; return NMC_RESULT_SUCCESS;
} else { } else {
g_string_printf (nmc->return_text, _("Error: Option '%s' is unknown, try 'nmcli -help'."), opt); g_string_printf (nmc->return_text, _("Error: Option '%s' is unknown, try 'nmcli -help'."), opt);
@@ -282,7 +382,7 @@ parse_command_line (NmCli *nmc, int argc, char **argv)
} }
/* Now run the requested command */ /* Now run the requested command */
return nmc_do_cmd (nmc, nmcli_cmds, argv[1], argc-1, argv+1); return nmc_do_cmd (nmc, nmcli_cmds, *argv, argc, argv);
} }
static gboolean nmcli_sigint = FALSE; static gboolean nmcli_sigint = FALSE;
@@ -617,11 +717,12 @@ main (int argc, char *argv[])
loop = g_main_loop_new (NULL, FALSE); /* create main loop */ loop = g_main_loop_new (NULL, FALSE); /* create main loop */
g_main_loop_run (loop); /* run main loop */ g_main_loop_run (loop); /* run main loop */
if (nm_cli.complete) if (nm_cli.complete) {
/* Remove error statuses from command completion runs. */
if (nm_cli.return_value < NMC_RESULT_COMPLETE_FILE)
nm_cli.return_value = NMC_RESULT_SUCCESS; nm_cli.return_value = NMC_RESULT_SUCCESS;
} else if (nm_cli.return_value != NMC_RESULT_SUCCESS) {
/* Print result descripting text */ /* Print result descripting text */
if (nm_cli.return_value != NMC_RESULT_SUCCESS) {
g_printerr ("%s\n", nm_cli.return_text->str); g_printerr ("%s\n", nm_cli.return_text->str);
} }

5
clients/cli/nmcli.h
View File

@@ -63,7 +63,10 @@ typedef enum {
NMC_RESULT_ERROR_VERSIONS_MISMATCH = 9, NMC_RESULT_ERROR_VERSIONS_MISMATCH = 9,
/* Connection/Device/AP not found */ /* Connection/Device/AP not found */
NMC_RESULT_ERROR_NOT_FOUND = 10 NMC_RESULT_ERROR_NOT_FOUND = 10,
/* --complete-args signals a file name may follow */
NMC_RESULT_COMPLETE_FILE = 65,
} NMCResultCode; } NMCResultCode;
typedef enum { typedef enum {

6
clients/cli/settings.c
View File

@@ -3247,8 +3247,7 @@ nmc_property_connection_set_secondaries (NMSetting *setting, const char *prop, c
continue; continue;
if (nm_utils_is_uuid (*iter)) { if (nm_utils_is_uuid (*iter)) {
con = nmc_find_connection (nm_cli.connections, con = nmc_find_connection (nm_cli.connections, "uuid", *iter, NULL, FALSE);
"uuid", *iter, NULL);
if (!con) if (!con)
g_print (_("Warning: %s is not an UUID of any existing connection profile\n"), *iter); g_print (_("Warning: %s is not an UUID of any existing connection profile\n"), *iter);
else { else {
@@ -3260,8 +3259,7 @@ nmc_property_connection_set_secondaries (NMSetting *setting, const char *prop, c
} }
} }
} else { } else {
con = nmc_find_connection (nm_cli.connections, con = nmc_find_connection (nm_cli.connections, "id", *iter, NULL, FALSE);
"id", *iter, NULL);
if (!con) { if (!con) {
g_set_error (error, 1, 0, _("'%s' is not a name of any exiting profile"), *iter); g_set_error (error, 1, 0, _("'%s' is not a name of any exiting profile"), *iter);
g_strfreev (strv); g_strfreev (strv);

30
clients/cli/settings.h
View File

@@ -63,4 +63,34 @@ gboolean nmc_property_set_gvalue (NMSetting *setting, const char *prop, GValue *
gboolean setting_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets); gboolean setting_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets);
extern NmcOutputField nmc_fields_setting_connection[];
extern NmcOutputField nmc_fields_setting_wired[];
extern NmcOutputField nmc_fields_setting_8021X[];
extern NmcOutputField nmc_fields_setting_wireless[];
extern NmcOutputField nmc_fields_setting_wireless_security[];
extern NmcOutputField nmc_fields_setting_ip4_config[];
extern NmcOutputField nmc_fields_setting_ip6_config[];
extern NmcOutputField nmc_fields_setting_serial[];
extern NmcOutputField nmc_fields_setting_ppp[];
extern NmcOutputField nmc_fields_setting_pppoe[];
extern NmcOutputField nmc_fields_setting_adsl[];
extern NmcOutputField nmc_fields_setting_gsm[];
extern NmcOutputField nmc_fields_setting_cdma[];
extern NmcOutputField nmc_fields_setting_bluetooth[];
extern NmcOutputField nmc_fields_setting_olpc_mesh[];
extern NmcOutputField nmc_fields_setting_vpn[];
extern NmcOutputField nmc_fields_setting_wimax[];
extern NmcOutputField nmc_fields_setting_infiniband[];
extern NmcOutputField nmc_fields_setting_bond[];
extern NmcOutputField nmc_fields_setting_vlan[];
extern NmcOutputField nmc_fields_setting_bridge[];
extern NmcOutputField nmc_fields_setting_bridge_port[];
extern NmcOutputField nmc_fields_setting_team[];
extern NmcOutputField nmc_fields_setting_team_port[];
extern NmcOutputField nmc_fields_setting_dcb[];
extern NmcOutputField nmc_fields_setting_tun[];
extern NmcOutputField nmc_fields_setting_ip_tunnel[];
extern NmcOutputField nmc_fields_setting_macvlan[];
extern NmcOutputField nmc_fields_setting_vxlan[];
#endif /* NMC_SETTINGS_H */ #endif /* NMC_SETTINGS_H */

24
man/nmcli.xml
View File

@@ -276,6 +276,23 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><group choice='plain'>
<arg choice='plain'><option>--complete-args</option></arg>
</group></term>
<listitem>
<para>Instead of conducting the desired action, <command>nmcli</command>
will list possible completions for the last argument. This is useful to implement
argument completion in shell.</para>
<para>The <link linkend='exit_status'>exit status</link> will indicate success
or return a code 65 to indicate the last argument is a file name.</para>
<para>NetworkManager ships with command completion support for GNU Bash.</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><group choice='plain'> <term><group choice='plain'>
<arg choice='plain'><option>-v</option></arg> <arg choice='plain'><option>-v</option></arg>
@@ -2089,6 +2106,13 @@ It's equivalent of using <literal>+ipv6.addresses</literal> syntax.</entry>
<para>Connection, device, or access point does not exist.</para> <para>Connection, device, or access point does not exist.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><errorcode>65</errorcode></term>
<listitem>
<para>When used with <option>--complete-args</option> option, a file name is expected to follow.</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</refsect1> </refsect1>