diff options
| author | Michael Biebl <biebl@debian.org> | 2014-07-06 02:16:10 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-07-06 02:16:10 +0200 |
| commit | 33491bc4279481db8ae47213e34a6d695a0e8830 (patch) | |
| tree | 097d2b0fdff3fae6885381ae5e57a182cd8cbbba /cli/src/devices.c | |
| parent | 59c3714a494c3b3765657c0551ad82842d98a7d2 (diff) | |
Imported Upstream version 0.9.10.0 upstream/0.9.10.0
Diffstat (limited to 'cli/src/devices.c')
| -rw-r--r-- | cli/src/devices.c | 2095 |
1 files changed, 1308 insertions, 787 deletions
diff --git a/cli/src/devices.c b/cli/src/devices.c index ffad9801..17492066 100644 --- a/cli/src/devices.c +++ b/cli/src/devices.c @@ -14,7 +14,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2010 - 2012 Red Hat, Inc. + * (C) Copyright 2010 - 2014 Red Hat, Inc. */ #include "config.h" @@ -24,6 +24,7 @@ #include <stdlib.h> #include <errno.h> #include <netinet/ether.h> +#include <readline/readline.h> #include <glib.h> #include <glib/gi18n.h> @@ -65,185 +66,203 @@ #include "common.h" #include "devices.h" +/* define some prompts */ +#define PROMPT_INTERFACE _("Interface: ") -/* Available fields for 'dev status' */ +/* Available fields for 'device status' */ static NmcOutputField nmc_fields_dev_status[] = { - {"DEVICE", N_("DEVICE"), 10, NULL, 0}, /* 0 */ - {"TYPE", N_("TYPE"), 17, NULL, 0}, /* 1 */ - {"STATE", N_("STATE"), 13, NULL, 0}, /* 2 */ - {"DBUS-PATH", N_("DBUS-PATH"), 43, NULL, 0}, /* 3 */ - {NULL, NULL, 0, NULL, 0} + {"DEVICE", N_("DEVICE"), 10}, /* 0 */ + {"TYPE", N_("TYPE"), 17}, /* 1 */ + {"STATE", N_("STATE"), 13}, /* 2 */ + {"DBUS-PATH", N_("DBUS-PATH"), 43}, /* 3 */ + {"CONNECTION", N_("CONNECTION"), 20}, /* 4 */ + {"CON-UUID", N_("CON-UUID"), 38}, /* 5 */ + {"CON-PATH", N_("CON-PATH"), 51}, /* 6 */ + {NULL, NULL, 0} }; -#define NMC_FIELDS_DEV_STATUS_ALL "DEVICE,TYPE,STATE,DBUS-PATH" -#define NMC_FIELDS_DEV_STATUS_COMMON "DEVICE,TYPE,STATE" - - -/* Available sections for 'dev list' */ -static NmcOutputField nmc_fields_dev_list_sections[] = { - {"GENERAL", N_("GENERAL"), 0, NULL, 0}, /* 0 */ - {"CAPABILITIES", N_("CAPABILITIES"), 0, NULL, 0}, /* 1 */ - {"WIFI-PROPERTIES", N_("WIFI-PROPERTIES"), 0, NULL, 0}, /* 2 */ - {"AP", N_("AP"), 0, NULL, 0}, /* 3 */ - {"WIRED-PROPERTIES", N_("WIRED-PROPERTIES"), 0, NULL, 0}, /* 4 */ - {"WIMAX-PROPERTIES", N_("WIMAX-PROPERTIES"), 0, NULL, 0}, /* 5 */ - {"NSP", N_("NSP"), 0, NULL, 0}, /* 6 */ - {"IP4", N_("IP4"), 0, NULL, 0}, /* 7 */ - {"DHCP4", N_("DHCP4"), 0, NULL, 0}, /* 8 */ - {"IP6", N_("IP6"), 0, NULL, 0}, /* 9 */ - {"DHCP6", N_("DHCP6"), 0, NULL, 0}, /* 10 */ - {"BOND", N_("BOND"), 0, NULL, 0}, /* 11 */ - {"VLAN", N_("VLAN"), 0, NULL, 0}, /* 12 */ - {"CONNECTIONS", N_("CONNECTIONS"), 0, NULL, 0}, /* 13 */ - {NULL, NULL, 0, NULL, 0} +#define NMC_FIELDS_DEV_STATUS_ALL "DEVICE,TYPE,STATE,DBUS-PATH,CONNECTION,CON-UUID,CON-PATH" +#define NMC_FIELDS_DEV_STATUS_COMMON "DEVICE,TYPE,STATE,CONNECTION" + + +/* Available fields for 'device show' - GENERAL part */ +static NmcOutputField nmc_fields_dev_show_general[] = { + {"NAME", N_("NAME"), 10}, /* 0 */ + {"DEVICE", N_("DEVICE"), 10}, /* 1 */ + {"TYPE", N_("TYPE"), 17}, /* 2 */ + {"VENDOR", N_("VENDOR"), 20}, /* 3 */ + {"PRODUCT", N_("PRODUCT"), 50}, /* 4 */ + {"DRIVER", N_("DRIVER"), 9}, /* 5 */ + {"DRIVER-VERSION", N_("DRIVER-VERSION"), 18}, /* 6 */ + {"FIRMWARE-VERSION", N_("FIRMWARE-VERSION"), 18}, /* 7 */ + {"HWADDR", N_("HWADDR"), 19}, /* 8 */ + {"MTU", N_("MTU"), 10}, /* 9 */ + {"STATE", N_("STATE"), 14}, /* 10 */ + {"REASON", N_("REASON"), 25}, /* 11 */ + {"UDI", N_("UDI"), 64}, /* 12 */ + {"IP-IFACE", N_("IP-IFACE"), 10}, /* 13 */ + {"NM-MANAGED", N_("NM-MANAGED"), 15}, /* 14 */ + {"AUTOCONNECT", N_("AUTOCONNECT"), 15}, /* 15 */ + {"FIRMWARE-MISSING", N_("FIRMWARE-MISSING"), 18}, /* 16 */ + {"CONNECTION", N_("CONNECTION"), 20}, /* 17 */ + {"CON-UUID", N_("CON-UUID"), 38}, /* 18 */ + {"CON-PATH", N_("CON-PATH"), 51}, /* 19 */ + {NULL, NULL, 0} }; -#if WITH_WIMAX -#define NMC_FIELDS_DEV_LIST_SECTIONS_ALL "GENERAL,CAPABILITIES,BOND,VLAN,CONNECTIONS,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6" -#define NMC_FIELDS_DEV_LIST_SECTIONS_COMMON "GENERAL,CAPABILITIES,BOND,VLAN,CONNECTIONS,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6" -#else -#define NMC_FIELDS_DEV_LIST_SECTIONS_ALL "GENERAL,CAPABILITIES,BOND,VLAN,CONNECTIONS,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,IP4,DHCP4,IP6,DHCP6" -#define NMC_FIELDS_DEV_LIST_SECTIONS_COMMON "GENERAL,CAPABILITIES,BOND,VLAN,CONNECTIONS,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,IP4,DHCP4,IP6,DHCP6" -#endif - -/* Available fields for 'dev list' - GENERAL part */ -static NmcOutputField nmc_fields_dev_list_general[] = { - {"NAME", N_("NAME"), 10, NULL, 0}, /* 0 */ - {"DEVICE", N_("DEVICE"), 10, NULL, 0}, /* 1 */ - {"TYPE", N_("TYPE"), 17, NULL, 0}, /* 2 */ - {"VENDOR", N_("VENDOR"), 20, NULL, 0}, /* 3 */ - {"PRODUCT", N_("PRODUCT"), 50, NULL, 0}, /* 4 */ - {"DRIVER", N_("DRIVER"), 9, NULL, 0}, /* 5 */ - {"DRIVER-VERSION", N_("DRIVER-VERSION"), 18, NULL, 0}, /* 6 */ - {"FIRMWARE-VERSION", N_("FIRMWARE-VERSION"), 18, NULL, 0}, /* 7 */ - {"HWADDR", N_("HWADDR"), 19, NULL, 0}, /* 8 */ - {"STATE", N_("STATE"), 14, NULL, 0}, /* 9 */ - {"REASON", N_("REASON"), 25, NULL, 0}, /* 10 */ - {"UDI", N_("UDI"), 64, NULL, 0}, /* 11 */ - {"IP-IFACE", N_("IP-IFACE"), 10, NULL, 0}, /* 12 */ - {"NM-MANAGED", N_("NM-MANAGED"), 15, NULL, 0}, /* 13 */ - {"AUTOCONNECT", N_("AUTOCONNECT"), 15, NULL, 0}, /* 14 */ - {"FIRMWARE-MISSING", N_("FIRMWARE-MISSING"), 18, NULL, 0}, /* 15 */ - {"CONNECTION", N_("CONNECTION"), 51, NULL, 0}, /* 16 */ - {NULL, NULL, 0, NULL, 0} +#define NMC_FIELDS_DEV_SHOW_GENERAL_ALL "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,DRIVER-VERSION,FIRMWARE-VERSION,HWADDR,MTU,STATE,REASON,"\ + "UDI,IP-IFACE,NM-MANAGED,AUTOCONNECT,FIRMWARE-MISSING,CONNECTION,CON-UUID,CON-PATH" +#define NMC_FIELDS_DEV_SHOW_GENERAL_COMMON "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,HWADDR,STATE" + +/* Available fields for 'device show' - CONNECTIONS part */ +static NmcOutputField nmc_fields_dev_show_connections[] = { + {"NAME", N_("NAME"), 10}, /* 0 */ + {"AVAILABLE-CONNECTION-PATHS", N_("AVAILABLE-CONNECTION-PATHS"), 80}, /* 1 */ + {"AVAILABLE-CONNECTIONS", N_("AVAILABLE-CONNECTIONS"), 80}, /* 2 */ + {NULL, NULL, 0} }; -#define NMC_FIELDS_DEV_LIST_GENERAL_ALL "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,DRIVER-VERSION,FIRMWARE-VERSION,HWADDR,STATE,REASON,UDI,IP-IFACE,"\ - "NM-MANAGED,AUTOCONNECT,FIRMWARE-MISSING,CONNECTION" -#define NMC_FIELDS_DEV_LIST_GENERAL_COMMON "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,HWADDR,STATE" - -/* Available fields for 'dev list' - CONNECTIONS part */ -static NmcOutputField nmc_fields_dev_list_connections[] = { - {"NAME", N_("NAME"), 10, NULL, 0}, /* 0 */ - {"AVAILABLE-CONNECTION-PATHS", N_("AVAILABLE-CONNECTION-PATHS"), 80, NULL, 0}, /* 1 */ - {"AVAILABLE-CONNECTIONS", N_("AVAILABLE-CONNECTIONS"), 80, NULL, 0}, /* 2 */ - {NULL, NULL, 0, NULL, 0} +#define NMC_FIELDS_DEV_SHOW_CONNECTIONS_ALL "AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS" +#define NMC_FIELDS_DEV_SHOW_CONNECTIONS_COMMON "AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS" + +/* Available fields for 'device show' - CAPABILITIES part */ +static NmcOutputField nmc_fields_dev_show_cap[] = { + {"NAME", N_("NAME"), 13}, /* 0 */ + {"CARRIER-DETECT", N_("CARRIER-DETECT"), 16}, /* 1 */ + {"SPEED", N_("SPEED"), 10}, /* 2 */ + {NULL, NULL, 0} }; -#define NMC_FIELDS_DEV_LIST_CONNECTIONS_ALL "AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS" -#define NMC_FIELDS_DEV_LIST_CONNECTIONS_COMMON "AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS" - -/* Available fields for 'dev list' - CAPABILITIES part */ -static NmcOutputField nmc_fields_dev_list_cap[] = { - {"NAME", N_("NAME"), 13, NULL, 0}, /* 0 */ - {"CARRIER-DETECT", N_("CARRIER-DETECT"), 16, NULL, 0}, /* 1 */ - {"SPEED", N_("SPEED"), 10, NULL, 0}, /* 2 */ - {NULL, NULL, 0, NULL, 0} +#define NMC_FIELDS_DEV_SHOW_CAP_ALL "NAME,CARRIER-DETECT,SPEED" +#define NMC_FIELDS_DEV_SHOW_CAP_COMMON "NAME,CARRIER-DETECT,SPEED" + +/* Available fields for 'device show' - wired properties part */ +static NmcOutputField nmc_fields_dev_show_wired_prop[] = { + {"NAME", N_("NAME"), 18}, /* 0 */ + {"CARRIER", N_("CARRIER"), 10}, /* 1 */ + {NULL, NULL, 0} }; -#define NMC_FIELDS_DEV_LIST_CAP_ALL "NAME,CARRIER-DETECT,SPEED" -#define NMC_FIELDS_DEV_LIST_CAP_COMMON "NAME,CARRIER-DETECT,SPEED" - -/* Available fields for 'dev list' - wired properties part */ -static NmcOutputField nmc_fields_dev_list_wired_prop[] = { - {"NAME", N_("NAME"), 18, NULL, 0}, /* 0 */ - {"CARRIER", N_("CARRIER"), 10, NULL, 0}, /* 1 */ - {NULL, NULL, 0, NULL, 0} +#define NMC_FIELDS_DEV_SHOW_WIRED_PROP_ALL "NAME,CARRIER" +#define NMC_FIELDS_DEV_SHOW_WIRED_PROP_COMMON "NAME,CARRIER" + +/* Available fields for 'device show' - wireless properties part */ +static NmcOutputField nmc_fields_dev_show_wifi_prop[] = { + {"NAME", N_("NAME"), 18}, /* 0 */ + {"WEP", N_("WEP"), 5}, /* 1 */ + {"WPA", N_("WPA"), 5}, /* 2 */ + {"WPA2", N_("WPA2"), 6}, /* 3 */ + {"TKIP", N_("TKIP"), 6}, /* 4 */ + {"CCMP", N_("CCMP"), 6}, /* 5 */ + {"AP", N_("AP"), 6}, /* 6 */ + {"ADHOC", N_("ADHOC"), 6}, /* 7 */ + {NULL, NULL, 0} }; -#define NMC_FIELDS_DEV_LIST_WIRED_PROP_ALL "NAME,CARRIER" -#define NMC_FIELDS_DEV_LIST_WIRED_PROP_COMMON "NAME,CARRIER" - - -/* Available fields for 'dev list' - wireless properties part */ -static NmcOutputField nmc_fields_dev_list_wifi_prop[] = { - {"NAME", N_("NAME"), 18, NULL, 0}, /* 0 */ - {"WEP", N_("WEP"), 5, NULL, 0}, /* 1 */ - {"WPA", N_("WPA"), 5, NULL, 0}, /* 2 */ - {"WPA2", N_("WPA2"), 6, NULL, 0}, /* 3 */ - {"TKIP", N_("TKIP"), 6, NULL, 0}, /* 4 */ - {"CCMP", N_("CCMP"), 6, NULL, 0}, /* 5 */ - {"AP", N_("AP"), 6, NULL, 0}, /* 6 */ - {"ADHOC", N_("ADHOC"), 6, NULL, 0}, /* 7 */ - {NULL, NULL, 0, NULL, 0} -}; -#define NMC_FIELDS_DEV_LIST_WIFI_PROP_ALL "NAME,WEP,WPA,WPA2,TKIP,CCMP,AP,ADHOC" -#define NMC_FIELDS_DEV_LIST_WIFI_PROP_COMMON "NAME,WEP,WPA,WPA2,TKIP,CCMP,AP,ADHOC" - -#if WITH_WIMAX -/* Available fields for 'dev list' - wimax properties part */ -static NmcOutputField nmc_fields_dev_list_wimax_prop[] = { - {"NAME", N_("NAME"), 18, NULL, 0}, /* 0 */ - {"CTR-FREQ", N_("CTR-FREQ"), 7, NULL, 0}, /* 1 */ - {"RSSI", N_("RSSI"), 5, NULL, 0}, /* 2 */ - {"CINR", N_("CINR"), 5, NULL, 0}, /* 3 */ - {"TX-POW", N_("TX-POW"), 5, NULL, 0}, /* 4 */ - {"BSID", N_("BSID"), 18, NULL, 0}, /* 5 */ - {NULL, NULL, 0, NULL, 0} +#define NMC_FIELDS_DEV_SHOW_WIFI_PROP_ALL "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 */ +static NmcOutputField nmc_fields_dev_show_wimax_prop[] = { + {"NAME", N_("NAME"), 18}, /* 0 */ + {"CTR-FREQ", N_("CTR-FREQ"), 7}, /* 1 */ + {"RSSI", N_("RSSI"), 5}, /* 2 */ + {"CINR", N_("CINR"), 5}, /* 3 */ + {"TX-POW", N_("TX-POW"), 5}, /* 4 */ + {"BSID", N_("BSID"), 18}, /* 5 */ + {NULL, NULL, 0} }; -#define NMC_FIELDS_DEV_LIST_WIMAX_PROP_ALL "NAME,CTR-FREQ,RSSI,CINR,TX-POW,BSID" -#define NMC_FIELDS_DEV_LIST_WIMAX_PROP_COMMON "NAME,CTR-FREQ,RSSI,CINR,TX-POW,BSID" -#endif +#define NMC_FIELDS_DEV_SHOW_WIMAX_PROP_ALL "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 'dev wifi list' */ +/* Available fields for 'device wifi list' */ static NmcOutputField nmc_fields_dev_wifi_list[] = { - {"NAME", N_("NAME"), 15, NULL, 0}, /* 0 */ - {"SSID", N_("SSID"), 33, NULL, 0}, /* 1 */ - {"BSSID", N_("BSSID"), 19, NULL, 0}, /* 2 */ - {"MODE", N_("MODE"), 16, NULL, 0}, /* 3 */ - {"FREQ", N_("FREQ"), 10, NULL, 0}, /* 4 */ - {"RATE", N_("RATE"), 10, NULL, 0}, /* 5 */ - {"SIGNAL", N_("SIGNAL"), 8, NULL, 0}, /* 6 */ - {"SECURITY", N_("SECURITY"), 10, NULL, 0}, /* 7 */ - {"WPA-FLAGS", N_("WPA-FLAGS"), 25, NULL, 0}, /* 8 */ - {"RSN-FLAGS", N_("RSN-FLAGS"), 25, NULL, 0}, /* 9 */ - {"DEVICE", N_("DEVICE"), 10, NULL, 0}, /* 10 */ - {"ACTIVE", N_("ACTIVE"), 8, NULL, 0}, /* 11 */ - {"DBUS-PATH", N_("DBUS-PATH"), 46, NULL, 0}, /* 12 */ - {NULL, NULL, 0, NULL, 0} + {"NAME", N_("NAME"), 15}, /* 0 */ + {"SSID", N_("SSID"), 33}, /* 1 */ + {"SSID-HEX", N_("SSID-HEX"), 66}, /* 2 */ + {"BSSID", N_("BSSID"), 19}, /* 3 */ + {"MODE", N_("MODE"), 16}, /* 4 */ + {"CHAN", N_("CHAN"), 6}, /* 5 */ + {"FREQ", N_("FREQ"), 10}, /* 6 */ + {"RATE", N_("RATE"), 10}, /* 7 */ + {"SIGNAL", N_("SIGNAL"), 8}, /* 8 */ + {"BARS", N_("BARS"), 6}, /* 9 */ + {"SECURITY", N_("SECURITY"), 10}, /* 10 */ + {"WPA-FLAGS", N_("WPA-FLAGS"), 25}, /* 11 */ + {"RSN-FLAGS", N_("RSN-FLAGS"), 25}, /* 12 */ + {"DEVICE", N_("DEVICE"), 10}, /* 13 */ + {"ACTIVE", N_("ACTIVE"), 8}, /* 14 */ + {"IN-USE", N_("*"), 1}, /* 15 */ + {"DBUS-PATH", N_("DBUS-PATH"), 46}, /* 16 */ + {NULL, NULL, 0} }; -#define NMC_FIELDS_DEV_WIFI_LIST_ALL "SSID,BSSID,MODE,FREQ,RATE,SIGNAL,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,DBUS-PATH" -#define NMC_FIELDS_DEV_WIFI_LIST_COMMON "SSID,BSSID,MODE,FREQ,RATE,SIGNAL,SECURITY,ACTIVE" +#define NMC_FIELDS_DEV_WIFI_LIST_ALL "SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,"\ + "WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH" +#define NMC_FIELDS_DEV_WIFI_LIST_COMMON "IN-USE,SSID,MODE,CHAN,RATE,SIGNAL,BARS,SECURITY" #define NMC_FIELDS_DEV_WIFI_LIST_FOR_DEV_LIST "NAME,"NMC_FIELDS_DEV_WIFI_LIST_COMMON -#if WITH_WIMAX -/* Available fields for 'dev wimax list' */ +/* Available fields for 'device wimax list' */ static NmcOutputField nmc_fields_dev_wimax_list[] = { - {"NAME", N_("NAME"), 15, NULL, 0}, /* 0 */ - {"NSP", N_("NSP"), 33, NULL, 0}, /* 1 */ - {"SIGNAL", N_("SIGNAL"), 8, NULL, 0}, /* 2 */ - {"TYPE", N_("TYPE"), 16, NULL, 0}, /* 3 */ - {"DEVICE", N_("DEVICE"), 10, NULL, 0}, /* 4 */ - {"ACTIVE", N_("ACTIVE"), 8, NULL, 0}, /* 5 */ - {"DBUS-PATH", N_("DBUS-PATH"), 46, NULL, 0}, /* 6 */ - {NULL, NULL, 0, NULL, 0} + {"NAME", N_("NAME"), 15}, /* 0 */ + {"NSP", N_("NSP"), 33}, /* 1 */ + {"SIGNAL", N_("SIGNAL"), 8}, /* 2 */ + {"TYPE", N_("TYPE"), 16}, /* 3 */ + {"DEVICE", N_("DEVICE"), 10}, /* 4 */ + {"ACTIVE", N_("ACTIVE"), 8}, /* 5 */ + {"DBUS-PATH", N_("DBUS-PATH"), 46}, /* 6 */ + {NULL, NULL, 0} }; #define NMC_FIELDS_DEV_WIMAX_LIST_ALL "NSP,SIGNAL,TYPE,DEVICE,ACTIVE,DBUS-PATH" #define NMC_FIELDS_DEV_WIMAX_LIST_COMMON "NSP,SIGNAL,TYPE,DEVICE,ACTIVE" #define NMC_FIELDS_DEV_WIMAX_LIST_FOR_DEV_LIST "NAME,"NMC_FIELDS_DEV_WIMAX_LIST_COMMON -#endif -/* Available fields for 'dev list' - BOND part */ -static NmcOutputField nmc_fields_dev_list_bond_prop[] = { - {"NAME", N_("NAME"), 18, NULL, 0}, /* 0 */ - {"SLAVES", N_("SLAVES"), 20, NULL, 0}, /* 1 */ - {NULL, NULL, 0, NULL, 0} +/* Available fields for 'device show' - BOND part */ +static NmcOutputField nmc_fields_dev_show_bond_prop[] = { + {"NAME", N_("NAME"), 18}, /* 0 */ + {"SLAVES", N_("SLAVES"), 20}, /* 1 */ + {NULL, NULL, 0} +}; +#define NMC_FIELDS_DEV_SHOW_BOND_PROP_ALL "NAME,SLAVES" +#define NMC_FIELDS_DEV_SHOW_BOND_PROP_COMMON "NAME,SLAVES" + +/* Available fields for 'device show' - VLAN part */ +static NmcOutputField nmc_fields_dev_show_vlan_prop[] = { + {"NAME", N_("NAME"), 18}, /* 0 */ + {"ID", N_("ID"), 5}, /* 1 */ + {NULL, NULL, 0} }; -#define NMC_FIELDS_DEV_LIST_BOND_PROP_ALL "NAME,SLAVES" -#define NMC_FIELDS_DEV_LIST_BOND_PROP_COMMON "NAME,SLAVES" - -/* Available fields for 'dev list' - VLAN part */ -static NmcOutputField nmc_fields_dev_list_vlan_prop[] = { - {"NAME", N_("NAME"), 18, NULL, 0}, /* 0 */ - {"ID", N_("ID"), 5, NULL, 0}, /* 1 */ - {NULL, NULL, 0, NULL, 0} +#define NMC_FIELDS_DEV_SHOW_VLAN_PROP_ALL "NAME,ID" +#define NMC_FIELDS_DEV_SHOW_VLAN_PROP_COMMON "NAME,ID" + +/* defined in common.c */ +extern NmcOutputField nmc_fields_ip4_config[]; +extern NmcOutputField nmc_fields_ip6_config[]; +extern NmcOutputField nmc_fields_dhcp4_config[]; +extern NmcOutputField nmc_fields_dhcp6_config[]; + +/* Available sections for 'device show' */ +static NmcOutputField nmc_fields_dev_show_sections[] = { + {"GENERAL", N_("GENERAL"), 0, nmc_fields_dev_show_general + 1 }, /* 0 */ + {"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 */ + {"AP", N_("AP"), 0, nmc_fields_dev_wifi_list + 1 }, /* 3 */ + {"WIRED-PROPERTIES", N_("WIRED-PROPERTIES"), 0, nmc_fields_dev_show_wired_prop + 1 }, /* 4 */ + {"WIMAX-PROPERTIES", N_("WIMAX-PROPERTIES"), 0, nmc_fields_dev_show_wimax_prop + 1 }, /* 5 */ + {"NSP", N_("NSP"), 0, nmc_fields_dev_wimax_list + 1 }, /* 6 */ + {"IP4", N_("IP4"), 0, nmc_fields_ip4_config + 1 }, /* 7 */ + {"DHCP4", N_("DHCP4"), 0, nmc_fields_dhcp4_config + 1 }, /* 8 */ + {"IP6", N_("IP6"), 0, nmc_fields_ip6_config + 1 }, /* 9 */ + {"DHCP6", N_("DHCP6"), 0, nmc_fields_dhcp6_config + 1 }, /* 10 */ + {"BOND", N_("BOND"), 0, nmc_fields_dev_show_bond_prop + 1 }, /* 11 */ + {"VLAN", N_("VLAN"), 0, nmc_fields_dev_show_vlan_prop + 1 }, /* 12 */ + {"CONNECTIONS", N_("CONNECTIONS"), 0, nmc_fields_dev_show_connections + 1 }, /* 13 */ + {NULL, NULL, 0, NULL } }; -#define NMC_FIELDS_DEV_LIST_VLAN_PROP_ALL "NAME,ID" -#define NMC_FIELDS_DEV_LIST_VLAN_PROP_COMMON "NAME,ID" +#if WITH_WIMAX +#define NMC_FIELDS_DEV_SHOW_SECTIONS_ALL "GENERAL,CAPABILITIES,BOND,VLAN,CONNECTIONS,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,"\ + "WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6" +#define NMC_FIELDS_DEV_SHOW_SECTIONS_COMMON "GENERAL.DEVICE,GENERAL.TYPE,GENERAL.HWADDR,GENERAL.MTU,GENERAL.STATE,"\ + "GENERAL.CONNECTION,GENERAL.CON-PATH,WIRED-PROPERTIES,IP4,IP6" +#else +#define NMC_FIELDS_DEV_SHOW_SECTIONS_ALL "GENERAL,CAPABILITIES,BOND,VLAN,CONNECTIONS,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,"\ + "IP4,DHCP4,IP6,DHCP6" +#define NMC_FIELDS_DEV_SHOW_SECTIONS_COMMON "GENERAL.DEVICE,GENERAL.TYPE,GENERAL.HWADDR,GENERAL.MTU,GENERAL.STATE,"\ + "GENERAL.CONNECTION,GENERAL.CON-PATH,WIRED-PROPERTIES,IP4,IP6" +#endif /* glib main loop variable - defined in nmcli.c */ @@ -257,23 +276,127 @@ usage (void) fprintf (stderr, _("Usage: nmcli device { COMMAND | help }\n\n" #if WITH_WIMAX - " COMMAND := { status | list | disconnect | wifi | wimax }\n\n" + "COMMAND := { status | show | connect | disconnect | wifi | wimax }\n\n" #else - " COMMAND := { status | list | disconnect | wifi }\n\n" + "COMMAND := { status | show | connect | disconnect | wifi }\n\n" #endif - " status\n" - " list [iface <iface>]\n" - " disconnect iface <iface> [--nowait] [--timeout <timeout>]\n" - " wifi [list [iface <iface>] [bssid <BSSID>]]\n" - " wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [iface <iface>] [bssid <BSSID>] [name <name>]\n" - " [--private] [--nowait] [--timeout <timeout>]\n" + " status\n\n" + " show [<ifname>]\n\n" + " connect <ifname>\n\n" + " disconnect <ifname>\n\n" + " wifi [list [ifname <ifname>] [bssid <BSSID>]]\n\n" + " wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [ifname <ifname>]\n" + " [bssid <BSSID>] [name <name>] [private yes|no]\n\n" + " wifi rescan [[ifname] <ifname>]\n\n" #if WITH_WIMAX - " wimax [list [iface <iface>] [nsp <name>]]\n" + " wimax [list [ifname <ifname>] [nsp <name>]]\n\n" #endif - "\n" )); } +static void +usage_device_status (void) +{ + fprintf (stderr, + _("Usage: nmcli device status { help }\n" + "\n" + "Show status for all devices.\n" + "By default, the following columns are shown:\n" + " DEVICE - interface name\n" + " TYPE - device type\n" + " STATE - device state\n" + " CONNECTION - connection activated on device (if any)\n" + "Displayed columns can be changed using '--fields' global option. 'status' is\n" + "the default command, which means 'nmcli device' calls 'nmcli device status'.\n\n")); +} + +static void +usage_device_show (void) +{ + fprintf (stderr, + _("Usage: nmcli device show { ARGUMENTS | help }\n" + "\n" + "ARGUMENTS := [<ifname>]\n" + "\n" + "Show details of device(s).\n" + "The command lists details for all devices, or for a given device.\n\n")); +} + +static void +usage_device_connect (void) +{ + fprintf (stderr, + _("Usage: nmcli device connect { ARGUMENTS | help }\n" + "\n" + "ARGUMENTS := <ifname>\n" + "\n" + "Connect the device.\n" + "NetworkManager will try to find a suitable connection that will be activated.\n" + "It will also consider connections that are not set to auto-connect.\n\n")); +} + +static void +usage_device_disconnect (void) +{ + fprintf (stderr, + _("Usage: nmcli device disconnect { ARGUMENTS | help }\n" + "\n" + "ARGUMENTS := <ifname>\n" + "\n" + "Disconnect the device.\n" + "The command disconnects the device and prevents it from auto-activating\n" + "further connections without user/manual intervention.\n\n")); +} + +static void +usage_device_wifi (void) +{ + fprintf (stderr, + _("Usage: nmcli device wifi { ARGUMENTS | help }\n" + "\n" + "Perform operation on Wi-Fi devices.\n" + "\n" + "ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>]]\n" + "\n" + "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n" + "used to list APs for a particular interface, or with a specific BSSID.\n" + "\n" + "ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [ifname <ifname>]\n" + " [bssid <BSSID>] [name <name>] [private yes|no]\n" + "\n" + "Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n" + "a new connection and then activates it on a device. This is a command-line\n" + "counterpart of clicking an SSID in a GUI client. The command always creates\n" + "a new connection and thus it is mainly useful for connecting to new Wi-Fi\n" + "networks. If a connection for the network already exists, it is better to\n" + "bring up the existing profile as follows: nmcli con up id <name>. Note that\n" + "only open, WEP and WPA-PSK networks are supported at the moment. It is also\n" + "assumed that IP configuration is obtained via DHCP.\n" + "\n" + "ARGUMENTS := rescan [[ifname] <ifname>]\n" + "\n" + "Request that NetworkManager immediately re-scan for available access points.\n" + "NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n" + "be useful to start scanning manually. Note that this command does not show\n" + "the APs, use 'nmcli device wifi list' for that.\n\n")); +} + +#if WITH_WIMAX +static void +usage_device_wimax (void) +{ + fprintf (stderr, + _("Usage: nmcli device wimax { ARGUMENTS | help }\n" + "\n" + "Perform operation on WiMAX devices.\n" + "\n" + "ARGUMENTS := [list [ifname <ifname>] [nsp <name>]]\n" + "\n" + "List available WiMAX NSPs. The 'ifname' and 'nsp' options can be used to\n" + "list networks for a particular interface, or with a specific NSP.\n\n")); +} +#endif + /* quit main loop */ static void quit (void) @@ -286,47 +409,46 @@ quit (void) g_main_loop_quit (loop); /* quit main loop */ } -/* Convert device type to string. Use setting names strings to match with - * connection type names. - */ -static const char * -device_type_to_string (NMDevice *device) +static int +compare_devices (const void *a, const void *b) { - NMDeviceModemCapabilities caps = NM_DEVICE_MODEM_CAPABILITY_NONE; - - switch (nm_device_get_device_type (device)) { - case NM_DEVICE_TYPE_ETHERNET: - return NM_SETTING_WIRED_SETTING_NAME; - case NM_DEVICE_TYPE_ADSL: - return NM_SETTING_ADSL_SETTING_NAME; - case NM_DEVICE_TYPE_WIFI: - return NM_SETTING_WIRELESS_SETTING_NAME; - case NM_DEVICE_TYPE_MODEM: - caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device)); - if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) - return NM_SETTING_GSM_SETTING_NAME; - else if (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO) - return NM_SETTING_CDMA_SETTING_NAME; - return _("Unknown"); - case NM_DEVICE_TYPE_BT: - return NM_SETTING_BLUETOOTH_SETTING_NAME; - case NM_DEVICE_TYPE_OLPC_MESH: - return NM_SETTING_OLPC_MESH_SETTING_NAME; -#if WITH_WIMAX - case NM_DEVICE_TYPE_WIMAX: - return NM_SETTING_WIMAX_SETTING_NAME; -#endif - case NM_DEVICE_TYPE_INFINIBAND: - return NM_SETTING_INFINIBAND_SETTING_NAME; - case NM_DEVICE_TYPE_BOND: - return NM_SETTING_BOND_SETTING_NAME; - case NM_DEVICE_TYPE_VLAN: - return NM_SETTING_VLAN_SETTING_NAME; - case NM_DEVICE_TYPE_BRIDGE: - return NM_SETTING_BRIDGE_SETTING_NAME; - default: - return _("Unknown"); + NMDevice *da = *(NMDevice **)a; + NMDevice *db = *(NMDevice **)b; + int cmp; + + /* Sort by later device states first */ + cmp = nm_device_get_state (db) - nm_device_get_state (da); + if (cmp != 0) + return cmp; + + cmp = g_strcmp0 (nm_device_get_type_description (da), + nm_device_get_type_description (db)); + if (cmp != 0) + return cmp; + + return g_strcmp0 (nm_device_get_iface (da), + nm_device_get_iface (db)); +} + +static NMDevice ** +get_devices_sorted (NMClient *client) +{ + const GPtrArray *devs; + NMDevice **sorted; + + devs = nm_client_get_devices (client); + if (!devs) { + sorted = g_new (NMDevice *, 1); + sorted[0] = NULL; + return sorted; } + + sorted = g_new (NMDevice *, devs->len + 1); + memcpy (sorted, devs->pdata, devs->len * sizeof (NMDevice *)); + sorted[devs->len] = NULL; + + qsort (sorted, devs->len, sizeof (NMDevice *), compare_devices); + return sorted; } static char * @@ -374,15 +496,17 @@ ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags) typedef struct { NmCli *nmc; int index; + guint32 output_flags; const char* active_bssid; const char* device; } APInfo; static void -detail_access_point (gpointer data, gpointer user_data) +fill_output_access_point (gpointer data, gpointer user_data) { NMAccessPoint *ap = NM_ACCESS_POINT (data); APInfo *info = (APInfo *) user_data; + NmcOutputField *arr; gboolean active = FALSE; NM80211ApFlags flags; NM80211ApSecurityFlags wpa_flags, rsn_flags; @@ -391,9 +515,16 @@ detail_access_point (gpointer data, gpointer user_data) const GByteArray *ssid; const char *bssid; NM80211Mode mode; - char *freq_str, *ssid_str, *bitrate_str, *strength_str, *wpa_flags_str, *rsn_flags_str; + char *channel_str, *freq_str, *ssid_str = NULL, *ssid_hex_str = NULL, + *bitrate_str, *strength_str, *wpa_flags_str, *rsn_flags_str; GString *security_str; char *ap_name; + const char *sig_level_0 = "____"; + const char *sig_level_1 = "▂___"; + const char *sig_level_2 = "▂▄__"; + const char *sig_level_3 = "▂▄▆_"; + const char *sig_level_4 = "▂▄▆█"; + const char *sig_bars; if (info->active_bssid) { const char *current_bssid = nm_access_point_get_bssid (ap); @@ -410,75 +541,89 @@ detail_access_point (gpointer data, gpointer user_data) freq = nm_access_point_get_frequency (ap); mode = nm_access_point_get_mode (ap); bitrate = nm_access_point_get_max_bitrate (ap); - strength = nm_access_point_get_strength (ap); + strength = MIN (nm_access_point_get_strength (ap), 100); /* Convert to strings */ - ssid_str = ssid_to_printable ((const char *) ssid->data, ssid->len); + if (ssid) { + ssid_str = nm_utils_ssid_to_utf8 (ssid); + ssid_hex_str = ssid_to_hex ((const char *) ssid->data, ssid->len); + } + channel_str = g_strdup_printf ("%u", nm_utils_wifi_freq_to_channel (freq)); freq_str = g_strdup_printf (_("%u MHz"), freq); - bitrate_str = g_strdup_printf (_("%u MB/s"), bitrate/1000); + bitrate_str = g_strdup_printf (_("%u Mbit/s"), bitrate/1000); strength_str = g_strdup_printf ("%u", strength); wpa_flags_str = ap_wpa_rsn_flags_to_string (wpa_flags); rsn_flags_str = ap_wpa_rsn_flags_to_string (rsn_flags); + sig_bars = strength > 80 ? sig_level_4 : + strength > 55 ? sig_level_3 : + strength > 30 ? sig_level_2 : + strength > 5 ? sig_level_1 : + sig_level_0; security_str = g_string_new (NULL); - if ( !(flags & NM_802_11_AP_FLAGS_PRIVACY) - && (wpa_flags != NM_802_11_AP_SEC_NONE) - && (rsn_flags != NM_802_11_AP_SEC_NONE)) - g_string_append (security_str, _("Encrypted: ")); if ( (flags & NM_802_11_AP_FLAGS_PRIVACY) && (wpa_flags == NM_802_11_AP_SEC_NONE) - && (rsn_flags == NM_802_11_AP_SEC_NONE)) - g_string_append (security_str, _("WEP ")); - if (wpa_flags != NM_802_11_AP_SEC_NONE) - g_string_append (security_str, _("WPA ")); - if (rsn_flags != NM_802_11_AP_SEC_NONE) - g_string_append (security_str, _("WPA2 ")); + && (rsn_flags == NM_802_11_AP_SEC_NONE)) { + g_string_append (security_str, _("WEP")); + g_string_append_c (security_str, ' '); + } + if (wpa_flags != NM_802_11_AP_SEC_NONE) { + g_string_append (security_str, _("WPA1")); + g_string_append_c (security_str, ' '); + } + if (rsn_flags != NM_802_11_AP_SEC_NONE) { + g_string_append (security_str, _("WPA2")); + g_string_append_c (security_str, ' '); + } if ( (wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) - || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) - g_string_append (security_str, _("Enterprise ")); + || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) { + g_string_append (security_str, _("802.1X")); + g_string_append_c (security_str, ' '); + } if (security_str->len > 0) g_string_truncate (security_str, security_str->len-1); /* Chop off last space */ + arr = nmc_dup_fields_array (nmc_fields_dev_wifi_list, + sizeof (nmc_fields_dev_wifi_list), + info->output_flags); + ap_name = g_strdup_printf ("AP[%d]", info->index++); /* AP */ - info->nmc->allowed_fields[0].value = ap_name; - info->nmc->allowed_fields[1].value = ssid_str; - info->nmc->allowed_fields[2].value = bssid; - info->nmc->allowed_fields[3].value = mode == NM_802_11_MODE_ADHOC ? _("Ad-Hoc") - : mode == NM_802_11_MODE_INFRA ? _("Infrastructure") - : _("Unknown"); - info->nmc->allowed_fields[4].value = freq_str; - info->nmc->allowed_fields[5].value = bitrate_str; - info->nmc->allowed_fields[6].value = strength_str; - info->nmc->allowed_fields[7].value = security_str->str; - info->nmc->allowed_fields[8].value = wpa_flags_str; - info->nmc->allowed_fields[9].value = rsn_flags_str; - info->nmc->allowed_fields[10].value = info->device; - info->nmc->allowed_fields[11].value = active ? _("yes") : _("no"); - info->nmc->allowed_fields[12].value = nm_object_get_path (NM_OBJECT (ap)); - - info->nmc->print_fields.flags &= ~NMC_PF_FLAG_MAIN_HEADER_ADD & ~NMC_PF_FLAG_MAIN_HEADER_ONLY & ~NMC_PF_FLAG_FIELD_NAMES; /* Clear header flags */ - print_fields (info->nmc->print_fields, info->nmc->allowed_fields); - - g_free (ap_name); - g_free (ssid_str); - g_free (freq_str); - g_free (bitrate_str); - g_free (strength_str); - g_free (wpa_flags_str); - g_free (rsn_flags_str); - g_string_free (security_str, TRUE); + set_val_str (arr, 0, ap_name); + set_val_str (arr, 1, ssid_str); + set_val_str (arr, 2, ssid_hex_str); + set_val_strc (arr, 3, bssid); + set_val_strc (arr, 4, mode == NM_802_11_MODE_ADHOC ? _("Ad-Hoc") + : mode == NM_802_11_MODE_INFRA ? _("Infra") + : _("N/A")); + set_val_str (arr, 5, channel_str); + set_val_str (arr, 6, freq_str); + set_val_str (arr, 7, bitrate_str); + set_val_str (arr, 8, strength_str); + set_val_strc (arr, 9, sig_bars); + set_val_str (arr, 10, security_str->str); + set_val_str (arr, 11, wpa_flags_str); + set_val_str (arr, 12, rsn_flags_str); + set_val_strc (arr, 13, info->device); + set_val_strc (arr, 14, active ? _("yes") : _("no")); + set_val_strc (arr, 15, active ? "*" : " "); + set_val_strc (arr, 16, nm_object_get_path (NM_OBJECT (ap))); + + g_ptr_array_add (info->nmc->output_data, arr); + + g_string_free (security_str, FALSE); } #if WITH_WIMAX static void -detail_wimax_nsp (NMWimaxNsp *nsp, NmCli *nmc, NMDevice *dev, int idx) +fill_output_wimax_nsp (NMWimaxNsp *nsp, NmCli *nmc, NMDevice *dev, int idx, guint32 o_flags) { NMDeviceWimax *wimax = NM_DEVICE_WIMAX (dev); char *nsp_name, *quality_str; const char *ntype; gboolean active = FALSE; + NmcOutputField *arr; switch (nm_wimax_nsp_get_network_type (nsp)) { case NM_WIMAX_NSP_NETWORK_TYPE_HOME: @@ -503,32 +648,64 @@ detail_wimax_nsp (NMWimaxNsp *nsp, NmCli *nmc, NMDevice *dev, int idx) quality_str = g_strdup_printf ("%u", nm_wimax_nsp_get_signal_quality (nsp)); nsp_name = g_strdup_printf ("NSP[%d]", idx); /* NSP */ - nmc->allowed_fields[0].value = nsp_name; - nmc->allowed_fields[1].value = nm_wimax_nsp_get_name (nsp); - nmc->allowed_fields[2].value = quality_str; - nmc->allowed_fields[3].value = ntype; - nmc->allowed_fields[4].value = nm_device_get_iface (dev); - nmc->allowed_fields[5].value = active ? _("yes") : _("no"); - nmc->allowed_fields[6].value = nm_object_get_path (NM_OBJECT (nsp)); + arr = nmc_dup_fields_array (nmc_fields_dev_wimax_list, + sizeof (nmc_fields_dev_wimax_list), + o_flags); + set_val_str (arr, 0, nsp_name); + set_val_strc (arr, 1, nm_wimax_nsp_get_name (nsp)); + set_val_str (arr, 2, quality_str); + set_val_strc (arr, 3, ntype); + set_val_strc (arr, 4, nm_device_get_iface (dev)); + set_val_strc (arr, 5, active ? _("yes") : _("no")); + set_val_strc (arr, 6, nm_object_get_path (NM_OBJECT (nsp))); + + g_ptr_array_add (nmc->output_data, arr); +} +#endif + +static const char * +construct_header_name (const char *base, const char *spec) +{ + static char header_name[128]; - nmc->print_fields.flags &= ~NMC_PF_FLAG_MAIN_HEADER_ADD & ~NMC_PF_FLAG_MAIN_HEADER_ONLY & ~NMC_PF_FLAG_FIELD_NAMES; /* Clear header flags */ - print_fields (nmc->print_fields, nmc->allowed_fields); + if (spec == NULL) + return base; - g_free (nsp_name); - g_free (quality_str); + g_strlcpy (header_name, base, sizeof (header_name)); + g_strlcat (header_name, " (", sizeof (header_name)); + g_strlcat (header_name, spec, sizeof (header_name)); + g_strlcat (header_name, ")", sizeof (header_name)); + + return header_name; } -#endif -struct cb_info { - NMClient *client; - const GPtrArray *active; -}; +static const char * +get_active_connection_id (NMDevice *device) +{ + const GPtrArray *avail_cons; + NMActiveConnection *ac; + const char *ac_uuid; + int i; -static void -show_device_info (gpointer data, gpointer user_data) + ac = nm_device_get_active_connection (device); + if (!ac) + return NULL; + ac_uuid = nm_active_connection_get_uuid (ac); + + avail_cons = nm_device_get_available_connections (device); + for (i = 0; avail_cons && (i < avail_cons->len); i++) { + NMRemoteConnection *candidate = g_ptr_array_index (avail_cons, i); + const char *test_uuid = nm_connection_get_uuid (NM_CONNECTION (candidate)); + + if (g_strcmp0 (ac_uuid, test_uuid) == 0) + return nm_connection_get_id (NM_CONNECTION (candidate)); + } + return NULL; +} + +static gboolean +show_device_info (NMDevice *device, NmCli *nmc) { - NMDevice *device = NM_DEVICE (data); - NmCli *nmc = (NmCli *) user_data; GError *error = NULL; APInfo *info; const char *hwaddr = NULL; @@ -537,18 +714,21 @@ show_device_info (gpointer data, gpointer user_data) NMDeviceCapabilities caps; NMActiveConnection *acon; guint32 speed; - char *speed_str = NULL; - char *state_str = NULL; - char *reason_str = NULL; + char *speed_str, *state_str, *reason_str, *mtu_str; GArray *sections_array; int k; char *fields_str; - char *fields_all = NMC_FIELDS_DEV_LIST_SECTIONS_ALL; - char *fields_common = NMC_FIELDS_DEV_LIST_SECTIONS_COMMON; - guint32 mode_flag = (nmc->print_output == NMC_PRINT_PRETTY) ? NMC_PF_FLAG_PRETTY : (nmc->print_output == NMC_PRINT_TERSE) ? NMC_PF_FLAG_TERSE : 0; - guint32 multiline_flag = nmc->multiline_output ? NMC_PF_FLAG_MULTILINE : 0; - guint32 escape_flag = nmc->escape_values ? NMC_PF_FLAG_ESCAPE : 0; + char *fields_all = NMC_FIELDS_DEV_SHOW_SECTIONS_ALL; + char *fields_common = NMC_FIELDS_DEV_SHOW_SECTIONS_COMMON; + NmcOutputField *tmpl, *arr; + size_t tmpl_len; gboolean was_output = FALSE; + NMIP4Config *cfg4; + NMIP6Config *cfg6; + NMDHCP4Config *dhcp4; + NMDHCP6Config *dhcp6; + const char *base_hdr = _("Device details"); + GPtrArray *fields_in_section = NULL; if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) fields_str = fields_common; @@ -557,94 +737,87 @@ show_device_info (gpointer data, gpointer user_data) else fields_str = nmc->required_fields; - sections_array = parse_output_fields (fields_str, nmc_fields_dev_list_sections, &error); + sections_array = parse_output_fields (fields_str, nmc_fields_dev_show_sections, TRUE, &fields_in_section, &error); if (error) { - if (error->code == 0) - g_string_printf (nmc->return_text, _("Error: 'dev list': %s"), error->message); - else - g_string_printf (nmc->return_text, _("Error: 'dev list': %s; allowed fields: %s"), error->message, NMC_FIELDS_DEV_LIST_SECTIONS_ALL); + g_string_printf (nmc->return_text, _("Error: 'device show': %s"), error->message); g_error_free (error); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - return; + return FALSE; } /* Main header */ - nmc->allowed_fields = nmc_fields_dev_list_general; - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_MAIN_HEADER_ONLY; - nmc->print_fields.header_name = _("Device details"); - nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_LIST_GENERAL_ALL, nmc->allowed_fields, NULL); - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ + nmc->print_fields.header_name = (char *) construct_header_name (base_hdr, nm_device_get_iface (device)); + nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_SHOW_GENERAL_ALL, + nmc_fields_dev_show_general, FALSE, NULL, NULL); + + nmc_fields_dev_show_general[0].flags = NMC_OF_FLAG_MAIN_HEADER_ONLY; + print_required_fields (nmc, nmc_fields_dev_show_general); /* Loop through the required sections and print them. */ for (k = 0; k < sections_array->len; k++) { int section_idx = g_array_index (sections_array, int, k); + char *section_fld = (char *) g_ptr_array_index (fields_in_section, k); if (nmc->print_output != NMC_PRINT_TERSE && !nmc->multiline_output && was_output) - printf ("\n"); /* Empty line */ + printf ("\n"); /* Print empty line between groups in tabular mode */ was_output = FALSE; + /* Remove any previous data */ + nmc_empty_output_fields (nmc); + state = nm_device_get_state_reason (device, &reason); /* section GENERAL */ - if (!strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[0].name)) { - nmc->allowed_fields = nmc_fields_dev_list_general; - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; - nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_LIST_GENERAL_ALL, nmc->allowed_fields, NULL); - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ - - if (NM_IS_DEVICE_ETHERNET (device)) - hwaddr = nm_device_ethernet_get_hw_address (NM_DEVICE_ETHERNET (device)); - else if (NM_IS_DEVICE_WIFI (device)) - hwaddr = nm_device_wifi_get_hw_address (NM_DEVICE_WIFI (device)); -#if WITH_WIMAX - else if (NM_IS_DEVICE_WIMAX (device)) - hwaddr = nm_device_wimax_get_hw_address (NM_DEVICE_WIMAX (device)); -#endif - else if (NM_IS_DEVICE_INFINIBAND (device)) - hwaddr = nm_device_infiniband_get_hw_address (NM_DEVICE_INFINIBAND (device)); - else if (NM_IS_DEVICE_BOND (device)) - hwaddr = nm_device_bond_get_hw_address (NM_DEVICE_BOND (device)); - else if (NM_IS_DEVICE_VLAN (device)) - hwaddr = nm_device_vlan_get_hw_address (NM_DEVICE_VLAN (device)); - else if (NM_IS_DEVICE_BRIDGE (device)) - hwaddr = nm_device_bridge_get_hw_address (NM_DEVICE_BRIDGE (device)); + if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[0].name)) { + tmpl = nmc_fields_dev_show_general; + tmpl_len = sizeof (nmc_fields_dev_show_general); + nmc->print_fields.indices = parse_output_fields (section_fld ? section_fld : NMC_FIELDS_DEV_SHOW_GENERAL_ALL, + tmpl, FALSE, NULL, NULL); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); state_str = g_strdup_printf ("%d (%s)", state, nmc_device_state_to_string (state)); reason_str = g_strdup_printf ("%d (%s)", reason, nmc_device_reason_to_string (reason)); - - nmc->allowed_fields[0].value = nmc_fields_dev_list_sections[0].name; /* "GENERAL"*/ - nmc->allowed_fields[1].value = nm_device_get_iface (device); - nmc->allowed_fields[2].value = device_type_to_string (device); - nmc->allowed_fields[3].value = nm_device_get_vendor (device); - nmc->allowed_fields[4].value = nm_device_get_product (device); - nmc->allowed_fields[5].value = nm_device_get_driver (device) ? nm_device_get_driver (device) : _("(unknown)"); - nmc->allowed_fields[6].value = nm_device_get_driver_version (device); - nmc->allowed_fields[7].value = nm_device_get_firmware_version (device); - nmc->allowed_fields[8].value = hwaddr ? hwaddr : _("(unknown)"); - nmc->allowed_fields[9].value = state_str; - nmc->allowed_fields[10].value = reason_str; - nmc->allowed_fields[11].value = nm_device_get_udi (device); - nmc->allowed_fields[12].value = nm_device_get_ip_iface (device); - nmc->allowed_fields[13].value = nm_device_get_managed (device) ? _("yes") : _("no"); - nmc->allowed_fields[14].value = nm_device_get_autoconnect (device) ? _("yes") : _("no"); - nmc->allowed_fields[15].value = nm_device_get_firmware_missing (device) ? _("yes") : _("no"); - nmc->allowed_fields[16].value = (acon = nm_device_get_active_connection (device)) ? - nm_object_get_path (NM_OBJECT (acon)) : _("not connected"); - - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ - g_free (state_str); - g_free (reason_str); + hwaddr = nm_device_get_hw_address (device); + mtu_str = g_strdup_printf ("%u", nm_device_get_mtu (device)); + acon = nm_device_get_active_connection (device); + + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); + set_val_strc (arr, 0, nmc_fields_dev_show_sections[0].name); /* "GENERAL"*/ + set_val_strc (arr, 1, nm_device_get_iface (device)); + set_val_strc (arr, 2, nm_device_get_type_description (device)); + set_val_strc (arr, 3, nm_device_get_vendor (device)); + set_val_strc (arr, 4, nm_device_get_product (device)); + set_val_strc (arr, 5, nm_device_get_driver (device) ? nm_device_get_driver (device) : _("(unknown)")); + set_val_strc (arr, 6, nm_device_get_driver_version (device)); + set_val_strc (arr, 7, nm_device_get_firmware_version (device)); + set_val_strc (arr, 8, hwaddr ? hwaddr : _("(unknown)")); + set_val_str (arr, 9, mtu_str); + set_val_str (arr, 10, state_str); + set_val_str (arr, 11, reason_str); + set_val_strc (arr, 12, nm_device_get_udi (device)); + set_val_strc (arr, 13, nm_device_get_ip_iface (device)); + set_val_strc (arr, 14, nm_device_get_managed (device) ? _("yes") : _("no")); + set_val_strc (arr, 15, nm_device_get_autoconnect (device) ? _("yes") : _("no")); + set_val_strc (arr, 16, nm_device_get_firmware_missing (device) ? _("yes") : _("no")); + set_val_strc (arr, 17, get_active_connection_id (device)); + set_val_strc (arr, 18, acon ? nm_active_connection_get_uuid (acon) : NULL); + set_val_strc (arr, 19, acon ? nm_object_get_path (NM_OBJECT (acon)) : NULL); + g_ptr_array_add (nmc->output_data, arr); + + print_data (nmc); /* Print all data */ was_output = TRUE; } /* section CAPABILITIES */ - if (!strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[1].name)) { - nmc->allowed_fields = nmc_fields_dev_list_cap; - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; - nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_LIST_CAP_ALL, nmc->allowed_fields, NULL); - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ + if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[1].name)) { + tmpl = nmc_fields_dev_show_cap; + tmpl_len = sizeof (nmc_fields_dev_show_cap); + nmc->print_fields.indices = parse_output_fields (section_fld ? section_fld : NMC_FIELDS_DEV_SHOW_CAP_ALL, + tmpl, FALSE, NULL, NULL); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); caps = nm_device_get_capabilities (device); speed = 0; @@ -656,20 +829,18 @@ show_device_info (gpointer data, gpointer user_data) speed = nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (device)); speed /= 1000; } - if (speed) - speed_str = g_strdup_printf (_("%u Mb/s"), speed); + speed_str = speed ? g_strdup_printf (_("%u Mb/s"), speed) : g_strdup (_("unknown")); - nmc->allowed_fields[0].value = nmc_fields_dev_list_sections[1].name; /* "CAPABILITIES" */ - nmc->allowed_fields[1].value = (caps & NM_DEVICE_CAP_CARRIER_DETECT) ? _("yes") : _("no"); - nmc->allowed_fields[2].value = speed_str ? speed_str : _("unknown"); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); + set_val_strc (arr, 0, nmc_fields_dev_show_sections[1].name); /* "CAPABILITIES" */ + set_val_strc (arr, 1, (caps & NM_DEVICE_CAP_CARRIER_DETECT) ? _("yes") : _("no")); + set_val_str (arr, 2, speed_str); + g_ptr_array_add (nmc->output_data, arr); - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ - g_free (speed_str); + print_data (nmc); /* Print all data */ was_output = TRUE; } - /* Wireless specific information */ if ((NM_IS_DEVICE_WIFI (device))) { NMDeviceWifiCapabilities wcaps; @@ -678,167 +849,177 @@ show_device_info (gpointer data, gpointer user_data) const GPtrArray *aps; /* section WIFI-PROPERTIES */ - if (!strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[2].name)) { + if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[2].name)) { wcaps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (device)); - nmc->allowed_fields = nmc_fields_dev_list_wifi_prop; - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; - nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_LIST_WIFI_PROP_ALL, nmc->allowed_fields, NULL); - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ - - nmc->allowed_fields[0].value = nmc_fields_dev_list_sections[2].name; /* "WIFI-PROPERTIES" */ - nmc->allowed_fields[1].value = (wcaps & (NM_WIFI_DEVICE_CAP_CIPHER_WEP40 | NM_WIFI_DEVICE_CAP_CIPHER_WEP104)) ? _("yes") : _("no"); - nmc->allowed_fields[2].value = (wcaps & NM_WIFI_DEVICE_CAP_WPA) ? _("yes") : _("no"); - nmc->allowed_fields[3].value = (wcaps & NM_WIFI_DEVICE_CAP_RSN) ? _("yes") : _("no"); - nmc->allowed_fields[4].value = (wcaps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP) ? _("yes") : _("no"); - nmc->allowed_fields[5].value = (wcaps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP) ? _("yes") : _("no"); - nmc->allowed_fields[6].value = (wcaps & NM_WIFI_DEVICE_CAP_AP) ? _("yes") : _("no"); - nmc->allowed_fields[7].value = (wcaps & NM_WIFI_DEVICE_CAP_ADHOC) ? _("yes") : _("no"); - - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ + tmpl = nmc_fields_dev_show_wifi_prop; + tmpl_len = sizeof (nmc_fields_dev_show_wifi_prop); + nmc->print_fields.indices = parse_output_fields (section_fld ? section_fld : NMC_FIELDS_DEV_SHOW_WIFI_PROP_ALL, + tmpl, FALSE, NULL, NULL); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); + + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); + set_val_strc (arr, 0, nmc_fields_dev_show_sections[2].name); /* "WIFI-PROPERTIES" */ + set_val_strc (arr, 1, (wcaps & (NM_WIFI_DEVICE_CAP_CIPHER_WEP40 | NM_WIFI_DEVICE_CAP_CIPHER_WEP104)) ? + _("yes") : _("no")); + set_val_strc (arr, 2, (wcaps & NM_WIFI_DEVICE_CAP_WPA) ? _("yes") : _("no")); + set_val_strc (arr, 3, (wcaps & NM_WIFI_DEVICE_CAP_RSN) ? _("yes") : _("no")); + set_val_strc (arr, 4, (wcaps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP) ? _("yes") : _("no")); + set_val_strc (arr, 5, (wcaps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP) ? _("yes") : _("no")); + set_val_strc (arr, 6, (wcaps & NM_WIFI_DEVICE_CAP_AP) ? _("yes") : _("no")); + set_val_strc (arr, 7, (wcaps & NM_WIFI_DEVICE_CAP_ADHOC) ? _("yes") : _("no")); + g_ptr_array_add (nmc->output_data, arr); + + print_data (nmc); /* Print all data */ was_output = TRUE; } /* section AP */ - if (!strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[3].name)) { + if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[3].name)) { if (state == NM_DEVICE_STATE_ACTIVATED) { active_ap = nm_device_wifi_get_active_access_point (NM_DEVICE_WIFI (device)); active_bssid = active_ap ? nm_access_point_get_bssid (active_ap) : NULL; } - nmc->allowed_fields = nmc_fields_dev_wifi_list; - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; - nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_WIFI_LIST_FOR_DEV_LIST, nmc->allowed_fields, NULL); - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ + tmpl = nmc_fields_dev_wifi_list; + tmpl_len = sizeof (nmc_fields_dev_wifi_list); + nmc->print_fields.indices = parse_output_fields (section_fld ? section_fld : NMC_FIELDS_DEV_WIFI_LIST_FOR_DEV_LIST, + tmpl, FALSE, NULL, NULL); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; info = g_malloc0 (sizeof (APInfo)); info->nmc = nmc; info->index = 1; + info->output_flags = NMC_OF_FLAG_SECTION_PREFIX; info->active_bssid = active_bssid; info->device = nm_device_get_iface (device); aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device)); if (aps && aps->len) - g_ptr_array_foreach ((GPtrArray *) aps, detail_access_point, (gpointer) info); + g_ptr_array_foreach ((GPtrArray *) aps, fill_output_access_point, (gpointer) info); g_free (info); + print_data (nmc); /* Print all data */ was_output = TRUE; } } else if (NM_IS_DEVICE_ETHERNET (device)) { /* WIRED-PROPERTIES */ - if (!strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[4].name)) { - nmc->allowed_fields = nmc_fields_dev_list_wired_prop; - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; - nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_LIST_WIRED_PROP_ALL, nmc->allowed_fields, NULL); - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ - - nmc->allowed_fields[0].value = nmc_fields_dev_list_sections[4].name; /* "WIRED-PROPERTIES" */ - nmc->allowed_fields[1].value = (nm_device_ethernet_get_carrier (NM_DEVICE_ETHERNET (device))) ? _("on") : _("off"); - - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ + if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[4].name)) { + tmpl = nmc_fields_dev_show_wired_prop; + tmpl_len = sizeof (nmc_fields_dev_show_wired_prop); + nmc->print_fields.indices = parse_output_fields (section_fld ? section_fld : NMC_FIELDS_DEV_SHOW_WIRED_PROP_ALL, + tmpl, FALSE, NULL, NULL); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); + + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); + set_val_strc (arr, 0, nmc_fields_dev_show_sections[4].name); /* "WIRED-PROPERTIES" */ + set_val_strc (arr, 1, (nm_device_ethernet_get_carrier (NM_DEVICE_ETHERNET (device))) ? + _("on") : _("off")); + g_ptr_array_add (nmc->output_data, arr); + + print_data (nmc); /* Print all data */ was_output = TRUE; } } #if WITH_WIMAX else if (NM_IS_DEVICE_WIMAX (device)) { /* WIMAX-PROPERTIES */ - if (!strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[5].name)) { + if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[5].name)) { char *cfreq = NULL, *rssi = NULL, *cinr = NULL, *txpow = NULL; guint tmp_uint; gint tmp_int; - const char *bsid; - - nmc->allowed_fields = nmc_fields_dev_list_wimax_prop; - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; - nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_LIST_WIMAX_PROP_ALL, nmc->allowed_fields, NULL); - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ - nmc->allowed_fields[0].value = nmc_fields_dev_list_sections[5].name; /* "WIMAX-PROPERTIES" */ + /* Field names */ + tmpl = nmc_fields_dev_show_wimax_prop; + tmpl_len = sizeof (nmc_fields_dev_show_wimax_prop); + nmc->print_fields.indices = parse_output_fields (section_fld ? section_fld : NMC_FIELDS_DEV_SHOW_WIMAX_PROP_ALL, + tmpl, FALSE, NULL, NULL); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); /* Center frequency */ tmp_uint = nm_device_wimax_get_center_frequency (NM_DEVICE_WIMAX (device)); if (tmp_uint) cfreq = g_strdup_printf ("%'.1f MHz", (double) tmp_uint / 1000.0); - nmc->allowed_fields[1].value = cfreq ? cfreq : ""; /* RSSI */ tmp_int = nm_device_wimax_get_rssi (NM_DEVICE_WIMAX (device)); if (tmp_int) rssi = g_strdup_printf ("%d dBm", tmp_int); - nmc->allowed_fields[2].value = rssi ? rssi : ""; /* CINR */ tmp_int = nm_device_wimax_get_cinr (NM_DEVICE_WIMAX (device)); if (tmp_int) cinr = g_strdup_printf ("%d dB", tmp_int); - nmc->allowed_fields[3].value = cinr ? cinr : ""; /* TX Power */ tmp_int = nm_device_wimax_get_tx_power (NM_DEVICE_WIMAX (device)); if (tmp_int) txpow = g_strdup_printf ("%'.2f dBm", (float) tmp_int / 2.0); - nmc->allowed_fields[4].value = txpow ? txpow : ""; - /* BSID */ - bsid = nm_device_wimax_get_bsid (NM_DEVICE_WIMAX (device)); - nmc->allowed_fields[5].value = bsid ? bsid : ""; + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); + set_val_strc (arr, 0, nmc_fields_dev_show_sections[5].name); /* "WIMAX-PROPERTIES" */ + set_val_str (arr, 1, cfreq); + set_val_str (arr, 2, rssi); + set_val_str (arr, 3, cinr); + set_val_str (arr, 4, txpow); + set_val_strc (arr, 5, nm_device_wimax_get_bsid (NM_DEVICE_WIMAX (device))); + g_ptr_array_add (nmc->output_data, arr); - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ + print_data (nmc); /* Print all data */ was_output = TRUE; } /* section NSP */ - if (!strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[6].name)) { + if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[6].name)) { const GPtrArray *nsps; int g, idx = 1; - nmc->allowed_fields = nmc_fields_dev_wimax_list; - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; - nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_WIMAX_LIST_FOR_DEV_LIST, nmc->allowed_fields, NULL); - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ - - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; + tmpl = nmc_fields_dev_wimax_list; + tmpl_len = sizeof (nmc_fields_dev_wimax_list); + nmc->print_fields.indices = parse_output_fields (section_fld ? section_fld : NMC_FIELDS_DEV_WIMAX_LIST_FOR_DEV_LIST, + tmpl, FALSE, NULL, NULL); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); nsps = nm_device_wimax_get_nsps (NM_DEVICE_WIMAX (device)); for (g = 0; nsps && g < nsps->len; g++) { NMWimaxNsp *nsp = g_ptr_array_index (nsps, g); - detail_wimax_nsp (nsp, nmc, device, idx++); + fill_output_wimax_nsp (nsp, nmc, device, idx++, NMC_OF_FLAG_SECTION_PREFIX); } + print_data (nmc); /* Print all data */ was_output = TRUE; } } #endif /* IP configuration info */ - if (state == NM_DEVICE_STATE_ACTIVATED) { - NMIP4Config *cfg4 = nm_device_get_ip4_config (device); - NMIP6Config *cfg6 = nm_device_get_ip6_config (device); - NMDHCP4Config *dhcp4 = nm_device_get_dhcp4_config (device); - NMDHCP6Config *dhcp6 = nm_device_get_dhcp6_config (device); - - /* IP4 */ - if (cfg4 && !strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[7].name)) - was_output = print_ip4_config (cfg4, nmc, nmc_fields_dev_list_sections[7].name); - - /* DHCP4 */ - if (dhcp4 && !strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[8].name)) - was_output = print_dhcp4_config (dhcp4, nmc, nmc_fields_dev_list_sections[8].name); - - /* IP6 */ - if (cfg6 && !strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[9].name)) - was_output = print_ip6_config (cfg6, nmc, nmc_fields_dev_list_sections[9].name); - - /* DHCP6 */ - if (dhcp6 && !strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[10].name)) - was_output = print_dhcp6_config (dhcp6, nmc, nmc_fields_dev_list_sections[10].name); - } + cfg4 = nm_device_get_ip4_config (device); + cfg6 = nm_device_get_ip6_config (device); + dhcp4 = nm_device_get_dhcp4_config (device); + dhcp6 = nm_device_get_dhcp6_config (device); + + /* IP4 */ + if (cfg4 && !strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[7].name)) + was_output = print_ip4_config (cfg4, nmc, nmc_fields_dev_show_sections[7].name, section_fld); + + /* DHCP4 */ + if (dhcp4 && !strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[8].name)) + was_output = print_dhcp4_config (dhcp4, nmc, nmc_fields_dev_show_sections[8].name, section_fld); + + /* IP6 */ + if (cfg6 && !strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[9].name)) + was_output = print_ip6_config (cfg6, nmc, nmc_fields_dev_show_sections[9].name, section_fld); + + /* DHCP6 */ + if (dhcp6 && !strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[10].name)) + was_output = print_dhcp6_config (dhcp6, nmc, nmc_fields_dev_show_sections[10].name, section_fld); /* Bond-specific information */ if ((NM_IS_DEVICE_BOND (device))) { - if (!strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[11].name)) { + if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[11].name)) { const GPtrArray *slaves; GString *bond_slaves_str; int idx; @@ -857,54 +1038,61 @@ show_device_info (gpointer data, gpointer user_data) if (bond_slaves_str->len > 0) g_string_truncate (bond_slaves_str, bond_slaves_str->len-1); /* Chop off last space */ - nmc->allowed_fields = nmc_fields_dev_list_bond_prop; - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; - nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_LIST_BOND_PROP_ALL, nmc->allowed_fields, NULL); - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ + tmpl = nmc_fields_dev_show_bond_prop; + tmpl_len = sizeof (nmc_fields_dev_show_bond_prop); + nmc->print_fields.indices = parse_output_fields (section_fld ? section_fld : NMC_FIELDS_DEV_SHOW_BOND_PROP_ALL, + tmpl, FALSE, NULL, NULL); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); - nmc->allowed_fields[0].value = nmc_fields_dev_list_sections[11].name; /* "BOND" */ - nmc->allowed_fields[1].value = bond_slaves_str->str; + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); + set_val_strc (arr, 0, nmc_fields_dev_show_sections[11].name); /* "BOND" */ + set_val_str (arr, 1, bond_slaves_str->str); + g_ptr_array_add (nmc->output_data, arr); - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ + print_data (nmc); /* Print all data */ - g_string_free (bond_slaves_str, TRUE); + g_string_free (bond_slaves_str, FALSE); was_output = TRUE; } } /* VLAN-specific information */ if ((NM_IS_DEVICE_VLAN (device))) { - if (!strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[12].name)) { + if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[12].name)) { char * vlan_id_str = g_strdup_printf ("%u", nm_device_vlan_get_vlan_id (NM_DEVICE_VLAN (device))); - nmc->allowed_fields = nmc_fields_dev_list_vlan_prop; - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; - nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_LIST_VLAN_PROP_ALL, nmc->allowed_fields, NULL); - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ + tmpl = nmc_fields_dev_show_vlan_prop; + tmpl_len = sizeof (nmc_fields_dev_show_vlan_prop); + nmc->print_fields.indices = parse_output_fields (section_fld ? section_fld : NMC_FIELDS_DEV_SHOW_VLAN_PROP_ALL, + tmpl, FALSE, NULL, NULL); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); - nmc->allowed_fields[0].value = nmc_fields_dev_list_sections[12].name; /* "VLAN" */ - nmc->allowed_fields[1].value = vlan_id_str; + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); + set_val_strc (arr, 0, nmc_fields_dev_show_sections[12].name); /* "VLAN" */ + set_val_str (arr, 1, vlan_id_str); + g_ptr_array_add (nmc->output_data, arr); - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ + print_data (nmc); /* Print all data */ - g_free (vlan_id_str); was_output = TRUE; } } /* section CONNECTIONS */ - if (!strcasecmp (nmc_fields_dev_list_sections[section_idx].name, nmc_fields_dev_list_sections[13].name)) { + if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[13].name)) { const GPtrArray *avail_cons; GString *ac_paths_str; char **ac_arr = NULL; int i; - nmc->allowed_fields = nmc_fields_dev_list_connections; - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_FIELD_NAMES; - nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_DEV_LIST_CONNECTIONS_ALL, nmc->allowed_fields, NULL); - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ + tmpl = nmc_fields_dev_show_connections; + tmpl_len = sizeof (nmc_fields_dev_show_connections); + nmc->print_fields.indices = parse_output_fields (section_fld ? section_fld : NMC_FIELDS_DEV_SHOW_CONNECTIONS_ALL, + tmpl, FALSE, NULL, NULL); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); /* available-connections */ avail_cons = nm_device_get_available_connections (device); @@ -930,47 +1118,59 @@ show_device_info (gpointer data, gpointer user_data) if (ac_paths_str->len > 0) g_string_append_c (ac_paths_str, '}'); - set_val_str (nmc->allowed_fields, 0, nmc_fields_dev_list_sections[13].name); /* "CONNECTIONS" */ - set_val_str (nmc->allowed_fields, 1, ac_paths_str->str); - set_val_arr (nmc->allowed_fields, 2, (const char **) ac_arr); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); + set_val_strc (arr, 0, nmc_fields_dev_show_sections[13].name); /* "CONNECTIONS" */ + set_val_str (arr, 1, ac_paths_str->str); + set_val_arr (arr, 2, (ac_arr)); + g_ptr_array_add (nmc->output_data, arr); - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX; - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */ + print_data (nmc); /* Print all data */ - g_string_free (ac_paths_str, TRUE); - g_strfreev (ac_arr); + g_string_free (ac_paths_str, FALSE); was_output = TRUE; } } if (sections_array) g_array_free (sections_array, TRUE); + if (fields_in_section) + g_ptr_array_free (fields_in_section, TRUE); + + return TRUE; } static void -show_device_status (NMDevice *device, NmCli *nmc) +fill_output_device_status (NMDevice *device, NmCli *nmc) { - nmc->allowed_fields[0].value = nm_device_get_iface (device); - nmc->allowed_fields[1].value = device_type_to_string (device); - nmc->allowed_fields[2].value = nmc_device_state_to_string (nm_device_get_state (device)); - nmc->allowed_fields[3].value = nm_object_get_path (NM_OBJECT (device)); - - nmc->print_fields.flags &= ~NMC_PF_FLAG_MAIN_HEADER_ADD & ~NMC_PF_FLAG_MAIN_HEADER_ONLY & ~NMC_PF_FLAG_FIELD_NAMES; /* Clear header flags */ - print_fields (nmc->print_fields, nmc->allowed_fields); + NMActiveConnection *ac; + NmcOutputField *arr = nmc_dup_fields_array (nmc_fields_dev_status, + sizeof (nmc_fields_dev_status), + 0); + + ac = nm_device_get_active_connection (device); + + set_val_strc (arr, 0, nm_device_get_iface (device)); + set_val_strc (arr, 1, nm_device_get_type_description (device)); + set_val_strc (arr, 2, nmc_device_state_to_string (nm_device_get_state (device))); + set_val_strc (arr, 3, nm_object_get_path (NM_OBJECT (device))); + set_val_strc (arr, 4, get_active_connection_id (device)); + set_val_strc (arr, 5, ac ? nm_active_connection_get_uuid (ac) : NULL); + set_val_strc (arr, 6, ac ? nm_object_get_path (NM_OBJECT (ac)) : NULL); + + g_ptr_array_add (nmc->output_data, arr); } static NMCResultCode do_devices_status (NmCli *nmc, int argc, char **argv) { GError *error = NULL; - const GPtrArray *devices; + NMDevice **devices; int i; char *fields_str; char *fields_all = NMC_FIELDS_DEV_STATUS_ALL; char *fields_common = NMC_FIELDS_DEV_STATUS_COMMON; - guint32 mode_flag = (nmc->print_output == NMC_PRINT_PRETTY) ? NMC_PF_FLAG_PRETTY : (nmc->print_output == NMC_PRINT_TERSE) ? NMC_PF_FLAG_TERSE : 0; - guint32 multiline_flag = nmc->multiline_output ? NMC_PF_FLAG_MULTILINE : 0; - guint32 escape_flag = nmc->escape_values ? NMC_PF_FLAG_ESCAPE : 0; + NmcOutputField *tmpl, *arr; + size_t tmpl_len; while (argc > 0) { fprintf (stderr, _("Unknown parameter: %s\n"), *argv); @@ -985,45 +1185,41 @@ do_devices_status (NmCli *nmc, int argc, char **argv) else fields_str = nmc->required_fields; - nmc->allowed_fields = nmc_fields_dev_status; - nmc->print_fields.indices = parse_output_fields (fields_str, nmc->allowed_fields, &error); + tmpl = nmc_fields_dev_status; + tmpl_len = sizeof (nmc_fields_dev_status); + nmc->print_fields.indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &error); if (error) { - if (error->code == 0) - g_string_printf (nmc->return_text, _("Error: 'dev status': %s"), error->message); - else - g_string_printf (nmc->return_text, _("Error: 'dev status': %s; allowed fields: %s"), error->message, NMC_FIELDS_DEV_STATUS_ALL); + g_string_printf (nmc->return_text, _("Error: 'device status': %s"), error->message); g_error_free (error); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } - if (!nmc_is_nm_running (nmc, &error)) { - if (error) { - g_string_printf (nmc->return_text, _("Error: Can't find out if NetworkManager is running: %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - g_error_free (error); - } else { - g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); - nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; - } + nmc->get_client (nmc); + + if (!nm_client_get_manager_running (nmc->client)) { + g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); + nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; goto error; } if (!nmc_versions_match (nmc)) goto error; - /* Print headers */ - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_MAIN_HEADER_ADD | NMC_PF_FLAG_FIELD_NAMES; + /* Add headers */ nmc->print_fields.header_name = _("Status of devices"); - print_fields (nmc->print_fields, nmc->allowed_fields); + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); - nmc->get_client (nmc); - devices = nm_client_get_devices (nmc->client); - for (i = 0; devices && (i < devices->len); i++) { - NMDevice *device = g_ptr_array_index (devices, i); - show_device_status (device, nmc); - } + devices = get_devices_sorted (nmc->client); + for (i = 0; devices[i]; i++) + fill_output_device_status (devices[i], nmc); + + /* Now print all data */ + print_data (nmc); + + g_free (devices); return NMC_RESULT_SUCCESS; @@ -1032,89 +1228,67 @@ error: } static NMCResultCode -do_devices_list (NmCli *nmc, int argc, char **argv) +do_devices_show (NmCli *nmc, int argc, char **argv) { - const GPtrArray *devices; - GError *error = NULL; + NMDevice **devices = NULL; NMDevice *device = NULL; - const char *iface = NULL; - gboolean iface_specified = FALSE; + const char *ifname = NULL; int i; + gboolean ret; - while (argc > 0) { - if (strcmp (*argv, "iface") == 0) { - iface_specified = TRUE; - - if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: '%s' argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } - - iface = *argv; - } else { - fprintf (stderr, _("Unknown parameter: %s\n"), *argv); - } - - argc--; - argv++; + if (argc == 1) + ifname = *argv; + else if (argc > 1) { + g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *(argv+1)); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + goto error; } - if (!nmc_is_nm_running (nmc, &error)) { - if (error) { - g_string_printf (nmc->return_text, _("Error: Can't find out if NetworkManager is running: %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - g_error_free (error); - } else { - g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); - nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; - } + nmc->get_client (nmc); + + if (!nm_client_get_manager_running (nmc->client)) { + g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); + nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; goto error; } if (!nmc_versions_match (nmc)) goto error; - nmc->get_client (nmc); - devices = nm_client_get_devices (nmc->client); + devices = get_devices_sorted (nmc->client); - if (iface_specified) { - for (i = 0; devices && (i < devices->len); i++) { - NMDevice *candidate = g_ptr_array_index (devices, i); + if (ifname) { + /* Interface specified; show details only for the device */ + for (i = 0; devices[i]; i++) { + NMDevice *candidate = devices[i]; const char *dev_iface = nm_device_get_iface (candidate); - if (!g_strcmp0 (dev_iface, iface)) + if (!g_strcmp0 (dev_iface, ifname)) device = candidate; } if (!device) { - g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), iface); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto error; } show_device_info (device, nmc); } else { - if (devices) - g_ptr_array_foreach ((GPtrArray *) devices, show_device_info, nmc); + /* Show details for all devices */ + for (i = 0; devices[i]; i++) { + nmc_empty_output_fields (nmc); + ret = show_device_info (devices[i], nmc); + if (!ret) + break; + if (devices[i + 1]) + printf ("\n"); /* Empty line */ + } } error: + g_free (devices); return nmc->return_value; } -static void -device_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data) -{ - NmCli *nmc = (NmCli *) user_data; - NMDeviceState state; - - state = nm_device_get_state (device); - - if (state == NM_DEVICE_STATE_DISCONNECTED) { - g_string_printf (nmc->return_text, _("Success: Device '%s' successfully disconnected."), nm_device_get_iface (device)); - quit (); - } -} - static gboolean timeout_cb (gpointer user_data) { @@ -1139,6 +1313,165 @@ progress_cb (gpointer user_data) } static void +connected_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data) +{ + NMActiveConnection *active = (NMActiveConnection *) user_data; + NMDeviceState state; + + state = nm_device_get_state (device); + + if (state == NM_DEVICE_STATE_ACTIVATED) { + nmc_terminal_erase_line (); + printf (_("Device '%s' successfully activated with '%s'.\n"), + nm_device_get_iface (device), + nm_active_connection_get_uuid (active)); + quit (); + } +} + +static void +connect_device_cb (NMClient *client, NMActiveConnection *active, GError *error, gpointer user_data) +{ + NmCli *nmc = (NmCli *) user_data; + const GPtrArray *devices; + NMDevice *device; + NMDeviceState state; + + if (error) { + g_string_printf (nmc->return_text, _("Error: Device activation failed: %s"), + error->message ? error->message : _("(unknown)")); + nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; + quit (); + } else { + g_assert (active); + devices = nm_active_connection_get_devices (active); + if (!devices || devices->len == 0) { + g_string_printf (nmc->return_text, _("Error: Device activation failed: device was disconnected")); + nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; + quit (); + return; + } + + device = g_ptr_array_index (devices, 0); + state = nm_device_get_state (device); + + if (nmc->nowait_flag || state == NM_DEVICE_STATE_ACTIVATED) { + /* Don't want to wait or device already activated */ + if (state == NM_DEVICE_STATE_ACTIVATED && nmc->print_output == NMC_PRINT_PRETTY) { + nmc_terminal_erase_line (); + printf (_("Device '%s' has been connected.\n"), nm_device_get_iface (device)); + } + quit (); + } else { + g_signal_connect (device, "notify::state", G_CALLBACK (connected_state_cb), active); + /* Start timer not to loop forever if "notify::state" signal is not issued */ + g_timeout_add_seconds (nmc->timeout, timeout_cb, nmc); + } + } +} + +static NMCResultCode +do_device_connect (NmCli *nmc, int argc, char **argv) +{ + NMDevice **devices; + NMDevice *device = NULL; + const char *ifname = NULL; + char *ifname_ask = NULL; + int i; + + /* Set default timeout for connect operation. */ + if (nmc->timeout == -1) + nmc->timeout = 90; + + if (argc == 0) { + if (nmc->ask) + ifname = ifname_ask = nmc_readline (PROMPT_INTERFACE); + + if (!ifname_ask) { + g_string_printf (nmc->return_text, _("Error: No interface specified.")); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + goto error; + } + } else { + ifname = *argv; + } + + if (!ifname) { + g_string_printf (nmc->return_text, _("Error: No interface specified.")); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + goto error; + } + + if (next_arg (&argc, &argv) == 0) { + g_string_printf (nmc->return_text, _("Error: extra argument not allowed: '%s'."), *argv); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + goto error; + } + + nmc->get_client (nmc); + if (!nm_client_get_manager_running (nmc->client)) { + g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); + nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; + goto error; + } + + if (!nmc_versions_match (nmc)) + goto error; + + devices = get_devices_sorted (nmc->client); + 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; + } + g_free (devices); + + if (!device) { + g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + goto error; + } + + /* + * Use nowait_flag instead of should_wait, because exiting has to be postponed + * till connect_device_cb() is called, giving NM time to check our permissions. + */ + nmc->nowait_flag = (nmc->timeout == 0); + nmc->should_wait = TRUE; + nm_client_activate_connection (nmc->client, + NULL, /* let NM find a connection automatically */ + device, + NULL, + connect_device_cb, + nmc); + + /* Start progress indication */ + if (nmc->print_output == NMC_PRINT_PRETTY) + progress_id = g_timeout_add (120, progress_cb, device); + +error: + g_free (ifname_ask); + + return nmc->return_value; +} + +static void +disconnect_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data) +{ + NmCli *nmc = (NmCli *) user_data; + NMDeviceState state; + + state = nm_device_get_state (device); + + if (state == NM_DEVICE_STATE_DISCONNECTED) { + g_string_printf (nmc->return_text, _("Success: Device '%s' successfully disconnected."), nm_device_get_iface (device)); + quit (); + } +} + +static void disconnect_device_cb (NMDevice *device, GError *error, gpointer user_data) { NmCli *nmc = (NmCli *) user_data; @@ -1156,13 +1489,14 @@ disconnect_device_cb (NMDevice *device, GError *error, gpointer user_data) if (nmc->nowait_flag || state == NM_DEVICE_STATE_DISCONNECTED) { /* Don't want to wait or device already disconnected */ - if (state == NM_DEVICE_STATE_DISCONNECTED && nmc->print_output == NMC_PRINT_PRETTY) { - nmc_terminal_erase_line (); + if (state == NM_DEVICE_STATE_DISCONNECTED) { + if (nmc->print_output == NMC_PRINT_PRETTY) + nmc_terminal_erase_line (); printf (_("Device '%s' has been disconnected.\n"), nm_device_get_iface (device)); } quit (); } else { - g_signal_connect (device, "notify::state", G_CALLBACK (device_state_cb), nmc); + g_signal_connect (device, "notify::state", G_CALLBACK (disconnect_state_cb), nmc); /* Start timer not to loop forever if "notify::state" signal is not issued */ g_timeout_add_seconds (nmc->timeout, timeout_cb, nmc); } @@ -1173,93 +1507,72 @@ disconnect_device_cb (NMDevice *device, GError *error, gpointer user_data) static NMCResultCode do_device_disconnect (NmCli *nmc, int argc, char **argv) { - const GPtrArray *devices; - GError *error = NULL; + NMDevice **devices; NMDevice *device = NULL; - const char *iface = NULL; - gboolean iface_specified = FALSE; - gboolean wait = TRUE; + const char *ifname = NULL; + char *ifname_ask = NULL; int i; - /* Set default timeout for disconnect operation */ - nmc->timeout = 10; + /* Set default timeout for disconnect operation. */ + if (nmc->timeout == -1) + nmc->timeout = 10; - while (argc > 0) { - if (strcmp (*argv, "iface") == 0) { - iface_specified = TRUE; - - if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } - - iface = *argv; - } else if (strcmp (*argv, "--nowait") == 0) { - wait = FALSE; - } else if (strcmp (*argv, "--timeout") == 0) { - if (next_arg (&argc, &argv) != 0) { - g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } - - errno = 0; - nmc->timeout = strtol (*argv, NULL, 10); - if (errno || nmc->timeout < 0) { - g_string_printf (nmc->return_text, _("Error: timeout value '%s' is not valid."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } + if (argc == 0) { + if (nmc->ask) + ifname = ifname_ask = nmc_readline (PROMPT_INTERFACE); - } else { - fprintf (stderr, _("Unknown parameter: %s\n"), *argv); + if (!ifname_ask) { + g_string_printf (nmc->return_text, _("Error: No interface specified.")); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + goto error; } + } else { + ifname = *argv; + } - argc--; - argv++; + if (!ifname) { + g_string_printf (nmc->return_text, _("Error: No interface specified.")); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + goto error; } - if (!iface_specified) { - g_string_printf (nmc->return_text, _("Error: iface has to be specified.")); + if (next_arg (&argc, &argv) == 0) { + g_string_printf (nmc->return_text, _("Error: extra argument not allowed: '%s'."), *argv); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } - if (!nmc_is_nm_running (nmc, &error)) { - if (error) { - g_string_printf (nmc->return_text, _("Error: Can't find out if NetworkManager is running: %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - g_error_free (error); - } else { - g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); - nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; - } + nmc->get_client (nmc); + if (!nm_client_get_manager_running (nmc->client)) { + g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); + nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; goto error; } if (!nmc_versions_match (nmc)) goto error; - nmc->get_client (nmc); - devices = nm_client_get_devices (nmc->client); - for (i = 0; devices && (i < devices->len); i++) { - NMDevice *candidate = g_ptr_array_index (devices, i); + devices = get_devices_sorted (nmc->client); + for (i = 0; devices[i]; i++) { + NMDevice *candidate = devices[i]; const char *dev_iface = nm_device_get_iface (candidate); - if (!g_strcmp0 (dev_iface, iface)) + if (!g_strcmp0 (dev_iface, ifname)) device = candidate; } + g_free (devices); if (!device) { - g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), iface); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto error; } - /* Use nowait_flag instead of should_wait because exitting has to be postponed till disconnect_device_cb() - * is called, giving NM time to check our permissions */ - nmc->nowait_flag = !wait; + /* + * Use nowait_flag instead of should_wait, because exiting has to be postponed + * till disconnect_device_cb() is called, giving NM time to check our permissions. + */ + nmc->nowait_flag = (nmc->timeout == 0); nmc->should_wait = TRUE; nm_device_disconnect (device, disconnect_device_cb, nmc); @@ -1278,20 +1591,29 @@ show_acces_point_info (NMDevice *device, NmCli *nmc) const char *active_bssid = NULL; const GPtrArray *aps; APInfo *info; + NmcOutputField *arr; if (nm_device_get_state (device) == NM_DEVICE_STATE_ACTIVATED) { active_ap = nm_device_wifi_get_active_access_point (NM_DEVICE_WIFI (device)); active_bssid = active_ap ? nm_access_point_get_bssid (active_ap) : NULL; } + arr = nmc_dup_fields_array (nmc_fields_dev_wifi_list, sizeof (nmc_fields_dev_wifi_list), + NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); + info = g_malloc0 (sizeof (APInfo)); info->nmc = nmc; info->index = 1; + info->output_flags = 0; info->active_bssid = active_bssid; info->device = nm_device_get_iface (device); aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device)); if (aps && aps->len) - g_ptr_array_foreach ((GPtrArray *) aps, detail_access_point, (gpointer) info); + g_ptr_array_foreach ((GPtrArray *) aps, fill_output_access_point, (gpointer) info); + + print_data (nmc); /* Print all data */ + nmc_empty_output_fields (nmc); g_free (info); } @@ -1301,27 +1623,27 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) GError *error = NULL; NMDevice *device = NULL; NMAccessPoint *ap = NULL; - const char *iface = NULL; + const char *ifname = NULL; const char *bssid_user = NULL; - const GPtrArray *devices; + NMDevice **devices = NULL; const GPtrArray *aps; APInfo *info; int i, j; char *fields_str; char *fields_all = NMC_FIELDS_DEV_WIFI_LIST_ALL; char *fields_common = NMC_FIELDS_DEV_WIFI_LIST_COMMON; - guint32 mode_flag = (nmc->print_output == NMC_PRINT_PRETTY) ? NMC_PF_FLAG_PRETTY : (nmc->print_output == NMC_PRINT_TERSE) ? NMC_PF_FLAG_TERSE : 0; - guint32 multiline_flag = nmc->multiline_output ? NMC_PF_FLAG_MULTILINE : 0; - guint32 escape_flag = nmc->escape_values ? NMC_PF_FLAG_ESCAPE : 0; + NmcOutputField *tmpl, *arr; + size_t tmpl_len; + const char *base_hdr = _("Wi-Fi scan list"); while (argc > 0) { - if (strcmp (*argv, "iface") == 0) { + if (strcmp (*argv, "ifname") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } - iface = *argv; + ifname = *argv; } else if (strcmp (*argv, "bssid") == 0 || strcmp (*argv, "hwaddr") == 0) { /* hwaddr is deprecated and will be removed later */ if (next_arg (&argc, &argv) != 0) { @@ -1338,7 +1660,6 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) argv++; } - if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) fields_str = fields_common; else if (!nmc->required_fields || strcasecmp (nmc->required_fields, "all") == 0) @@ -1346,58 +1667,49 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) else fields_str = nmc->required_fields; - nmc->allowed_fields = nmc_fields_dev_wifi_list; - nmc->print_fields.indices = parse_output_fields (fields_str, nmc->allowed_fields, &error); + tmpl = nmc_fields_dev_wifi_list; + tmpl_len = sizeof (nmc_fields_dev_wifi_list); + nmc->print_fields.indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &error); if (error) { - if (error->code == 0) - g_string_printf (nmc->return_text, _("Error: 'dev wifi': %s"), error->message); - else - g_string_printf (nmc->return_text, _("Error: 'dev wifi': %s; allowed fields: %s"), error->message, NMC_FIELDS_DEV_WIFI_LIST_ALL); + g_string_printf (nmc->return_text, _("Error: 'device wifi': %s"), error->message); g_error_free (error); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } - if (!nmc_is_nm_running (nmc, &error)) { - if (error) { - g_string_printf (nmc->return_text, _("Error: Can't find out if NetworkManager is running: %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - g_error_free (error); - } else { - g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); - nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; - } + nmc->get_client (nmc); + + if (!nm_client_get_manager_running (nmc->client)) { + g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); + nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; goto error; } if (!nmc_versions_match (nmc)) goto error; - /* Print headers */ - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_MAIN_HEADER_ADD | NMC_PF_FLAG_FIELD_NAMES; - nmc->print_fields.header_name = _("WiFi scan list"); - - nmc->get_client (nmc); - devices = nm_client_get_devices (nmc->client); - if (iface) { + devices = get_devices_sorted (nmc->client); + if (ifname) { /* Device specified - list only APs of this interface */ - for (i = 0; devices && (i < devices->len); i++) { - NMDevice *candidate = g_ptr_array_index (devices, i); + for (i = 0; devices[i]; i++) { + NMDevice *candidate = devices[i]; const char *dev_iface = nm_device_get_iface (candidate); - if (!g_strcmp0 (dev_iface, iface)) { + if (!g_strcmp0 (dev_iface, ifname)) { device = candidate; break; } } - if (!device) { - g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), iface); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto error; } + /* Main header name */ + nmc->print_fields.header_name = (char *) construct_header_name (base_hdr, ifname); + if (NM_IS_DEVICE_WIFI (device)) { if (bssid_user) { /* Specific AP requested - list only that */ @@ -1413,38 +1725,50 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) g_free (bssid_up); } if (!ap) { - g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), bssid_user); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), + bssid_user); + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto error; } + /* Add headers (field names) */ + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); + info = g_malloc0 (sizeof (APInfo)); info->nmc = nmc; info->index = 1; + info->output_flags = 0; info->active_bssid = NULL; info->device = nm_device_get_iface (device); - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ - detail_access_point (ap, info); + + fill_output_access_point (ap, info); + + print_data (nmc); /* Print all data */ g_free (info); } else { - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ show_acces_point_info (device, nmc); } } else { - g_string_printf (nmc->return_text, _("Error: Device '%s' is not a WiFi device."), iface); + g_string_printf (nmc->return_text, _("Error: Device '%s' is not a Wi-Fi device."), ifname); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; goto error; } } else { /* List APs for all devices */ - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ if (bssid_user) { /* Specific AP requested - list only that */ - for (i = 0; devices && (i < devices->len); i++) { - NMDevice *dev = g_ptr_array_index (devices, i); + for (i = 0; devices[i]; i++) { + NMDevice *dev = devices[i]; if (!NM_IS_DEVICE_WIFI (dev)) continue; + /* Main header name */ + nmc->print_fields.header_name = (char *) construct_header_name (base_hdr, nm_device_get_iface (dev)); + + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); + aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (dev)); for (j = 0; aps && (j < aps->len); j++) { char *bssid_up; @@ -1458,22 +1782,30 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) info = g_malloc0 (sizeof (APInfo)); info->nmc = nmc; info->index = 1; + info->output_flags = 0; info->active_bssid = NULL; info->device = nm_device_get_iface (dev); - detail_access_point (ap, info); + fill_output_access_point (ap, info); g_free (info); } g_free (bssid_up); } + print_data (nmc); /* Print all data */ + nmc_empty_output_fields (nmc); } if (!ap) { - g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), bssid_user); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), + bssid_user); + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto error; } } else { - for (i = 0; devices && (i < devices->len); i++) { - NMDevice *dev = g_ptr_array_index (devices, i); + for (i = 0; devices[i]; i++) { + NMDevice *dev = devices[i]; + + /* Main header name */ + nmc->print_fields.header_name = (char *) construct_header_name (base_hdr, + nm_device_get_iface (dev)); if (NM_IS_DEVICE_WIFI (dev)) show_acces_point_info (dev, nmc); } @@ -1481,6 +1813,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) } error: + g_free (devices); return nmc->return_value; } @@ -1494,13 +1827,12 @@ monitor_device_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data state = nm_device_get_state_reason (device, &reason); if (state == NM_DEVICE_STATE_ACTIVATED) { - if (nmc->print_output == NMC_PRINT_PRETTY) { - NMActiveConnection *active = nm_device_get_active_connection (device); + NMActiveConnection *active = nm_device_get_active_connection (device); + if (nmc->print_output == NMC_PRINT_PRETTY) nmc_terminal_erase_line (); - printf (_("Connection with UUID '%s' created and activated on device '%s'\n"), - nm_active_connection_get_uuid (active), nm_device_get_iface (device)); - } + printf (_("Connection with UUID '%s' created and activated on device '%s'\n"), + nm_active_connection_get_uuid (active), nm_device_get_iface (device)); quit (); } else if (state == NM_DEVICE_STATE_FAILED) { g_string_printf (nmc->return_text, _("Error: Connection activation failed: (%d) %s."), @@ -1543,7 +1875,9 @@ add_and_activate_cb (NMClient *client, if (nmc->nowait_flag || state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { /* User doesn't want to wait or already activated */ - if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED && nmc->print_output == NMC_PRINT_PRETTY) { + if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { + if (nmc->print_output == NMC_PRINT_PRETTY) + nmc_terminal_erase_line (); printf (_("Connection with UUID '%s' created and activated on device '%s'\n"), nm_active_connection_get_uuid (active), nm_device_get_iface (device)); } @@ -1617,16 +1951,20 @@ find_ap_on_device (NMDevice *device, GByteArray *bssid, const char *ssid) if (ssid) { /* Parameter is SSID */ - const GByteArray *candidate_ssid = nm_access_point_get_ssid (candidate_ap); - char *ssid_tmp = nm_utils_ssid_to_utf8 (candidate_ssid); + const GByteArray *candidate_ssid; - /* Compare SSIDs */ - if (strcmp (ssid, ssid_tmp) == 0) { - ap = candidate_ap; + candidate_ssid = nm_access_point_get_ssid (candidate_ap); + if (candidate_ssid) { + char *ssid_tmp = nm_utils_ssid_to_utf8 (candidate_ssid); + + /* Compare SSIDs */ + if (strcmp (ssid, ssid_tmp) == 0) { + ap = candidate_ap; + g_free (ssid_tmp); + break; + } 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); @@ -1650,27 +1988,31 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) { NMDevice *device = NULL; NMAccessPoint *ap = NULL; + NM80211ApFlags ap_flags; + NM80211ApSecurityFlags ap_wpa_flags; + NM80211ApSecurityFlags ap_rsn_flags; NMConnection *connection = NULL; NMSettingConnection *s_con; NMSettingWireless *s_wifi; NMSettingWirelessSecurity *s_wsec; AddAndActivateInfo *info; const char *param_user = NULL; - const char *iface = NULL; + const char *ifname = NULL; const char *bssid = NULL; const char *password = NULL; const char *con_name = NULL; gboolean private = FALSE; - gboolean wait = TRUE; gboolean wep_passphrase = FALSE; GByteArray *bssid1_arr = NULL; GByteArray *bssid2_arr = NULL; const GPtrArray *devices; int devices_idx; - GError *error = NULL; + char *ssid_ask = NULL; + char *passwd_ask = NULL; - /* Default timeout for waiting for operation completion */ - nmc->timeout = 90; + /* Set default timeout waiting for operation completion. */ + if (nmc->timeout == -1) + nmc->timeout = 90; /* Get the first compulsory argument (SSID or BSSID) */ if (argc > 0) { @@ -1680,20 +2022,27 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) argc--; argv++; } else { - g_string_printf (nmc->return_text, _("Error: SSID or BSSID are missing.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + if (nmc->ask) { + ssid_ask = nmc_readline (_("SSID or BSSID: ")); + param_user = ssid_ask ? ssid_ask : ""; + bssid1_arr = nm_utils_hwaddr_atoba (param_user, ARPHRD_ETHER); + } + if (!ssid_ask) { + g_string_printf (nmc->return_text, _("Error: SSID or BSSID are missing.")); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + goto error; + } } /* Get the rest of the parameters */ while (argc > 0) { - if (strcmp (*argv, "iface") == 0) { + if (strcmp (*argv, "ifname") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } - iface = *argv; + ifname = *argv; } else if (strcmp (*argv, "bssid") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); @@ -1739,22 +2088,17 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) goto error; } con_name = *argv; - } else if (strcmp (*argv, "--private") == 0) { - private = TRUE; - } else if (strcmp (*argv, "--nowait") == 0) { - wait = FALSE; - } else if (strcmp (*argv, "--timeout") == 0) { + } else if (strcmp (*argv, "private") == 0) { + GError *err_tmp = NULL; if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } - - errno = 0; - nmc->timeout = strtol (*argv, NULL, 10); - if (errno || nmc->timeout < 0) { - g_string_printf (nmc->return_text, _("Error: timeout value '%s' is not valid."), *argv); + if (!nmc_string_to_bool (*argv, &private, &err_tmp)) { + g_string_printf (nmc->return_text, _("Error: %s: %s."), *(argv-1), err_tmp->message); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + g_clear_error (&err_tmp); goto error; } } else { @@ -1778,31 +2122,26 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) goto error; } - if (!nmc_is_nm_running (nmc, &error)) { - if (error) { - g_string_printf (nmc->return_text, _("Error: Can't find out if NetworkManager is running: %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - g_error_free (error); - } else { - g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); - nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; - } + nmc->get_client (nmc); + + if (!nm_client_get_manager_running (nmc->client)) { + g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); + nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; goto error; } if (!nmc_versions_match (nmc)) goto error; - nmc->get_client (nmc); devices = nm_client_get_devices (nmc->client); /* Find a device to activate the connection on */ devices_idx = 0; - device = find_wifi_device_by_iface (devices, iface, &devices_idx); + device = find_wifi_device_by_iface (devices, ifname, &devices_idx); if (!device) { - if (iface) - g_string_printf (nmc->return_text, _("Error: Device '%s' is not a Wi-Fi device."), iface); + if (ifname) + g_string_printf (nmc->return_text, _("Error: Device '%s' is not a Wi-Fi device."), ifname); else g_string_printf (nmc->return_text, _("Error: No Wi-Fi device found.")); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; @@ -1811,8 +2150,8 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) /* Find an AP to connect to */ ap = find_ap_on_device (device, bssid1_arr, bssid1_arr ? NULL : param_user); - if (!ap && !iface) { - /* AP not found. iface was not specified, so try finding the AP on another device. */ + if (!ap && !ifname) { + /* AP not found. ifname was not specified, so try finding the AP on another device. */ while ((device = find_wifi_device_by_iface (devices, NULL, &devices_idx)) != NULL) { ap = find_ap_on_device (device, bssid1_arr, bssid1_arr ? NULL : param_user); if (ap) @@ -1825,7 +2164,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) g_string_printf (nmc->return_text, _("Error: No network with SSID '%s' found."), param_user); else g_string_printf (nmc->return_text, _("Error: No access point with BSSID '%s' found."), param_user); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto error; } @@ -1853,42 +2192,50 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) /* 'bssid' parameter is used to restrict the conenction only to the BSSID */ g_object_set (s_wifi, NM_SETTING_WIRELESS_BSSID, bssid2_arr, NULL); } - if (password) { - NM80211ApFlags flags = nm_access_point_get_flags (ap); - NM80211ApSecurityFlags wpa_flags = nm_access_point_get_wpa_flags (ap); - NM80211ApSecurityFlags rsn_flags = nm_access_point_get_rsn_flags (ap); - s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); - nm_connection_add_setting (connection, NM_SETTING (s_wsec)); + /* handle password */ + ap_flags = nm_access_point_get_flags (ap); + ap_wpa_flags = nm_access_point_get_wpa_flags (ap); + ap_rsn_flags = nm_access_point_get_rsn_flags (ap); + + /* Set password for WEP or WPA-PSK. */ + if (ap_flags & NM_802_11_AP_FLAGS_PRIVACY) { + /* Ask for missing password when one is expected and '--ask' is used */ + if (!password && nmc->ask) + password = passwd_ask = nmc_readline (_("Password: ")); + + if (password) { + if (!connection) + connection = nm_connection_new (); + s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); + nm_connection_add_setting (connection, NM_SETTING (s_wsec)); - /* Set password for WEP or WPA-PSK. */ - if (flags & NM_802_11_AP_FLAGS_PRIVACY) { - if (wpa_flags == NM_802_11_AP_SEC_NONE && rsn_flags == NM_802_11_AP_SEC_NONE) { + if (ap_wpa_flags == NM_802_11_AP_SEC_NONE && ap_rsn_flags == NM_802_11_AP_SEC_NONE) { /* WEP */ nm_setting_wireless_security_set_wep_key (s_wsec, 0, password); g_object_set (G_OBJECT (s_wsec), NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, wep_passphrase ? NM_WEP_KEY_TYPE_PASSPHRASE: NM_WEP_KEY_TYPE_KEY, NULL); - } else if ( !(wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) - && !(rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) { + } else if ( !(ap_wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) + && !(ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) { /* WPA PSK */ g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_PSK, password, NULL); } } - // FIXME: WPA-Enterprise is not supported yet. - // We are not able to determine and fill all the parameters for - // 802.1X authentication automatically without user providing - // the data. Adding nmcli options for the 8021x setting would - // clutter the command. However, that could be solved later by - // implementing add/edit connections support for nmcli. } + // FIXME: WPA-Enterprise is not supported yet. + // We are not able to determine and fill all the parameters for + // 802.1X authentication automatically without user providing + // the data. Adding nmcli options for the 8021x setting would + // clutter the command. However, that could be solved later by + // implementing add/edit connections support for nmcli. /* nowait_flag indicates user input. should_wait says whether quit in start(). * We have to delay exit after add_and_activate_cb() is called, even if * the user doesn't want to wait, in order to give NM time to check our * permissions. */ - nmc->nowait_flag = !wait; + nmc->nowait_flag = (nmc->timeout == 0); nmc->should_wait = TRUE; info = g_malloc0 (sizeof (AddAndActivateInfo)); @@ -1907,7 +2254,67 @@ error: g_byte_array_free (bssid1_arr, TRUE); if (bssid2_arr) g_byte_array_free (bssid2_arr, TRUE); + g_free (ssid_ask); + g_free (passwd_ask); + + return nmc->return_value; +} + +static void +request_rescan_cb (NMDeviceWifi *device, GError *error, gpointer user_data) +{ + NmCli *nmc = (NmCli *) user_data; + + if (error) { + g_string_printf (nmc->return_text, _("Error: %s."), + error->message ? error->message : _("unknown")); + nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + } + quit (); +} + +static NMCResultCode +do_device_wifi_rescan (NmCli *nmc, int argc, char **argv) +{ + NMDevice *device; + const char *ifname = NULL; + const GPtrArray *devices; + int devices_idx; + + nmc->should_wait = TRUE; + + /* Get the parameters */ + if (argc > 0) { + if (strcmp (*argv, "ifname") == 0) { + if (next_arg (&argc, &argv) != 0) { + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + goto error; + } + } + ifname = *argv; + } + + /* Find Wi-Fi device to scan on. When no ifname is provided, the first Wi-Fi is used. */ + nmc->get_client (nmc); + devices = nm_client_get_devices (nmc->client); + devices_idx = 0; + device = find_wifi_device_by_iface (devices, ifname, &devices_idx); + + if (!device) { + if (ifname) + g_string_printf (nmc->return_text, _("Error: Device '%s' is not a Wi-Fi device."), ifname); + else + g_string_printf (nmc->return_text, _("Error: No Wi-Fi device found.")); + nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + goto error; + } + nm_device_wifi_request_scan_simple (NM_DEVICE_WIFI (device), request_rescan_cb, nmc); + + return nmc->return_value; +error: + nmc->should_wait = FALSE; return nmc->return_value; } @@ -1921,8 +2328,10 @@ do_device_wifi (NmCli *nmc, int argc, char **argv) nmc->return_value = do_device_wifi_list (nmc, argc-1, argv+1); } else if (matches (*argv, "connect") == 0) { nmc->return_value = do_device_wifi_connect_network (nmc, argc-1, argv+1); + } else if (matches (*argv, "rescan") == 0) { + nmc->return_value = do_device_wifi_rescan (nmc, argc-1, argv+1); } else { - g_string_printf (nmc->return_text, _("Error: 'dev wifi' command '%s' is not valid."), *argv); + g_string_printf (nmc->return_text, _("Error: 'device wifi' command '%s' is not valid."), *argv); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; } } @@ -1936,13 +2345,21 @@ show_nsp_info (NMDevice *device, NmCli *nmc) { const GPtrArray *nsps; int i, idx = 1; + NmcOutputField *arr; + + /* Add headers (field names) */ + arr = nmc_dup_fields_array (nmc_fields_dev_wimax_list, sizeof (nmc_fields_dev_wimax_list), + NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); nsps = nm_device_wimax_get_nsps (NM_DEVICE_WIMAX (device)); for (i = 0; nsps && i < nsps->len; i++) { NMWimaxNsp *nsp = g_ptr_array_index (nsps, i); - detail_wimax_nsp (nsp, nmc, device, idx++); + fill_output_wimax_nsp (nsp, nmc, device, idx++, 0); } + print_data (nmc); /* Print all data */ + nmc_empty_output_fields (nmc); } static NMCResultCode @@ -1951,7 +2368,7 @@ do_device_wimax_list (NmCli *nmc, int argc, char **argv) GError *error = NULL; NMDevice *device = NULL; NMWimaxNsp *nsp = NULL; - const char *iface = NULL; + const char *ifname = NULL; const char *nsp_user = NULL; const GPtrArray *devices; const GPtrArray *nsps; @@ -1959,18 +2376,18 @@ do_device_wimax_list (NmCli *nmc, int argc, char **argv) char *fields_str; char *fields_all = NMC_FIELDS_DEV_WIMAX_LIST_ALL; char *fields_common = NMC_FIELDS_DEV_WIMAX_LIST_COMMON; - guint32 mode_flag = (nmc->print_output == NMC_PRINT_PRETTY) ? NMC_PF_FLAG_PRETTY : (nmc->print_output == NMC_PRINT_TERSE) ? NMC_PF_FLAG_TERSE : 0; - guint32 multiline_flag = nmc->multiline_output ? NMC_PF_FLAG_MULTILINE : 0; - guint32 escape_flag = nmc->escape_values ? NMC_PF_FLAG_ESCAPE : 0; + NmcOutputField *tmpl, *arr; + size_t tmpl_len; + const char *base_hdr = _("WiMAX NSP list"); while (argc > 0) { - if (strcmp (*argv, "iface") == 0) { + if (strcmp (*argv, "ifname") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } - iface = *argv; + ifname = *argv; } else if (strcmp (*argv, "nsp") == 0) { if (next_arg (&argc, &argv) != 0) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); @@ -1993,58 +2410,50 @@ do_device_wimax_list (NmCli *nmc, int argc, char **argv) else fields_str = nmc->required_fields; - nmc->allowed_fields = nmc_fields_dev_wimax_list; - nmc->print_fields.indices = parse_output_fields (fields_str, nmc->allowed_fields, &error); + tmpl = nmc_fields_dev_wimax_list; + tmpl_len = sizeof (nmc_fields_dev_wimax_list); + nmc->print_fields.indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &error); if (error) { - if (error->code == 0) - g_string_printf (nmc->return_text, _("Error: 'dev wimax': %s"), error->message); - else - g_string_printf (nmc->return_text, _("Error: 'dev wimax': %s; allowed fields: %s"), error->message, NMC_FIELDS_DEV_WIMAX_LIST_ALL); + g_string_printf (nmc->return_text, _("Error: 'device wimax': %s"), error->message); g_error_free (error); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } - if (!nmc_is_nm_running (nmc, &error)) { - if (error) { - g_string_printf (nmc->return_text, _("Error: Can't find out if NetworkManager is running: %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - g_error_free (error); - } else { - g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); - nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; - } + nmc->get_client (nmc); + + if (!nm_client_get_manager_running (nmc->client)) { + g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); + nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; goto error; } if (!nmc_versions_match (nmc)) goto error; - /* Print headers */ - nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_MAIN_HEADER_ADD | NMC_PF_FLAG_FIELD_NAMES; - nmc->print_fields.header_name = _("WiMAX NSP list"); - - nmc->get_client (nmc); devices = nm_client_get_devices (nmc->client); - if (iface) { + if (ifname) { /* Device specified - list only NSPs of this interface */ for (i = 0; devices && (i < devices->len); i++) { NMDevice *candidate = g_ptr_array_index (devices, i); const char *dev_iface = nm_device_get_iface (candidate); - if (!g_strcmp0 (dev_iface, iface)) { + if (!g_strcmp0 (dev_iface, ifname)) { device = candidate; break; } } if (!device) { - g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), iface); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto error; } + /* Main header name */ + nmc->print_fields.header_name = (char *) construct_header_name (base_hdr, ifname); + if (NM_IS_DEVICE_WIMAX (device)) { if (nsp_user) { /* Specific NSP requested - list only that */ @@ -2061,23 +2470,24 @@ do_device_wimax_list (NmCli *nmc, int argc, char **argv) } if (!nsp) { g_string_printf (nmc->return_text, _("Error: NSP with name '%s' not found."), nsp_user); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto error; } - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ - detail_wimax_nsp (nsp, nmc, device, 1); + /* Add headers (field names) */ + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); + fill_output_wimax_nsp (nsp, nmc, device, 1, 0); + print_data (nmc); /* Print all data */ } else { - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ show_nsp_info (device, nmc); } } else { - g_string_printf (nmc->return_text, _("Error: Device '%s' is not a WiMAX device."), iface); + g_string_printf (nmc->return_text, _("Error: Device '%s' is not a WiMAX device."), ifname); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; goto error; } } else { /* List NSPs for all devices */ - print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */ if (nsp_user) { /* Specific NSP requested - list only that */ for (i = 0; devices && (i < devices->len); i++) { @@ -2087,6 +2497,12 @@ do_device_wimax_list (NmCli *nmc, int argc, char **argv) if (!NM_IS_DEVICE_WIMAX (dev)) continue; + /* Main header name */ + nmc->print_fields.header_name = (char *) construct_header_name (base_hdr, nm_device_get_iface (dev)); + + arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (nmc->output_data, arr); + nsps = nm_device_wimax_get_nsps (NM_DEVICE_WIMAX (dev)); for (j = 0, nsp = NULL; nsps && (j < nsps->len); j++) { NMWimaxNsp *candidate_nsp = g_ptr_array_index (nsps, j); @@ -2096,19 +2512,26 @@ do_device_wimax_list (NmCli *nmc, int argc, char **argv) nsp_up = g_ascii_strup (nsp_user, -1); if (!strcmp (nsp_up, candidate_name)) { nsp = candidate_nsp; - detail_wimax_nsp (nsp, nmc, dev, idx); + fill_output_wimax_nsp (nsp, nmc, dev, idx, 0); } g_free (nsp_up); } + print_data (nmc); /* Print all data */ + nmc_empty_output_fields (nmc); } if (!nsp) { g_string_printf (nmc->return_text, _("Error: Access point with nsp '%s' not found."), nsp_user); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto error; } } else { for (i = 0; devices && (i < devices->len); i++) { NMDevice *dev = g_ptr_array_index (devices, i); + + /* Main header name */ + nmc->print_fields.header_name = (char *) construct_header_name (base_hdr, + nm_device_get_iface (dev)); + if (NM_IS_DEVICE_WIMAX (dev)) show_nsp_info (dev, nmc); } @@ -2129,7 +2552,7 @@ do_device_wimax (NmCli *nmc, int argc, char **argv) nmc->return_value = do_device_wimax_list (nmc, argc-1, argv+1); } else { - g_string_printf (nmc->return_text, _("Error: 'dev wimax' command '%s' is not valid."), *argv); + g_string_printf (nmc->return_text, _("Error: 'device wimax' command '%s' is not valid."), *argv); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; } } @@ -2138,11 +2561,82 @@ do_device_wimax (NmCli *nmc, int argc, char **argv) } #endif +static gboolean +is_single_word (const char* line) +{ + size_t n1, n2, n3; + + n1 = strspn (line, " \t"); + n2 = strcspn (line+n1, " \t\0") + n1; + n3 = strspn (line+n2, " \t"); + + if (n3 == 0) + return TRUE; + else + return FALSE; +} + +/* Global variable defined in nmcli.c */ +extern NmCli nm_cli; + +static char * +gen_func_ifnames (const char *text, int state) +{ + int i, j = 0; + const GPtrArray *devices; + const char **ifnames; + char *ret; + + nm_cli.get_client (&nm_cli); + devices = nm_client_get_devices (nm_cli.client); + if (!devices || devices->len < 1) + return NULL; + + ifnames = g_new (const char *, devices->len + 1); + for (i = 0; i < devices->len; i++) { + NMDevice *dev = g_ptr_array_index (devices, i); + const char *ifname = nm_device_get_iface (dev); + ifnames[j++] = ifname; + } + ifnames[j] = NULL; + + ret = nmc_rl_gen_func_basic (text, state, ifnames); + + g_free (ifnames); + return ret; +} + +static char ** +nmcli_device_tab_completion (const char *text, int start, int end) +{ + char **match_array = NULL; + rl_compentry_func_t *generator_func = NULL; + + /* Disable readline's default filename completion */ + rl_attempted_completion_over = 1; + + /* Disable appending space after completion */ + rl_completion_append_character = '\0'; + + if (!is_single_word (rl_line_buffer)) + return NULL; + + if (g_strcmp0 (rl_prompt, PROMPT_INTERFACE) == 0) + generator_func = gen_func_ifnames; + + if (generator_func) + match_array = rl_completion_matches (text, generator_func); + + return match_array; +} + NMCResultCode do_devices (NmCli *nmc, int argc, char **argv) { GError *error = NULL; + rl_attempted_completion_function = (rl_completion_func_t *) nmcli_device_tab_completion; + if (argc == 0) { if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) goto opt_error; @@ -2150,36 +2644,62 @@ do_devices (NmCli *nmc, int argc, char **argv) } if (argc > 0) { - if (matches (*argv, "status") == 0) { + if (nmc_arg_is_help (*argv)) { + usage (); + goto usage_exit; + } + else if (matches (*argv, "status") == 0) { + if (nmc_arg_is_help (*(argv+1))) { + usage_device_status (); + goto usage_exit; + } if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) goto opt_error; nmc->return_value = do_devices_status (nmc, argc-1, argv+1); } - else if (matches (*argv, "list") == 0) { + else if (matches (*argv, "show") == 0) { + if (nmc_arg_is_help (*(argv+1))) { + usage_device_show (); + goto usage_exit; + } if (!nmc->mode_specified) - nmc->multiline_output = TRUE; /* multiline mode is default for 'dev list' */ - nmc->return_value = do_devices_list (nmc, argc-1, argv+1); + nmc->multiline_output = TRUE; /* multiline mode is default for 'device show' */ + nmc->return_value = do_devices_show (nmc, argc-1, argv+1); + } + else if (matches (*argv, "connect") == 0) { + if (nmc_arg_is_help (*(argv+1))) { + usage_device_connect (); + goto usage_exit; + } + nmc->return_value = do_device_connect (nmc, argc-1, argv+1); } else if (matches (*argv, "disconnect") == 0) { + if (nmc_arg_is_help (*(argv+1))) { + usage_device_disconnect (); + goto usage_exit; + } nmc->return_value = do_device_disconnect (nmc, argc-1, argv+1); } else if (matches (*argv, "wifi") == 0) { + if (nmc_arg_is_help (*(argv+1))) { + usage_device_wifi (); + goto usage_exit; + } if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) goto opt_error; nmc->return_value = do_device_wifi (nmc, argc-1, argv+1); } #if WITH_WIMAX else if (matches (*argv, "wimax") == 0) { + if (nmc_arg_is_help (*(argv+1))) { + usage_device_wimax (); + goto usage_exit; + } if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) goto opt_error; nmc->return_value = do_device_wimax (nmc, argc-1, argv+1); } #endif - else if ( matches (*argv, "help") == 0 - || (g_str_has_prefix (*argv, "-") && matches ((*argv)+1, "help") == 0) - || (g_str_has_prefix (*argv, "--") && matches ((*argv)+2, "help") == 0)) { - usage (); - } else { usage (); g_string_printf (nmc->return_text, _("Error: 'dev' command '%s' is not valid."), *argv); @@ -2187,6 +2707,7 @@ do_devices (NmCli *nmc, int argc, char **argv) } } +usage_exit: return nmc->return_value; opt_error: |