mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-01 10:18:00 +02:00
cli: make 'value' in NmcOutputField non const
This commit is contained in:
Jiří Klimeš
Dan Winship
parent
6ff924f82f
commit
113d358ce5
8 changed files with 155 additions and 155 deletions
|
|
@ -159,12 +159,12 @@ print_ip4_config (NMIP4Config *cfg4, NmCli *nmc, const char *group_prefix)
|
|||
wins_arr[i] = NULL;
|
||||
}
|
||||
|
||||
set_val_str (nmc->allowed_fields, 0, group_prefix);
|
||||
set_val_arr (nmc->allowed_fields, 1, (const char **) addr_arr);
|
||||
set_val_arr (nmc->allowed_fields, 2, (const char **) route_arr);
|
||||
set_val_arr (nmc->allowed_fields, 3, (const char **) dns_arr);
|
||||
set_val_arr (nmc->allowed_fields, 4, (const char **) domain_arr);
|
||||
set_val_arr (nmc->allowed_fields, 5, (const char **) wins_arr);
|
||||
set_val_str (nmc->allowed_fields, 0, (char *) group_prefix);
|
||||
set_val_arr (nmc->allowed_fields, 1, addr_arr);
|
||||
set_val_arr (nmc->allowed_fields, 2, route_arr);
|
||||
set_val_arr (nmc->allowed_fields, 3, dns_arr);
|
||||
set_val_arr (nmc->allowed_fields, 4, domain_arr);
|
||||
set_val_arr (nmc->allowed_fields, 5, wins_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 */
|
||||
|
|
@ -257,11 +257,11 @@ print_ip6_config (NMIP6Config *cfg6, NmCli *nmc, const char *group_prefix)
|
|||
domain_arr[i] = NULL;
|
||||
}
|
||||
|
||||
set_val_str (nmc->allowed_fields, 0, group_prefix);
|
||||
set_val_arr (nmc->allowed_fields, 1, (const char **) addr_arr);
|
||||
set_val_arr (nmc->allowed_fields, 2, (const char **) route_arr);
|
||||
set_val_arr (nmc->allowed_fields, 3, (const char **) dns_arr);
|
||||
set_val_arr (nmc->allowed_fields, 4, (const char **) domain_arr);
|
||||
set_val_str (nmc->allowed_fields, 0, (char *) group_prefix);
|
||||
set_val_arr (nmc->allowed_fields, 1, addr_arr);
|
||||
set_val_arr (nmc->allowed_fields, 2, route_arr);
|
||||
set_val_arr (nmc->allowed_fields, 3, dns_arr);
|
||||
set_val_arr (nmc->allowed_fields, 4, domain_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 */
|
||||
|
|
@ -303,8 +303,8 @@ print_dhcp4_config (NMDHCP4Config *dhcp4, NmCli *nmc, const char *group_prefix)
|
|||
options_arr[i++] = g_strdup_printf ("%s = %s", (char *) key, (char *) value);
|
||||
options_arr[i] = NULL;
|
||||
|
||||
set_val_str (nmc->allowed_fields, 0, group_prefix);
|
||||
set_val_arr (nmc->allowed_fields, 1, (const char **) options_arr);
|
||||
set_val_str (nmc->allowed_fields, 0, (char *) group_prefix);
|
||||
set_val_arr (nmc->allowed_fields, 1, options_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 */
|
||||
|
|
@ -345,8 +345,8 @@ print_dhcp6_config (NMDHCP6Config *dhcp6, NmCli *nmc, const char *group_prefix)
|
|||
options_arr[i++] = g_strdup_printf ("%s = %s", (char *) key, (char *) value);
|
||||
options_arr[i] = NULL;
|
||||
|
||||
set_val_str (nmc->allowed_fields, 0, group_prefix);
|
||||
set_val_arr (nmc->allowed_fields, 1, (const char **) options_arr);
|
||||
set_val_str (nmc->allowed_fields, 0, (char *) group_prefix);
|
||||
set_val_arr (nmc->allowed_fields, 1, options_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 */
|
||||
|
|
|
|||
|
|
@ -310,14 +310,14 @@ show_connection (NMConnection *data, gpointer user_data)
|
|||
timestamp_real = timestamp;
|
||||
strftime (timestamp_real_str, sizeof (timestamp_real_str), "%c", localtime (×tamp_real));
|
||||
|
||||
nmc->allowed_fields[0].value = nm_setting_connection_get_id (s_con);
|
||||
nmc->allowed_fields[1].value = nm_setting_connection_get_uuid (s_con);
|
||||
nmc->allowed_fields[2].value = nm_setting_connection_get_connection_type (s_con);
|
||||
nmc->allowed_fields[0].value = (char *) nm_setting_connection_get_id (s_con);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_connection_get_uuid (s_con);
|
||||
nmc->allowed_fields[2].value = (char *) nm_setting_connection_get_connection_type (s_con);
|
||||
nmc->allowed_fields[3].value = timestamp_str;
|
||||
nmc->allowed_fields[4].value = timestamp ? timestamp_real_str : _("never");
|
||||
nmc->allowed_fields[5].value = nm_setting_connection_get_autoconnect (s_con) ? _("yes") : _("no");
|
||||
nmc->allowed_fields[6].value = nm_setting_connection_get_read_only (s_con) ? _("yes") : _("no");
|
||||
nmc->allowed_fields[7].value = nm_connection_get_path (connection);
|
||||
nmc->allowed_fields[7].value = (char *) nm_connection_get_path (connection);
|
||||
|
||||
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);
|
||||
|
|
@ -544,19 +544,19 @@ fill_in_fields_con_status (NMActiveConnection *active, GSList *con_list)
|
|||
g_string_truncate (dev_str, dev_str->len - 1); /* Cut off last ',' */
|
||||
|
||||
/* Fill field values */
|
||||
nmc_fields_con_status[0].value = nmc_fields_status_details_groups[0].name;
|
||||
nmc_fields_con_status[0].value = (char *) nmc_fields_status_details_groups[0].name;
|
||||
nmc_fields_con_status[1].value = _("N/A");
|
||||
nmc_fields_con_status[2].value = nm_active_connection_get_uuid (active);
|
||||
nmc_fields_con_status[2].value = (char *) nm_active_connection_get_uuid (active);
|
||||
nmc_fields_con_status[3].value = dev_str->str;
|
||||
nmc_fields_con_status[4].value = active_connection_state_to_string (state);
|
||||
nmc_fields_con_status[4].value = (char *) active_connection_state_to_string (state);
|
||||
nmc_fields_con_status[5].value = nm_active_connection_get_default (active) ? _("yes") : _("no");
|
||||
nmc_fields_con_status[6].value = nm_active_connection_get_default6 (active) ? _("yes") : _("no");
|
||||
nmc_fields_con_status[7].value = nm_active_connection_get_specific_object (active);
|
||||
nmc_fields_con_status[7].value = (char *) nm_active_connection_get_specific_object (active);
|
||||
nmc_fields_con_status[8].value = NM_IS_VPN_CONNECTION (active) ? _("yes") : _("no");
|
||||
nmc_fields_con_status[9].value = nm_object_get_path (NM_OBJECT (active));
|
||||
nmc_fields_con_status[10].value = nm_active_connection_get_connection (active);
|
||||
nmc_fields_con_status[9].value = (char *) nm_object_get_path (NM_OBJECT (active));
|
||||
nmc_fields_con_status[10].value = (char *) nm_active_connection_get_connection (active);
|
||||
nmc_fields_con_status[11].value = _("N/A");
|
||||
nmc_fields_con_status[12].value = nm_active_connection_get_master (active);
|
||||
nmc_fields_con_status[12].value = (char *) nm_active_connection_get_master (active);
|
||||
|
||||
for (iter = con_list; iter; iter = g_slist_next (iter)) {
|
||||
NMConnection *connection = (NMConnection *) iter->data;
|
||||
|
|
@ -568,8 +568,8 @@ fill_in_fields_con_status (NMActiveConnection *active, GSList *con_list)
|
|||
g_assert (s_con != NULL);
|
||||
|
||||
/* Fill field values that depend on NMConnection */
|
||||
nmc_fields_con_status[1].value = nm_setting_connection_get_id (s_con);
|
||||
nmc_fields_con_status[11].value = nm_setting_connection_get_zone (s_con);
|
||||
nmc_fields_con_status[1].value = (char *) nm_setting_connection_get_id (s_con);
|
||||
nmc_fields_con_status[11].value = (char *) nm_setting_connection_get_zone (s_con);
|
||||
|
||||
success = TRUE;
|
||||
break;
|
||||
|
|
@ -859,13 +859,13 @@ nmc_active_connection_detail (NMActiveConnection *acon, NmCli *nmc)
|
|||
vpn_state_str = g_strdup_printf ("%d - %s", vpn_state, vpn_connection_state_to_string (vpn_state));
|
||||
|
||||
/* Print values */
|
||||
set_val_str (nmc->allowed_fields, 0, nmc_fields_status_details_groups[2].name);
|
||||
set_val_str (nmc->allowed_fields, 0, (char *) nmc_fields_status_details_groups[2].name);
|
||||
set_val_str (nmc->allowed_fields, 1, type_str);
|
||||
set_val_str (nmc->allowed_fields, 2, username ? username : get_vpn_data_item (con, VPN_DATA_ITEM_USERNAME));
|
||||
set_val_str (nmc->allowed_fields, 3, get_vpn_data_item (con, VPN_DATA_ITEM_GATEWAY));
|
||||
set_val_str (nmc->allowed_fields, 2, (char *) (username ? username : get_vpn_data_item (con, VPN_DATA_ITEM_USERNAME)));
|
||||
set_val_str (nmc->allowed_fields, 3, (char *) get_vpn_data_item (con, VPN_DATA_ITEM_GATEWAY));
|
||||
set_val_str (nmc->allowed_fields, 4, banner_str);
|
||||
set_val_str (nmc->allowed_fields, 5, vpn_state_str);
|
||||
set_val_arr (nmc->allowed_fields, 6, (const char **) vpn_data_array);
|
||||
set_val_arr (nmc->allowed_fields, 6, vpn_data_array);
|
||||
|
||||
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX;
|
||||
print_fields (nmc->print_fields, nmc->allowed_fields);
|
||||
|
|
|
|||
|
|
@ -444,7 +444,7 @@ detail_access_point (gpointer data, gpointer user_data)
|
|||
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[2].value = (char *) bssid;
|
||||
info->nmc->allowed_fields[3].value = mode == NM_802_11_MODE_ADHOC ? _("Ad-Hoc")
|
||||
: mode == NM_802_11_MODE_INFRA ? _("Infrastructure")
|
||||
: _("Unknown");
|
||||
|
|
@ -454,9 +454,9 @@ detail_access_point (gpointer data, gpointer user_data)
|
|||
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[10].value = (char *) 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->allowed_fields[12].value = (char *) 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);
|
||||
|
|
@ -504,12 +504,12 @@ detail_wimax_nsp (NMWimaxNsp *nsp, NmCli *nmc, NMDevice *dev, int idx)
|
|||
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[1].value = (char *) 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[3].value = (char *) ntype;
|
||||
nmc->allowed_fields[4].value = (char *) 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));
|
||||
nmc->allowed_fields[6].value = (char *) nm_object_get_path (NM_OBJECT (nsp));
|
||||
|
||||
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);
|
||||
|
|
@ -613,24 +613,24 @@ show_device_info (gpointer data, gpointer user_data)
|
|||
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[0].value = (char *) nmc_fields_dev_list_sections[0].name; /* "GENERAL"*/
|
||||
nmc->allowed_fields[1].value = (char *) nm_device_get_iface (device);
|
||||
nmc->allowed_fields[2].value = (char *) device_type_to_string (device);
|
||||
nmc->allowed_fields[3].value = (char *) nm_device_get_vendor (device);
|
||||
nmc->allowed_fields[4].value = (char *) nm_device_get_product (device);
|
||||
nmc->allowed_fields[5].value = (char *) (nm_device_get_driver (device) ? nm_device_get_driver (device) : _("(unknown)"));
|
||||
nmc->allowed_fields[6].value = (char *) nm_device_get_driver_version (device);
|
||||
nmc->allowed_fields[7].value = (char *) nm_device_get_firmware_version (device);
|
||||
nmc->allowed_fields[8].value = (char *) (hwaddr ? hwaddr : _("(unknown)"));
|
||||
nmc->allowed_fields[9].value = (char *) state_str;
|
||||
nmc->allowed_fields[10].value = (char *) reason_str;
|
||||
nmc->allowed_fields[11].value = (char *) nm_device_get_udi (device);
|
||||
nmc->allowed_fields[12].value = (char *) 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->allowed_fields[16].value = (char *) ((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 */
|
||||
|
|
@ -659,7 +659,7 @@ show_device_info (gpointer data, gpointer user_data)
|
|||
if (speed)
|
||||
speed_str = g_strdup_printf (_("%u Mb/s"), speed);
|
||||
|
||||
nmc->allowed_fields[0].value = nmc_fields_dev_list_sections[1].name; /* "CAPABILITIES" */
|
||||
nmc->allowed_fields[0].value = (char *) 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");
|
||||
|
||||
|
|
@ -686,7 +686,7 @@ show_device_info (gpointer data, gpointer user_data)
|
|||
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[0].value = (char *) 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");
|
||||
|
|
@ -732,7 +732,7 @@ show_device_info (gpointer data, gpointer user_data)
|
|||
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[0].value = (char *) 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;
|
||||
|
|
@ -747,14 +747,14 @@ show_device_info (gpointer data, gpointer user_data)
|
|||
char *cfreq = NULL, *rssi = NULL, *cinr = NULL, *txpow = NULL;
|
||||
guint tmp_uint;
|
||||
gint tmp_int;
|
||||
const char *bsid;
|
||||
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" */
|
||||
nmc->allowed_fields[0].value = (char *) nmc_fields_dev_list_sections[5].name; /* "WIMAX-PROPERTIES" */
|
||||
|
||||
/* Center frequency */
|
||||
tmp_uint = nm_device_wimax_get_center_frequency (NM_DEVICE_WIMAX (device));
|
||||
|
|
@ -781,7 +781,7 @@ show_device_info (gpointer data, gpointer user_data)
|
|||
nmc->allowed_fields[4].value = txpow ? txpow : "";
|
||||
|
||||
/* BSID */
|
||||
bsid = nm_device_wimax_get_bsid (NM_DEVICE_WIMAX (device));
|
||||
bsid = (char *) nm_device_wimax_get_bsid (NM_DEVICE_WIMAX (device));
|
||||
nmc->allowed_fields[5].value = bsid ? bsid : "";
|
||||
|
||||
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX;
|
||||
|
|
@ -862,7 +862,7 @@ show_device_info (gpointer data, gpointer user_data)
|
|||
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 */
|
||||
|
||||
nmc->allowed_fields[0].value = nmc_fields_dev_list_sections[11].name; /* "BOND" */
|
||||
nmc->allowed_fields[0].value = (char *) nmc_fields_dev_list_sections[11].name; /* "BOND" */
|
||||
nmc->allowed_fields[1].value = bond_slaves_str->str;
|
||||
|
||||
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX;
|
||||
|
|
@ -883,7 +883,7 @@ show_device_info (gpointer data, gpointer user_data)
|
|||
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 */
|
||||
|
||||
nmc->allowed_fields[0].value = nmc_fields_dev_list_sections[12].name; /* "VLAN" */
|
||||
nmc->allowed_fields[0].value = (char *) nmc_fields_dev_list_sections[12].name; /* "VLAN" */
|
||||
nmc->allowed_fields[1].value = vlan_id_str;
|
||||
|
||||
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX;
|
||||
|
|
@ -930,9 +930,9 @@ 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, 0, (char *) 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);
|
||||
set_val_arr (nmc->allowed_fields, 2, ac_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 */
|
||||
|
|
@ -950,10 +950,10 @@ show_device_info (gpointer data, gpointer user_data)
|
|||
static void
|
||||
show_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->allowed_fields[0].value = (char *) nm_device_get_iface (device);
|
||||
nmc->allowed_fields[1].value = (char *) device_type_to_string (device);
|
||||
nmc->allowed_fields[2].value = (char *) nmc_device_state_to_string (nm_device_get_state (device));
|
||||
nmc->allowed_fields[3].value = (char *) 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);
|
||||
|
|
|
|||
|
|
@ -194,16 +194,16 @@ show_nm_status (NmCli *nmc)
|
|||
print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */
|
||||
|
||||
nmc->allowed_fields[0].value = nm_running ? _("running") : _("not running");
|
||||
nmc->allowed_fields[1].value = nm_running ? nm_client_get_version (nmc->client) : _("unknown");
|
||||
nmc->allowed_fields[2].value = nm_state_to_string (state);
|
||||
nmc->allowed_fields[3].value = net_enabled_str;
|
||||
nmc->allowed_fields[4].value = wireless_hw_enabled_str;
|
||||
nmc->allowed_fields[5].value = wireless_enabled_str;
|
||||
nmc->allowed_fields[6].value = wwan_hw_enabled_str;
|
||||
nmc->allowed_fields[7].value = wwan_enabled_str;
|
||||
nmc->allowed_fields[1].value = nm_running ? (char *) nm_client_get_version (nmc->client) : _("unknown");
|
||||
nmc->allowed_fields[2].value = (char *) nm_state_to_string (state);
|
||||
nmc->allowed_fields[3].value = (char *) net_enabled_str;
|
||||
nmc->allowed_fields[4].value = (char *) wireless_hw_enabled_str;
|
||||
nmc->allowed_fields[5].value = (char *) wireless_enabled_str;
|
||||
nmc->allowed_fields[6].value = (char *) wwan_hw_enabled_str;
|
||||
nmc->allowed_fields[7].value = (char *) wwan_enabled_str;
|
||||
#if WITH_WIMAX
|
||||
nmc->allowed_fields[8].value = wimax_hw_enabled_str;
|
||||
nmc->allowed_fields[9].value = wimax_enabled_str;
|
||||
nmc->allowed_fields[8].value = (char *) wimax_hw_enabled_str;
|
||||
nmc->allowed_fields[9].value = (char *) wimax_enabled_str;
|
||||
#endif
|
||||
|
||||
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag;
|
||||
|
|
@ -327,8 +327,8 @@ show_nm_permissions (NmCli *nmc)
|
|||
for (perm = NM_CLIENT_PERMISSION_NONE + 1; perm <= NM_CLIENT_PERMISSION_LAST; perm++) {
|
||||
NMClientPermissionResult perm_result = nm_client_get_permission_result (nmc->client, perm);
|
||||
|
||||
set_val_str (nmc->allowed_fields, 0, permission_to_string (perm));
|
||||
set_val_str (nmc->allowed_fields, 1, permission_result_to_string (perm_result));
|
||||
set_val_str (nmc->allowed_fields, 0, (char *) permission_to_string (perm));
|
||||
set_val_str (nmc->allowed_fields, 1, (char *) permission_result_to_string (perm_result));
|
||||
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag;
|
||||
print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ typedef struct {
|
|||
const char *name; /* Field's name */
|
||||
const char *name_l10n; /* Field's name for translation */
|
||||
int width; /* Width in screen columns */
|
||||
const void *value; /* Value of current field - char* or char** */
|
||||
void *value; /* Value of current field - char* or char** */
|
||||
guint32 flags; /* Flags */
|
||||
} NmcOutputField;
|
||||
|
||||
|
|
|
|||
|
|
@ -868,17 +868,17 @@ setting_connection_details (NMSettingConnection *s_con, NmCli *nmc)
|
|||
g_string_truncate (secondaries, secondaries->len-1); /* remove trailing , */
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_CONNECTION_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_connection_get_id (s_con);
|
||||
nmc->allowed_fields[2].value = nm_setting_connection_get_uuid (s_con);
|
||||
nmc->allowed_fields[3].value = nm_setting_connection_get_interface_name (s_con);
|
||||
nmc->allowed_fields[4].value = nm_setting_connection_get_connection_type (s_con);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_connection_get_id (s_con);
|
||||
nmc->allowed_fields[2].value = (char *) nm_setting_connection_get_uuid (s_con);
|
||||
nmc->allowed_fields[3].value = (char *) nm_setting_connection_get_interface_name (s_con);
|
||||
nmc->allowed_fields[4].value = (char *) nm_setting_connection_get_connection_type (s_con);
|
||||
nmc->allowed_fields[5].value = nm_setting_connection_get_autoconnect (s_con) ? _("yes") : _("no");
|
||||
nmc->allowed_fields[6].value = timestamp_str;
|
||||
nmc->allowed_fields[7].value = nm_setting_connection_get_read_only (s_con) ? ("yes") : _("no");
|
||||
nmc->allowed_fields[8].value = perm->str;
|
||||
nmc->allowed_fields[9].value = nm_setting_connection_get_zone (s_con);
|
||||
nmc->allowed_fields[10].value = nm_setting_connection_get_master (s_con);
|
||||
nmc->allowed_fields[11].value = nm_setting_connection_get_slave_type (s_con);
|
||||
nmc->allowed_fields[9].value = (char *) nm_setting_connection_get_zone (s_con);
|
||||
nmc->allowed_fields[10].value = (char *) nm_setting_connection_get_master (s_con);
|
||||
nmc->allowed_fields[11].value = (char *) nm_setting_connection_get_slave_type (s_con);
|
||||
nmc->allowed_fields[12].value = secondaries->str;
|
||||
|
||||
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX;
|
||||
|
|
@ -944,18 +944,18 @@ setting_wired_details (NMSettingWired *s_wired, NmCli *nmc)
|
|||
g_string_truncate (s390_options_s, s390_options_s->len-1); /* chop off trailing ',' */
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_WIRED_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_wired_get_port (s_wired);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_wired_get_port (s_wired);
|
||||
nmc->allowed_fields[2].value = speed_str;
|
||||
nmc->allowed_fields[3].value = nm_setting_wired_get_duplex (s_wired);
|
||||
nmc->allowed_fields[3].value = (char *) nm_setting_wired_get_duplex (s_wired);
|
||||
nmc->allowed_fields[4].value = nm_setting_wired_get_auto_negotiate (s_wired) ? _("yes") : _("no");
|
||||
nmc->allowed_fields[5].value = device_mac_str;
|
||||
nmc->allowed_fields[6].value = cloned_mac_str;
|
||||
nmc->allowed_fields[7].value = mac_blacklist_s->str;
|
||||
nmc->allowed_fields[8].value = strcmp (mtu_str, "0") ? mtu_str : _("auto");
|
||||
nmc->allowed_fields[9].value = s390_channels_s->str;
|
||||
nmc->allowed_fields[10].value = nm_setting_wired_get_s390_nettype (s_wired);
|
||||
nmc->allowed_fields[10].value = (char *) nm_setting_wired_get_s390_nettype (s_wired);
|
||||
nmc->allowed_fields[11].value = s390_options_s->str;
|
||||
nmc->allowed_fields[12].value = nm_setting_wired_get_carrier_detect (s_wired);
|
||||
nmc->allowed_fields[12].value = (char *) nm_setting_wired_get_carrier_detect (s_wired);
|
||||
|
||||
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 */
|
||||
|
|
@ -1053,35 +1053,35 @@ setting_802_1X_details (NMSetting8021x *s_8021X, NmCli *nmc)
|
|||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_802_1X_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = eap_str->str;
|
||||
nmc->allowed_fields[2].value = nm_setting_802_1x_get_identity (s_8021X);
|
||||
nmc->allowed_fields[3].value = nm_setting_802_1x_get_anonymous_identity (s_8021X);
|
||||
nmc->allowed_fields[4].value = nm_setting_802_1x_get_pac_file (s_8021X);
|
||||
nmc->allowed_fields[2].value = (char *) nm_setting_802_1x_get_identity (s_8021X);
|
||||
nmc->allowed_fields[3].value = (char *) nm_setting_802_1x_get_anonymous_identity (s_8021X);
|
||||
nmc->allowed_fields[4].value = (char *) nm_setting_802_1x_get_pac_file (s_8021X);
|
||||
nmc->allowed_fields[5].value = ca_cert_str;
|
||||
nmc->allowed_fields[6].value = nm_setting_802_1x_get_ca_path (s_8021X);
|
||||
nmc->allowed_fields[7].value = nm_setting_802_1x_get_subject_match (s_8021X);
|
||||
nmc->allowed_fields[6].value = (char *) nm_setting_802_1x_get_ca_path (s_8021X);
|
||||
nmc->allowed_fields[7].value = (char *) nm_setting_802_1x_get_subject_match (s_8021X);
|
||||
nmc->allowed_fields[8].value = alt_sub_match->str;
|
||||
nmc->allowed_fields[9].value = client_cert_str;
|
||||
nmc->allowed_fields[10].value = nm_setting_802_1x_get_phase1_peapver (s_8021X);
|
||||
nmc->allowed_fields[11].value = nm_setting_802_1x_get_phase1_peaplabel (s_8021X);
|
||||
nmc->allowed_fields[12].value = nm_setting_802_1x_get_phase1_fast_provisioning (s_8021X);
|
||||
nmc->allowed_fields[13].value = nm_setting_802_1x_get_phase2_auth (s_8021X);
|
||||
nmc->allowed_fields[14].value = nm_setting_802_1x_get_phase2_autheap (s_8021X);
|
||||
nmc->allowed_fields[10].value = (char *) nm_setting_802_1x_get_phase1_peapver (s_8021X);
|
||||
nmc->allowed_fields[11].value = (char *) nm_setting_802_1x_get_phase1_peaplabel (s_8021X);
|
||||
nmc->allowed_fields[12].value = (char *) nm_setting_802_1x_get_phase1_fast_provisioning (s_8021X);
|
||||
nmc->allowed_fields[13].value = (char *) nm_setting_802_1x_get_phase2_auth (s_8021X);
|
||||
nmc->allowed_fields[14].value = (char *) nm_setting_802_1x_get_phase2_autheap (s_8021X);
|
||||
nmc->allowed_fields[15].value = phase2_ca_cert_str;
|
||||
nmc->allowed_fields[16].value = nm_setting_802_1x_get_phase2_ca_path (s_8021X);
|
||||
nmc->allowed_fields[17].value = nm_setting_802_1x_get_phase2_subject_match (s_8021X);
|
||||
nmc->allowed_fields[16].value = (char *) nm_setting_802_1x_get_phase2_ca_path (s_8021X);
|
||||
nmc->allowed_fields[17].value = (char *) nm_setting_802_1x_get_phase2_subject_match (s_8021X);
|
||||
nmc->allowed_fields[18].value = phase2_alt_sub_match->str;
|
||||
nmc->allowed_fields[19].value = phase2_client_cert_str;
|
||||
nmc->allowed_fields[20].value = nm_setting_802_1x_get_password (s_8021X);
|
||||
nmc->allowed_fields[20].value = (char *) nm_setting_802_1x_get_password (s_8021X);
|
||||
nmc->allowed_fields[21].value = pswd_flags;
|
||||
nmc->allowed_fields[22].value = pswd_raw_str;
|
||||
nmc->allowed_fields[23].value = pswd_raw_flags;
|
||||
nmc->allowed_fields[24].value = private_key_str;
|
||||
nmc->allowed_fields[25].value = nm_setting_802_1x_get_private_key_password (s_8021X);
|
||||
nmc->allowed_fields[25].value = (char *) nm_setting_802_1x_get_private_key_password (s_8021X);
|
||||
nmc->allowed_fields[26].value = priv_key_pswd_flags;
|
||||
nmc->allowed_fields[27].value = phase2_private_key_str;
|
||||
nmc->allowed_fields[28].value = nm_setting_802_1x_get_phase2_private_key_password (s_8021X);
|
||||
nmc->allowed_fields[28].value = (char *) nm_setting_802_1x_get_phase2_private_key_password (s_8021X);
|
||||
nmc->allowed_fields[29].value = phase2_priv_key_pswd_flags;
|
||||
nmc->allowed_fields[30].value = nm_setting_802_1x_get_pin (s_8021X);
|
||||
nmc->allowed_fields[30].value = (char *) nm_setting_802_1x_get_pin (s_8021X);
|
||||
nmc->allowed_fields[31].value = pin_flags;
|
||||
nmc->allowed_fields[32].value = nm_setting_802_1x_get_system_ca_certs (s_8021X) ? _("yes") : _("no");
|
||||
|
||||
|
|
@ -1161,8 +1161,8 @@ setting_wireless_details (NMSettingWireless *s_wireless, NmCli *nmc)
|
|||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_WIRELESS_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = ssid_str;
|
||||
nmc->allowed_fields[2].value = nm_setting_wireless_get_mode (s_wireless);
|
||||
nmc->allowed_fields[3].value = nm_setting_wireless_get_band (s_wireless);
|
||||
nmc->allowed_fields[2].value = (char *) nm_setting_wireless_get_mode (s_wireless);
|
||||
nmc->allowed_fields[3].value = (char *) nm_setting_wireless_get_band (s_wireless);
|
||||
nmc->allowed_fields[4].value = channel_str;
|
||||
nmc->allowed_fields[5].value = bssid_str;
|
||||
nmc->allowed_fields[6].value = rate_str;
|
||||
|
|
@ -1172,7 +1172,7 @@ setting_wireless_details (NMSettingWireless *s_wireless, NmCli *nmc)
|
|||
nmc->allowed_fields[10].value = mac_blacklist->str;
|
||||
nmc->allowed_fields[11].value = strcmp (mtu_str, "0") ? mtu_str : _("auto");
|
||||
nmc->allowed_fields[12].value = seen_bssids->str;
|
||||
nmc->allowed_fields[13].value = nm_setting_wireless_get_security (s_wireless);
|
||||
nmc->allowed_fields[13].value = (char *) nm_setting_wireless_get_security (s_wireless);
|
||||
nmc->allowed_fields[14].value = nm_setting_wireless_get_hidden (s_wireless) ? _("yes") : _("no");
|
||||
|
||||
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX;
|
||||
|
|
@ -1235,22 +1235,22 @@ setting_wireless_security_details (NMSettingWirelessSecurity *s_wireless_sec, Nm
|
|||
leap_flags = secret_flags_to_string (nm_setting_wireless_security_get_leap_password_flags (s_wireless_sec));
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_WIRELESS_SECURITY_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_wireless_security_get_key_mgmt (s_wireless_sec);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_wireless_security_get_key_mgmt (s_wireless_sec);
|
||||
nmc->allowed_fields[2].value = wep_tx_keyidx_str;
|
||||
nmc->allowed_fields[3].value = nm_setting_wireless_security_get_auth_alg (s_wireless_sec);
|
||||
nmc->allowed_fields[3].value = (char *) nm_setting_wireless_security_get_auth_alg (s_wireless_sec);
|
||||
nmc->allowed_fields[4].value = protos->str;
|
||||
nmc->allowed_fields[5].value = pairwises->str;
|
||||
nmc->allowed_fields[6].value = groups->str;
|
||||
nmc->allowed_fields[7].value = nm_setting_wireless_security_get_leap_username (s_wireless_sec);
|
||||
nmc->allowed_fields[8].value = nm_setting_wireless_security_get_wep_key (s_wireless_sec, 0);
|
||||
nmc->allowed_fields[9].value = nm_setting_wireless_security_get_wep_key (s_wireless_sec, 1);
|
||||
nmc->allowed_fields[10].value = nm_setting_wireless_security_get_wep_key (s_wireless_sec, 2);
|
||||
nmc->allowed_fields[11].value = nm_setting_wireless_security_get_wep_key (s_wireless_sec, 3);
|
||||
nmc->allowed_fields[7].value = (char *) nm_setting_wireless_security_get_leap_username (s_wireless_sec);
|
||||
nmc->allowed_fields[8].value = (char *) nm_setting_wireless_security_get_wep_key (s_wireless_sec, 0);
|
||||
nmc->allowed_fields[9].value = (char *) nm_setting_wireless_security_get_wep_key (s_wireless_sec, 1);
|
||||
nmc->allowed_fields[10].value = (char *) nm_setting_wireless_security_get_wep_key (s_wireless_sec, 2);
|
||||
nmc->allowed_fields[11].value = (char *) nm_setting_wireless_security_get_wep_key (s_wireless_sec, 3);
|
||||
nmc->allowed_fields[12].value = wep_flags;
|
||||
nmc->allowed_fields[13].value = wep_key_type_str;
|
||||
nmc->allowed_fields[14].value = nm_setting_wireless_security_get_psk (s_wireless_sec);
|
||||
nmc->allowed_fields[14].value = (char *) nm_setting_wireless_security_get_psk (s_wireless_sec);
|
||||
nmc->allowed_fields[15].value = psk_flags;
|
||||
nmc->allowed_fields[16].value = nm_setting_wireless_security_get_leap_password (s_wireless_sec);
|
||||
nmc->allowed_fields[16].value = (char *) nm_setting_wireless_security_get_leap_password (s_wireless_sec);
|
||||
nmc->allowed_fields[17].value = leap_flags;
|
||||
|
||||
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX;
|
||||
|
|
@ -1378,16 +1378,16 @@ setting_ip4_config_details (NMSettingIP4Config *s_ip4, NmCli *nmc)
|
|||
}
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_IP4_CONFIG_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_ip4_config_get_method (s_ip4);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_ip4_config_get_method (s_ip4);
|
||||
nmc->allowed_fields[2].value = dns_str->str;
|
||||
nmc->allowed_fields[3].value = dns_search_str->str;
|
||||
nmc->allowed_fields[4].value = addr_str->str;
|
||||
nmc->allowed_fields[5].value = route_str->str;
|
||||
nmc->allowed_fields[6].value = nm_setting_ip4_config_get_ignore_auto_routes (s_ip4) ? _("yes") : _("no");
|
||||
nmc->allowed_fields[7].value = nm_setting_ip4_config_get_ignore_auto_dns (s_ip4) ? _("yes") : _("no");
|
||||
nmc->allowed_fields[8].value = nm_setting_ip4_config_get_dhcp_client_id (s_ip4);
|
||||
nmc->allowed_fields[8].value = (char *) nm_setting_ip4_config_get_dhcp_client_id (s_ip4);
|
||||
nmc->allowed_fields[9].value = nm_setting_ip4_config_get_dhcp_send_hostname (s_ip4) ? _("yes") : _("no");
|
||||
nmc->allowed_fields[10].value = nm_setting_ip4_config_get_dhcp_hostname (s_ip4);
|
||||
nmc->allowed_fields[10].value = (char *) nm_setting_ip4_config_get_dhcp_hostname (s_ip4);
|
||||
nmc->allowed_fields[11].value = nm_setting_ip4_config_get_never_default (s_ip4) ? _("yes") : _("no");
|
||||
nmc->allowed_fields[12].value = nm_setting_ip4_config_get_may_fail (s_ip4) ? _("yes") : _("no");
|
||||
|
||||
|
|
@ -1515,7 +1515,7 @@ setting_ip6_config_details (NMSettingIP6Config *s_ip6, NmCli *nmc)
|
|||
ip6_privacy_str = ip6_privacy_to_string (nm_setting_ip6_config_get_ip6_privacy (s_ip6));
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_IP6_CONFIG_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_ip6_config_get_method (s_ip6);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_ip6_config_get_method (s_ip6);
|
||||
nmc->allowed_fields[2].value = dns_str->str;
|
||||
nmc->allowed_fields[3].value = dns_search_str->str;
|
||||
nmc->allowed_fields[4].value = addr_str->str;
|
||||
|
|
@ -1525,7 +1525,7 @@ setting_ip6_config_details (NMSettingIP6Config *s_ip6, NmCli *nmc)
|
|||
nmc->allowed_fields[8].value = nm_setting_ip6_config_get_never_default (s_ip6) ? _("yes") : _("no");
|
||||
nmc->allowed_fields[9].value = nm_setting_ip6_config_get_may_fail (s_ip6) ? _("yes") : _("no");
|
||||
nmc->allowed_fields[10].value = ip6_privacy_str;
|
||||
nmc->allowed_fields[11].value = nm_setting_ip6_config_get_dhcp_hostname (s_ip6);
|
||||
nmc->allowed_fields[11].value = (char *) nm_setting_ip6_config_get_dhcp_hostname (s_ip6);
|
||||
|
||||
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 */
|
||||
|
|
@ -1650,9 +1650,9 @@ setting_pppoe_details (NMSettingPPPOE *s_pppoe, NmCli *nmc)
|
|||
pswd_flags = secret_flags_to_string (nm_setting_pppoe_get_password_flags (s_pppoe));
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_PPPOE_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_pppoe_get_service (s_pppoe);
|
||||
nmc->allowed_fields[2].value = nm_setting_pppoe_get_username (s_pppoe);
|
||||
nmc->allowed_fields[3].value = nm_setting_pppoe_get_password (s_pppoe);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_pppoe_get_service (s_pppoe);
|
||||
nmc->allowed_fields[2].value = (char *) nm_setting_pppoe_get_username (s_pppoe);
|
||||
nmc->allowed_fields[3].value = (char *) nm_setting_pppoe_get_password (s_pppoe);
|
||||
nmc->allowed_fields[4].value = pswd_flags;
|
||||
|
||||
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX;
|
||||
|
|
@ -1685,15 +1685,15 @@ setting_gsm_details (NMSettingGsm *s_gsm, NmCli *nmc)
|
|||
pin_flags = secret_flags_to_string (nm_setting_gsm_get_pin_flags (s_gsm));
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_GSM_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_gsm_get_number (s_gsm);
|
||||
nmc->allowed_fields[2].value = nm_setting_gsm_get_username (s_gsm);
|
||||
nmc->allowed_fields[3].value = nm_setting_gsm_get_password (s_gsm);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_gsm_get_number (s_gsm);
|
||||
nmc->allowed_fields[2].value = (char *) nm_setting_gsm_get_username (s_gsm);
|
||||
nmc->allowed_fields[3].value = (char *) nm_setting_gsm_get_password (s_gsm);
|
||||
nmc->allowed_fields[4].value = pswd_flags;
|
||||
nmc->allowed_fields[5].value = nm_setting_gsm_get_apn (s_gsm);
|
||||
nmc->allowed_fields[6].value = nm_setting_gsm_get_network_id (s_gsm);
|
||||
nmc->allowed_fields[5].value = (char *) nm_setting_gsm_get_apn (s_gsm);
|
||||
nmc->allowed_fields[6].value = (char *) nm_setting_gsm_get_network_id (s_gsm);
|
||||
nmc->allowed_fields[7].value = network_type_str;
|
||||
nmc->allowed_fields[8].value = allowed_bands_str;
|
||||
nmc->allowed_fields[9].value = nm_setting_gsm_get_pin (s_gsm);
|
||||
nmc->allowed_fields[9].value = (char *) nm_setting_gsm_get_pin (s_gsm);
|
||||
nmc->allowed_fields[10].value = pin_flags;
|
||||
nmc->allowed_fields[11].value = nm_setting_gsm_get_home_only (s_gsm) ? _("yes") : _("no");
|
||||
|
||||
|
|
@ -1726,9 +1726,9 @@ setting_cdma_details (NMSettingCdma *s_cdma, NmCli *nmc)
|
|||
pswd_flags = secret_flags_to_string (nm_setting_cdma_get_password_flags (s_cdma));
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_CDMA_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_cdma_get_number (s_cdma);
|
||||
nmc->allowed_fields[2].value = nm_setting_cdma_get_username (s_cdma);
|
||||
nmc->allowed_fields[3].value = nm_setting_cdma_get_password (s_cdma);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_cdma_get_number (s_cdma);
|
||||
nmc->allowed_fields[2].value = (char *) nm_setting_cdma_get_username (s_cdma);
|
||||
nmc->allowed_fields[3].value = (char *) nm_setting_cdma_get_password (s_cdma);
|
||||
nmc->allowed_fields[4].value = pswd_flags;
|
||||
|
||||
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX;
|
||||
|
|
@ -1761,7 +1761,7 @@ setting_bluetooth_details (NMSettingBluetooth *s_bluetooth, NmCli *nmc)
|
|||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_BLUETOOTH_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = bdaddr_str;
|
||||
nmc->allowed_fields[2].value = nm_setting_bluetooth_get_connection_type (s_bluetooth);
|
||||
nmc->allowed_fields[2].value = (char *) nm_setting_bluetooth_get_connection_type (s_bluetooth);
|
||||
|
||||
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 */
|
||||
|
|
@ -1842,8 +1842,8 @@ setting_vpn_details (NMSettingVPN *s_vpn, NmCli *nmc)
|
|||
nm_setting_vpn_foreach_secret (s_vpn, &vpn_data_item, secret_str);
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_VPN_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_vpn_get_service_type (s_vpn);
|
||||
nmc->allowed_fields[2].value = nm_setting_vpn_get_user_name (s_vpn);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_vpn_get_service_type (s_vpn);
|
||||
nmc->allowed_fields[2].value = (char *) nm_setting_vpn_get_user_name (s_vpn);
|
||||
nmc->allowed_fields[3].value = data_item_str->str;
|
||||
nmc->allowed_fields[4].value = secret_str->str;
|
||||
|
||||
|
|
@ -1878,7 +1878,7 @@ setting_wimax_details (NMSettingWimax *s_wimax, NmCli *nmc)
|
|||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_WIMAX_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = device_mac_str;
|
||||
nmc->allowed_fields[2].value = nm_setting_wimax_get_network_name (s_wimax);
|
||||
nmc->allowed_fields[2].value = (char *) nm_setting_wimax_get_network_name (s_wimax);
|
||||
|
||||
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 */
|
||||
|
|
@ -1912,8 +1912,8 @@ setting_infiniband_details (NMSettingInfiniband *s_infiniband, NmCli *nmc)
|
|||
nmc->allowed_fields[0].value = NM_SETTING_INFINIBAND_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = mac_str;
|
||||
nmc->allowed_fields[2].value = strcmp (mtu_str, "0") ? mtu_str : _("auto");
|
||||
nmc->allowed_fields[3].value = nm_setting_infiniband_get_transport_mode (s_infiniband);
|
||||
nmc->allowed_fields[4].value = nm_setting_infiniband_get_carrier_detect (s_infiniband);
|
||||
nmc->allowed_fields[3].value = (char *) nm_setting_infiniband_get_transport_mode (s_infiniband);
|
||||
nmc->allowed_fields[4].value = (char *) nm_setting_infiniband_get_carrier_detect (s_infiniband);
|
||||
|
||||
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 */
|
||||
|
|
@ -1950,7 +1950,7 @@ setting_bond_details (NMSettingBond *s_bond, NmCli *nmc)
|
|||
g_string_truncate (bond_options_s, bond_options_s->len-1); /* chop off trailing ',' */
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_BOND_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_bond_get_interface_name (s_bond);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_bond_get_interface_name (s_bond);
|
||||
nmc->allowed_fields[2].value = bond_options_s->str;
|
||||
|
||||
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX;
|
||||
|
|
@ -1982,13 +1982,13 @@ setting_vlan_details (NMSettingVlan *s_vlan, NmCli *nmc)
|
|||
vlan_egress_prio_str = vlan_priorities_to_string (s_vlan, NM_VLAN_EGRESS_MAP);
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_VLAN_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_vlan_get_interface_name (s_vlan);
|
||||
nmc->allowed_fields[2].value = nm_setting_vlan_get_parent (s_vlan);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_vlan_get_interface_name (s_vlan);
|
||||
nmc->allowed_fields[2].value = (char *) nm_setting_vlan_get_parent (s_vlan);
|
||||
nmc->allowed_fields[3].value = vlan_id_str;
|
||||
nmc->allowed_fields[4].value = vlan_flags_str;
|
||||
nmc->allowed_fields[5].value = vlan_ingress_prio_str;
|
||||
nmc->allowed_fields[6].value = vlan_egress_prio_str;
|
||||
nmc->allowed_fields[7].value = nm_setting_vlan_get_carrier_detect (s_vlan);
|
||||
nmc->allowed_fields[7].value = (char *) nm_setting_vlan_get_carrier_detect (s_vlan);
|
||||
|
||||
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 */
|
||||
|
|
@ -2019,11 +2019,11 @@ setting_adsl_details (NMSettingAdsl *s_adsl, NmCli *nmc)
|
|||
pswd_flags = secret_flags_to_string (nm_setting_adsl_get_password_flags (s_adsl));
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_ADSL_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_adsl_get_username (s_adsl);
|
||||
nmc->allowed_fields[2].value = nm_setting_adsl_get_password (s_adsl);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_adsl_get_username (s_adsl);
|
||||
nmc->allowed_fields[2].value = (char *) nm_setting_adsl_get_password (s_adsl);
|
||||
nmc->allowed_fields[3].value = pswd_flags;
|
||||
nmc->allowed_fields[4].value = nm_setting_adsl_get_protocol (s_adsl);
|
||||
nmc->allowed_fields[5].value = nm_setting_adsl_get_encapsulation (s_adsl);
|
||||
nmc->allowed_fields[4].value = (char *) nm_setting_adsl_get_protocol (s_adsl);
|
||||
nmc->allowed_fields[5].value = (char *) nm_setting_adsl_get_encapsulation (s_adsl);
|
||||
nmc->allowed_fields[6].value = g_strdup_printf ("%d", nm_setting_adsl_get_vpi (s_adsl));
|
||||
nmc->allowed_fields[7].value = g_strdup_printf ("%d", nm_setting_adsl_get_vci (s_adsl));
|
||||
|
||||
|
|
@ -2052,7 +2052,7 @@ setting_bridge_details (NMSettingBridge *s_bridge, NmCli *nmc)
|
|||
print_fields (nmc->print_fields, nmc->allowed_fields); /* Print field names */
|
||||
|
||||
nmc->allowed_fields[0].value = NM_SETTING_BRIDGE_SETTING_NAME;
|
||||
nmc->allowed_fields[1].value = nm_setting_bridge_get_interface_name (s_bridge);
|
||||
nmc->allowed_fields[1].value = (char *) nm_setting_bridge_get_interface_name (s_bridge);
|
||||
nmc->allowed_fields[2].value = nm_setting_bridge_get_stp (s_bridge) ? _("yes") : _("no");
|
||||
nmc->allowed_fields[3].value = g_strdup_printf ("%u", nm_setting_bridge_get_priority (s_bridge));
|
||||
nmc->allowed_fields[4].value = g_strdup_printf ("%u", nm_setting_bridge_get_forward_delay (s_bridge));
|
||||
|
|
|
|||
|
|
@ -189,14 +189,14 @@ nmc_string_screen_width (const char *start, const char *end)
|
|||
}
|
||||
|
||||
void
|
||||
set_val_str (NmcOutputField fields_array[], guint32 idx, const char *value)
|
||||
set_val_str (NmcOutputField fields_array[], guint32 idx, char *value)
|
||||
{
|
||||
fields_array[idx].flags = 0;
|
||||
fields_array[idx].value = value;
|
||||
}
|
||||
|
||||
void
|
||||
set_val_arr (NmcOutputField fields_array[], guint32 idx, const char **value)
|
||||
set_val_arr (NmcOutputField fields_array[], guint32 idx, char **value)
|
||||
{
|
||||
fields_array[idx].flags = NMC_OF_FLAG_ARRAY;
|
||||
fields_array[idx].value = value;
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@ char *nmc_ip6_address_as_string (const struct in6_addr *ip, GError **error);
|
|||
void nmc_terminal_erase_line (void);
|
||||
void nmc_terminal_show_progress (const char *str);
|
||||
int nmc_string_screen_width (const char *start, const char *end);
|
||||
void set_val_str (NmcOutputField fields_array[], guint32 index, const char *value);
|
||||
void set_val_arr (NmcOutputField fields_array[], guint32 index, const char **value);
|
||||
void set_val_str (NmcOutputField fields_array[], guint32 index, char *value);
|
||||
void set_val_arr (NmcOutputField fields_array[], guint32 index, char **value);
|
||||
GArray *parse_output_fields (const char *fields_str, const NmcOutputField fields_array[], GError **error);
|
||||
gboolean nmc_terse_option_check (NMCPrintOutput print_output, const char *fields, GError **error);
|
||||
void print_fields (const NmcPrintFields fields, const NmcOutputField field_values[]);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue