Commit 66098fa6 authored by Jiří Klimeš's avatar Jiří Klimeš

cli: trivial update of NmcOutputField initializers

no actual change
parent 1d1cfd77
......@@ -31,40 +31,40 @@
/* Available fields for IPv4 group */
static NmcOutputField nmc_fields_ip4_config[] = {
{"GROUP", N_("GROUP"), 15, NULL, 0}, /* 0 */
{"ADDRESS", N_("ADDRESS"), 68, NULL, 0}, /* 1 */
{"ROUTE", N_("ROUTE"), 68, NULL, 0}, /* 2 */
{"DNS", N_("DNS"), 35, NULL, 0}, /* 3 */
{"DOMAIN", N_("DOMAIN"), 35, NULL, 0}, /* 4 */
{"WINS", N_("WINS"), 20, NULL, 0}, /* 5 */
{NULL, NULL, 0, NULL, 0}
{"GROUP", N_("GROUP"), 15}, /* 0 */
{"ADDRESS", N_("ADDRESS"), 68}, /* 1 */
{"ROUTE", N_("ROUTE"), 68}, /* 2 */
{"DNS", N_("DNS"), 35}, /* 3 */
{"DOMAIN", N_("DOMAIN"), 35}, /* 4 */
{"WINS", N_("WINS"), 20}, /* 5 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_IP4_CONFIG_ALL "GROUP,ADDRESS,ROUTE,DNS,DOMAIN,WINS"
/* Available fields for DHCPv4 group */
static NmcOutputField nmc_fields_dhcp4_config[] = {
{"GROUP", N_("GROUP"), 15, NULL, 0}, /* 0 */
{"OPTION", N_("OPTION"), 80, NULL, 0}, /* 1 */
{NULL, NULL, 0, NULL, 0}
{"GROUP", N_("GROUP"), 15}, /* 0 */
{"OPTION", N_("OPTION"), 80}, /* 1 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_DHCP4_CONFIG_ALL "GROUP,OPTION"
/* Available fields for IPv6 group */
static NmcOutputField nmc_fields_ip6_config[] = {
{"GROUP", N_("GROUP"), 15, NULL, 0}, /* 0 */
{"ADDRESS", N_("ADDRESS"), 95, NULL, 0}, /* 1 */
{"ROUTE", N_("ROUTE"), 95, NULL, 0}, /* 2 */
{"DNS", N_("DNS"), 60, NULL, 0}, /* 3 */
{"DOMAIN", N_("DOMAIN"), 35, NULL, 0}, /* 4 */
{NULL, NULL, 0, NULL, 0}
{"GROUP", N_("GROUP"), 15}, /* 0 */
{"ADDRESS", N_("ADDRESS"), 95}, /* 1 */
{"ROUTE", N_("ROUTE"), 95}, /* 2 */
{"DNS", N_("DNS"), 60}, /* 3 */
{"DOMAIN", N_("DOMAIN"), 35}, /* 4 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_IP6_CONFIG_ALL "GROUP,ADDRESS,ROUTE,DNS,DOMAIN"
/* Available fields for DHCPv6 group */
static NmcOutputField nmc_fields_dhcp6_config[] = {
{"GROUP", N_("GROUP"), 15, NULL, 0}, /* 0 */
{"OPTION", N_("OPTION"), 80, NULL, 0}, /* 1 */
{NULL, NULL, 0, NULL, 0}
{"GROUP", N_("GROUP"), 15}, /* 0 */
{"OPTION", N_("OPTION"), 80}, /* 1 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_DHCP6_CONFIG_ALL "GROUP,OPTION"
......
......@@ -59,21 +59,21 @@
/* Available fields for 'connection show configured' */
static NmcOutputField nmc_fields_con_show[] = {
{"NAME", N_("NAME"), 25, NULL, 0}, /* 0 */
{"UUID", N_("UUID"), 38, NULL, 0}, /* 1 */
{"TYPE", N_("TYPE"), 17, NULL, 0}, /* 2 */
{"TIMESTAMP", N_("TIMESTAMP"), 12, NULL, 0}, /* 3 */
{"TIMESTAMP-REAL", N_("TIMESTAMP-REAL"), 34, NULL, 0}, /* 4 */
{"AUTOCONNECT", N_("AUTOCONNECT"), 13, NULL, 0}, /* 5 */
{"READONLY", N_("READONLY"), 10, NULL, 0}, /* 6 */
{"DBUS-PATH", N_("DBUS-PATH"), 42, NULL, 0}, /* 7 */
{NULL, NULL, 0, NULL, 0}
{"NAME", N_("NAME"), 25}, /* 0 */
{"UUID", N_("UUID"), 38}, /* 1 */
{"TYPE", N_("TYPE"), 17}, /* 2 */
{"TIMESTAMP", N_("TIMESTAMP"), 12}, /* 3 */
{"TIMESTAMP-REAL", N_("TIMESTAMP-REAL"), 34}, /* 4 */
{"AUTOCONNECT", N_("AUTOCONNECT"), 13}, /* 5 */
{"READONLY", N_("READONLY"), 10}, /* 6 */
{"DBUS-PATH", N_("DBUS-PATH"), 42}, /* 7 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_CON_SHOW_ALL "NAME,UUID,TYPE,TIMESTAMP,TIMESTAMP-REAL,AUTOCONNECT,READONLY,DBUS-PATH"
#define NMC_FIELDS_CON_SHOW_COMMON "NAME,UUID,TYPE,TIMESTAMP-REAL"
/* Helper macro to define fields */
#define SETTING_FIELD(setting, width) { setting, N_(setting), width, NULL, 0 }
#define SETTING_FIELD(setting, width) { setting, N_(setting), width, NULL, FALSE, FALSE, 0 }
/* Available settings for 'connection show configured <con>' */
static NmcOutputField nmc_fields_settings_names[] = {
......@@ -99,7 +99,7 @@ static NmcOutputField nmc_fields_settings_names[] = {
SETTING_FIELD (NM_SETTING_ADSL_SETTING_NAME, 0), /* 19 */
SETTING_FIELD (NM_SETTING_BRIDGE_SETTING_NAME, 0), /* 20 */
SETTING_FIELD (NM_SETTING_BRIDGE_PORT_SETTING_NAME, 0), /* 21 */
{NULL, NULL, 0, NULL, 0}
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTINGS_NAMES_ALL_X NM_SETTING_CONNECTION_SETTING_NAME","\
NM_SETTING_WIRED_SETTING_NAME","\
......@@ -132,30 +132,30 @@ static NmcOutputField nmc_fields_settings_names[] = {
/* Available fields for 'connection show active' */
static NmcOutputField nmc_fields_con_show_active[] = {
{"GROUP", N_("GROUP"), 9, NULL, 0}, /* 0 */ /* used only for 'GENERAL' group listing */
{"NAME", N_("NAME"), 25, NULL, 0}, /* 1 */
{"UUID", N_("UUID"), 38, NULL, 0}, /* 2 */
{"DEVICES", N_("DEVICES"), 10, NULL, 0}, /* 3 */
{"STATE", N_("STATE"), 12, NULL, 0}, /* 4 */
{"DEFAULT", N_("DEFAULT"), 8, NULL, 0}, /* 5 */
{"DEFAULT6", N_("DEFAULT6"), 9, NULL, 0}, /* 6 */
{"SPEC-OBJECT", N_("SPEC-OBJECT"), 10, NULL, 0}, /* 7 */
{"VPN", N_("VPN"), 5, NULL, 0}, /* 8 */
{"DBUS-PATH", N_("DBUS-PATH"), 51, NULL, 0}, /* 9 */
{"CON-PATH", N_("CON-PATH"), 44, NULL, 0}, /* 10 */
{"ZONE", N_("ZONE"), 15, NULL, 0}, /* 11 */
{"MASTER-PATH", N_("MASTER-PATH"), 44, NULL, 0}, /* 12 */
{NULL, NULL, 0, NULL, 0}
{"GROUP", N_("GROUP"), 9}, /* 0 */ /* used only for 'GENERAL' group listing */
{"NAME", N_("NAME"), 25}, /* 1 */
{"UUID", N_("UUID"), 38}, /* 2 */
{"DEVICES", N_("DEVICES"), 10}, /* 3 */
{"STATE", N_("STATE"), 12}, /* 4 */
{"DEFAULT", N_("DEFAULT"), 8}, /* 5 */
{"DEFAULT6", N_("DEFAULT6"), 9}, /* 6 */
{"SPEC-OBJECT", N_("SPEC-OBJECT"), 10}, /* 7 */
{"VPN", N_("VPN"), 5}, /* 8 */
{"DBUS-PATH", N_("DBUS-PATH"), 51}, /* 9 */
{"CON-PATH", N_("CON-PATH"), 44}, /* 10 */
{"ZONE", N_("ZONE"), 15}, /* 11 */
{"MASTER-PATH", N_("MASTER-PATH"), 44}, /* 12 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_CON_ACTIVE_ALL "NAME,UUID,DEVICES,STATE,DEFAULT,DEFAULT6,VPN,ZONE,DBUS-PATH,CON-PATH,SPEC-OBJECT,MASTER-PATH"
#define NMC_FIELDS_CON_ACTIVE_COMMON "NAME,UUID,DEVICES,DEFAULT,VPN,MASTER-PATH"
/* Available fields for 'connection show active <con>' */
static NmcOutputField nmc_fields_con_active_details_groups[] = {
{"GENERAL", N_("GENERAL"), 9, NULL, 0}, /* 0 */
{"IP", N_("IP"), 5, NULL, 0}, /* 1 */
{"VPN", N_("VPN"), 5, NULL, 0}, /* 2 */
{NULL, NULL, 0, NULL, 0}
{"GENERAL", N_("GENERAL"), 9}, /* 0 */
{"IP", N_("IP"), 5}, /* 1 */
{"VPN", N_("VPN"), 5}, /* 2 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_CON_ACTIVE_DETAILS_ALL "GENERAL,IP,VPN"
......@@ -166,14 +166,14 @@ static NmcOutputField nmc_fields_con_active_details_groups[] = {
/* Available fields for VPN group */
static NmcOutputField nmc_fields_con_active_details_vpn[] = {
{"GROUP", N_("GROUP"), 9, NULL, 0}, /* 0 */
{"TYPE", N_("TYPE"), 15, NULL, 0}, /* 1 */
{"USERNAME", N_("USERNAME"), 15, NULL, 0}, /* 2 */
{"GATEWAY", N_("GATEWAY"), 25, NULL, 0}, /* 3 */
{"BANNER", N_("BANNER"), 120, NULL, 0}, /* 4 */
{"VPN-STATE", N_("VPN-STATE"), 40, NULL, 0}, /* 5 */
{"CFG", N_("CFG"), 120, NULL, 0}, /* 6 */
{NULL, NULL, 0, NULL, 0}
{"GROUP", N_("GROUP"), 9}, /* 0 */
{"TYPE", N_("TYPE"), 15}, /* 1 */
{"USERNAME", N_("USERNAME"), 15}, /* 2 */
{"GATEWAY", N_("GATEWAY"), 25}, /* 3 */
{"BANNER", N_("BANNER"), 120}, /* 4 */
{"VPN-STATE", N_("VPN-STATE"), 40}, /* 5 */
{"CFG", N_("CFG"), 120}, /* 6 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_CON_ACTIVE_DETAILS_VPN_ALL "GROUP,TYPE,USERNAME,GATEWAY,BANNER,VPN-STATE,CFG"
......
......@@ -68,11 +68,11 @@
/* 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 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_DEV_STATUS_ALL "DEVICE,TYPE,STATE,DBUS-PATH"
#define NMC_FIELDS_DEV_STATUS_COMMON "DEVICE,TYPE,STATE"
......@@ -80,21 +80,21 @@ static NmcOutputField nmc_fields_dev_status[] = {
/* Available sections for 'device show' */
static NmcOutputField nmc_fields_dev_show_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}
{"GENERAL", N_("GENERAL"), 0}, /* 0 */
{"CAPABILITIES", N_("CAPABILITIES"), 0}, /* 1 */
{"WIFI-PROPERTIES", N_("WIFI-PROPERTIES"), 0}, /* 2 */
{"AP", N_("AP"), 0}, /* 3 */
{"WIRED-PROPERTIES", N_("WIRED-PROPERTIES"), 0}, /* 4 */
{"WIMAX-PROPERTIES", N_("WIMAX-PROPERTIES"), 0}, /* 5 */
{"NSP", N_("NSP"), 0}, /* 6 */
{"IP4", N_("IP4"), 0}, /* 7 */
{"DHCP4", N_("DHCP4"), 0}, /* 8 */
{"IP6", N_("IP6"), 0}, /* 9 */
{"DHCP6", N_("DHCP6"), 0}, /* 10 */
{"BOND", N_("BOND"), 0}, /* 11 */
{"VLAN", N_("VLAN"), 0}, /* 12 */
{"CONNECTIONS", N_("CONNECTIONS"), 0}, /* 13 */
{NULL, NULL, 0}
};
#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"
......@@ -106,24 +106,24 @@ static NmcOutputField nmc_fields_dev_show_sections[] = {
/* Available fields for 'device show' - GENERAL part */
static NmcOutputField nmc_fields_dev_show_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}
{"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 */
{"STATE", N_("STATE"), 14}, /* 9 */
{"REASON", N_("REASON"), 25}, /* 10 */
{"UDI", N_("UDI"), 64}, /* 11 */
{"IP-IFACE", N_("IP-IFACE"), 10}, /* 12 */
{"NM-MANAGED", N_("NM-MANAGED"), 15}, /* 13 */
{"AUTOCONNECT", N_("AUTOCONNECT"), 15}, /* 14 */
{"FIRMWARE-MISSING", N_("FIRMWARE-MISSING"), 18}, /* 15 */
{"CONNECTION", N_("CONNECTION"), 51}, /* 16 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_DEV_SHOW_GENERAL_ALL "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,DRIVER-VERSION,FIRMWARE-VERSION,HWADDR,STATE,REASON,UDI,IP-IFACE,"\
"NM-MANAGED,AUTOCONNECT,FIRMWARE-MISSING,CONNECTION"
......@@ -131,29 +131,29 @@ static NmcOutputField nmc_fields_dev_show_general[] = {
/* Available fields for 'device show' - CONNECTIONS part */
static NmcOutputField nmc_fields_dev_show_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}
{"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_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, NULL, 0}, /* 0 */
{"CARRIER-DETECT", N_("CARRIER-DETECT"), 16, NULL, 0}, /* 1 */
{"SPEED", N_("SPEED"), 10, NULL, 0}, /* 2 */
{NULL, NULL, 0, NULL, 0}
{"NAME", N_("NAME"), 13}, /* 0 */
{"CARRIER-DETECT", N_("CARRIER-DETECT"), 16}, /* 1 */
{"SPEED", N_("SPEED"), 10}, /* 2 */
{NULL, 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, NULL, 0}, /* 0 */
{"CARRIER", N_("CARRIER"), 10, NULL, 0}, /* 1 */
{NULL, NULL, 0, NULL, 0}
{"NAME", N_("NAME"), 18}, /* 0 */
{"CARRIER", N_("CARRIER"), 10}, /* 1 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_DEV_SHOW_WIRED_PROP_ALL "NAME,CARRIER"
#define NMC_FIELDS_DEV_SHOW_WIRED_PROP_COMMON "NAME,CARRIER"
......@@ -161,15 +161,15 @@ static NmcOutputField nmc_fields_dev_show_wired_prop[] = {
/* Available fields for 'device show' - wireless properties part */
static NmcOutputField nmc_fields_dev_show_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}
{"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_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"
......@@ -177,13 +177,13 @@ static NmcOutputField nmc_fields_dev_show_wifi_prop[] = {
#if WITH_WIMAX
/* Available fields for 'device show' - wimax properties part */
static NmcOutputField nmc_fields_dev_show_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}
{"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_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"
......@@ -191,20 +191,20 @@ static NmcOutputField nmc_fields_dev_show_wimax_prop[] = {
/* 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 */
{"BSSID", N_("BSSID"), 19}, /* 2 */
{"MODE", N_("MODE"), 16}, /* 3 */
{"FREQ", N_("FREQ"), 10}, /* 4 */
{"RATE", N_("RATE"), 10}, /* 5 */
{"SIGNAL", N_("SIGNAL"), 8}, /* 6 */
{"SECURITY", N_("SECURITY"), 10}, /* 7 */
{"WPA-FLAGS", N_("WPA-FLAGS"), 25}, /* 8 */
{"RSN-FLAGS", N_("RSN-FLAGS"), 25}, /* 9 */
{"DEVICE", N_("DEVICE"), 10}, /* 10 */
{"ACTIVE", N_("ACTIVE"), 8}, /* 11 */
{"DBUS-PATH", N_("DBUS-PATH"), 46}, /* 12 */
{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"
......@@ -213,14 +213,14 @@ static NmcOutputField nmc_fields_dev_wifi_list[] = {
#if WITH_WIMAX
/* 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"
......@@ -229,18 +229,18 @@ static NmcOutputField nmc_fields_dev_wimax_list[] = {
/* Available fields for 'device show' - BOND part */
static NmcOutputField nmc_fields_dev_show_bond_prop[] = {
{"NAME", N_("NAME"), 18, NULL, 0}, /* 0 */
{"SLAVES", N_("SLAVES"), 20, NULL, 0}, /* 1 */
{NULL, NULL, 0, NULL, 0}
{"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, NULL, 0}, /* 0 */
{"ID", N_("ID"), 5, NULL, 0}, /* 1 */
{NULL, NULL, 0, NULL, 0}
{"NAME", N_("NAME"), 18}, /* 0 */
{"ID", N_("ID"), 5}, /* 1 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_DEV_SHOW_VLAN_PROP_ALL "NAME,ID"
#define NMC_FIELDS_DEV_SHOW_VLAN_PROP_COMMON "NAME,ID"
......
......@@ -34,17 +34,17 @@
/* Available fields for 'general status' */
static NmcOutputField nmc_fields_nm_status[] = {
{"RUNNING", N_("RUNNING"), 15, NULL, 0}, /* 0 */
{"VERSION", N_("VERSION"), 10, NULL, 0}, /* 1 */
{"STATE", N_("STATE"), 15, NULL, 0}, /* 2 */
{"NETWORKING", N_("NETWORKING"), 13, NULL, 0}, /* 3 */
{"WIFI-HW", N_("WIFI-HW"), 15, NULL, 0}, /* 4 */
{"WIFI", N_("WIFI"), 10, NULL, 0}, /* 5 */
{"WWAN-HW", N_("WWAN-HW"), 15, NULL, 0}, /* 6 */
{"WWAN", N_("WWAN"), 10, NULL, 0}, /* 7 */
{"WIMAX-HW", N_("WIMAX-HW"), 15, NULL, 0}, /* 8 */
{"WIMAX", N_("WIMAX"), 10, NULL, 0}, /* 9 */
{NULL, NULL, 0, NULL, 0}
{"RUNNING", N_("RUNNING"), 15}, /* 0 */
{"VERSION", N_("VERSION"), 10}, /* 1 */
{"STATE", N_("STATE"), 15}, /* 2 */
{"NETWORKING", N_("NETWORKING"), 13}, /* 3 */
{"WIFI-HW", N_("WIFI-HW"), 15}, /* 4 */
{"WIFI", N_("WIFI"), 10}, /* 5 */
{"WWAN-HW", N_("WWAN-HW"), 15}, /* 6 */
{"WWAN", N_("WWAN"), 10}, /* 7 */
{"WIMAX-HW", N_("WIMAX-HW"), 15}, /* 8 */
{"WIMAX", N_("WIMAX"), 10}, /* 9 */
{NULL, NULL, 0}
};
#if WITH_WIMAX
#define NMC_FIELDS_NM_STATUS_ALL "RUNNING,VERSION,STATE,NETWORKING,WIFI-HW,WIFI,WWAN-HW,WWAN,WIMAX-HW,WIMAX"
......@@ -64,18 +64,18 @@ static NmcOutputField nmc_fields_nm_status[] = {
/* Available fields for 'general permissions' */
static NmcOutputField nmc_fields_nm_permissions[] = {
{"PERMISSION", N_("PERMISSION"), 57, NULL, 0}, /* 0 */
{"VALUE", N_("VALUE"), 10, NULL, 0}, /* 1 */
{NULL, NULL, 0, NULL, 0}
{"PERMISSION", N_("PERMISSION"), 57}, /* 0 */
{"VALUE", N_("VALUE"), 10}, /* 1 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_NM_PERMISSIONS_ALL "PERMISSION,VALUE"
#define NMC_FIELDS_NM_PERMISSIONS_COMMON "PERMISSION,VALUE"
/* Available fields for 'general logging' */
static NmcOutputField nmc_fields_nm_logging[] = {
{"LEVEL", N_("LEVEL"), 10, NULL, 0}, /* 0 */
{"DOMAINS", N_("DOMAINS"), 70, NULL, 0}, /* 1 */
{NULL, NULL, 0, NULL, 0}
{"LEVEL", N_("LEVEL"), 10}, /* 0 */
{"DOMAINS", N_("DOMAINS"), 70}, /* 1 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_NM_LOGGING_ALL "LEVEL,DOMAINS"
#define NMC_FIELDS_NM_LOGGING_COMMON "LEVEL,DOMAINS"
......
......@@ -30,7 +30,7 @@
/* Helper macro to define fields */
#define SETTING_FIELD(setting, width) { setting, N_(setting), width, NULL, 0 }
#define SETTING_FIELD(setting, width) { setting, N_(setting), width, NULL, FALSE, FALSE, 0 }
/* Available fields for NM_SETTING_CONNECTION_SETTING_NAME */
static NmcOutputField nmc_fields_setting_connection[] = {
......@@ -47,7 +47,7 @@ static NmcOutputField nmc_fields_setting_connection[] = {
SETTING_FIELD (NM_SETTING_CONNECTION_MASTER, 20), /* 10 */
SETTING_FIELD (NM_SETTING_CONNECTION_SLAVE_TYPE, 20), /* 11 */
SETTING_FIELD (NM_SETTING_CONNECTION_SECONDARIES, 40), /* 12 */
{NULL, NULL, 0, NULL, 0}
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_CONNECTION_ALL "name"","\
NM_SETTING_CONNECTION_ID","\
......@@ -78,7 +78,7 @@ static NmcOutputField nmc_fields_setting_wired[] = {
SETTING_FIELD (NM_SETTING_WIRED_S390_SUBCHANNELS, 20), /* 9 */
SETTING_FIELD (NM_SETTING_WIRED_S390_NETTYPE, 15), /* 10 */
SETTING_FIELD (NM_SETTING_WIRED_S390_OPTIONS, 20), /* 11 */
{NULL, NULL, 0, NULL, 0}
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_WIRED_ALL "name"","\
NM_SETTING_WIRED_PORT","\
......@@ -129,7 +129,7 @@ static NmcOutputField nmc_fields_setting_8021X[] = {
SETTING_FIELD (NM_SETTING_802_1X_PIN, 8), /* 30 */
SETTING_FIELD (NM_SETTING_802_1X_PIN_FLAGS, 20), /* 31 */
SETTING_FIELD (NM_SETTING_802_1X_SYSTEM_CA_CERTS, 17), /* 32 */
{NULL, NULL, 0, NULL, 0}
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_802_1X_ALL "name"","\
NM_SETTING_802_1X_EAP","\
......@@ -183,7 +183,7 @@ static NmcOutputField nmc_fields_setting_wireless[] = {
SETTING_FIELD (NM_SETTING_WIRELESS_SEEN_BSSIDS, 35), /* 12 */
SETTING_FIELD (NM_SETTING_WIRELESS_SEC, 25), /* 13 */
SETTING_FIELD (NM_SETTING_WIRELESS_HIDDEN, 10), /* 14 */
{NULL, NULL, 0, NULL, 0}
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_WIRELESS_ALL "name"","\
NM_SETTING_WIRELESS_SSID","\
......@@ -222,7 +222,7 @@ static NmcOutputField nmc_fields_setting_wireless_security[] = {
SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, 20), /* 15 */
SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, 15), /* 16 */
SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, 20), /* 17 */
{NULL, NULL, 0, NULL, 0}
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_WIRELESS_SECURITY_ALL "name"","\
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT","\
......@@ -259,7 +259,7 @@ static NmcOutputField nmc_fields_setting_ip4_config[] = {
SETTING_FIELD (NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME, 14), /* 10 */
SETTING_FIELD (NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, 15), /* 11 */
SETTING_FIELD (NM_SETTING_IP4_CONFIG_MAY_FAIL, 12), /* 12 */
{NULL, NULL, 0, NULL, 0}
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_IP4_CONFIG_ALL "name"","\
NM_SETTING_IP4_CONFIG_METHOD","\
......@@ -290,7 +290,7 @@ static NmcOutputField nmc_fields_setting_ip6_config[] = {
SETTING_FIELD (NM_SETTING_IP6_CONFIG_MAY_FAIL, 12), /* 9 */
SETTING_FIELD (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, 15), /* 10 */
SETTING_FIELD (NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME, 14), /* 11 */
{NULL, NULL, 0, NULL, 0}
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_IP6_CONFIG_ALL "name"","\
NM_SETTING_IP6_CONFIG_METHOD","\
......@@ -314,7 +314,7 @@ static NmcOutputField nmc_fields_setting_serial[] = {
SETTING_FIELD (NM_SETTING_SERIAL_PARITY, 10), /* 3 */
SETTING_FIELD (NM_SETTING_SERIAL_STOPBITS, 10), /* 4 */
SETTING_FIELD (NM_SETTING_SERIAL_SEND_DELAY, 12), /* 5 */
{NULL, NULL, 0, NULL, 0}
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_SERIAL_ALL "name"","\
NM_SETTING_SERIAL_BAUD","\
......@@ -345,7 +345,7 @@ static NmcOutputField nmc_fields_setting_ppp[] = {
SETTING_FIELD (NM_SETTING_PPP_MTU, 10), /* 16 */
SETTING_FIELD (NM_SETTING_PPP_LCP_ECHO_FAILURE, 17), /* 17 */
SETTING_FIELD (NM_SETTING_PPP_LCP_ECHO_INTERVAL, 18), /* 18 */
{NULL, NULL, 0, NULL, 0}
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_PPP_ALL "name"","\
NM_SETTING_PPP_NOAUTH","\
......@@ -375,7 +375,7 @@ static NmcOutputField nmc_fields_setting_pppoe[] = {
SETTING_FIELD (NM_SETTING_PPPOE_USERNAME, 15), /* 2 */
SETTING_FIELD (NM_SETTING_PPPOE_PASSWORD, 15), /* 3 */
SETTING_FIELD (NM_SETTING_PPPOE_PASSWORD_FLAGS, 20), /* 4 */
{NULL, NULL, 0, NULL, 0}
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_PPPOE_ALL "name"","\
NM_SETTING_PPPOE_SERVICE","\
......@@ -394,7 +394,7 @@ static NmcOutputField nmc_fields_setting_adsl[] = {
SETTING_FIELD (NM_SETTING_ADSL_ENCAPSULATION, 10), /* 5 */
SETTING_FIELD (NM_SETTING_ADSL_VPI, 10), /* 6 */
SETTING_FIELD (NM_SETTING_ADSL_VCI, 10), /* 7 */
{NULL, NULL, 0, NULL, 0}