fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-15 01:00:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: add property-info for NMSettingProxy

Browse source
This commit is contained in:
Thomas Haller 2017-03-25 15:52:03 +01:00
parent b9029a798e
commit 89b5685695
4 changed files with 65 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clients/cli/connections.c
View file

@ -163,13 +163,13 @@ NmcOutputField nmc_fields_con_show[] = {
/* Available settings for 'connection show <con>' - profile part */
NmcOutputField nmc_fields_settings_names[] = {
SETTING_FIELD_TYPE (NM_SETTING_CONNECTION_SETTING_NAME, NM_META_SETTING_TYPE_CONNECTION),
SETTING_FIELD_TYPE (NM_SETTING_CONNECTION_SETTING_NAME, NM_META_SETTING_TYPE_CONNECTION),
SETTING_FIELD (NM_SETTING_WIRED_SETTING_NAME, nmc_fields_setting_wired + 1), /* 1 */
SETTING_FIELD (NM_SETTING_802_1X_SETTING_NAME, nmc_fields_setting_8021X + 1), /* 2 */
SETTING_FIELD (NM_SETTING_WIRELESS_SETTING_NAME, nmc_fields_setting_wireless + 1), /* 3 */
SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, nmc_fields_setting_wireless_security + 1), /* 4 */
SETTING_FIELD_TYPE (NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_META_SETTING_TYPE_IP4_CONFIG),
SETTING_FIELD_TYPE (NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_META_SETTING_TYPE_IP6_CONFIG),
SETTING_FIELD_TYPE (NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_META_SETTING_TYPE_IP4_CONFIG), /* 5 */
SETTING_FIELD_TYPE (NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_META_SETTING_TYPE_IP6_CONFIG), /* 6 */
SETTING_FIELD (NM_SETTING_SERIAL_SETTING_NAME, nmc_fields_setting_serial + 1), /* 7 */
SETTING_FIELD (NM_SETTING_PPP_SETTING_NAME, nmc_fields_setting_ppp + 1), /* 8 */
SETTING_FIELD (NM_SETTING_PPPOE_SETTING_NAME, nmc_fields_setting_pppoe + 1), /* 9 */
@ -193,7 +193,7 @@ NmcOutputField nmc_fields_settings_names[] = {
SETTING_FIELD (NM_SETTING_MACSEC_SETTING_NAME, nmc_fields_setting_macsec + 1), /* 27 */
SETTING_FIELD (NM_SETTING_MACVLAN_SETTING_NAME, nmc_fields_setting_macvlan + 1), /* 28 */
SETTING_FIELD (NM_SETTING_VXLAN_SETTING_NAME, nmc_fields_setting_vxlan + 1), /* 29 */
SETTING_FIELD (NM_SETTING_PROXY_SETTING_NAME, nmc_fields_setting_proxy + 1), /* 30 */
SETTING_FIELD_TYPE (NM_SETTING_PROXY_SETTING_NAME, NM_META_SETTING_TYPE_PROXY), /* 30 */
SETTING_FIELD (NM_SETTING_DUMMY_SETTING_NAME, nmc_fields_setting_dummy + 1), /* 31 */
{NULL, NULL, 0, NULL, NULL, FALSE, FALSE, 0}
};

1
clients/cli/nmcli.c
View file

@ -175,6 +175,7 @@ complete_fields (const char *prefix)
complete_field (h, "ip-tunnel", nmc_fields_setting_ip_tunnel);
complete_field (h, "macvlan", nmc_fields_setting_macvlan);
complete_field (h, "vxlan", nmc_fields_setting_vxlan);
complete_field_new (h, "proxy", NM_META_SETTING_TYPE_PROXY);
g_hash_table_foreach (h, complete_one, (gpointer) prefix);
g_hash_table_destroy (h);

134
clients/cli/settings.c
View file

@ -246,6 +246,13 @@ _remove_fcn_nmc (const NmcSettingInfo *setting_info,
/*****************************************************************************/
static const char *const*
_values_fcn_nmc (const NmcSettingInfo *setting_info,
const NmcPropertyInfo *property_info)
{
return property_info->property_typ_data->nmc.values_fcn (NULL, property_info->property_name);
}
static const char *const*
_values_fcn_nmc_gobject_enum (const NmcSettingInfo *setting_info,
const NmcPropertyInfo *property_info)
@ -1085,21 +1092,8 @@ NmcOutputField nmc_fields_setting_vxlan[] = {
NM_SETTING_VXLAN_L2_MISS","\
NM_SETTING_VXLAN_L3_MISS
/* Available fields for NM_SETTING_PROXY_SETTING_NAME */
NmcOutputField nmc_fields_setting_proxy[] = {
SETTING_FIELD ("name"), /* 0 */
SETTING_FIELD (NM_SETTING_PROXY_METHOD), /* 1 */
SETTING_FIELD (NM_SETTING_PROXY_BROWSER_ONLY), /* 2 */
SETTING_FIELD (NM_SETTING_PROXY_PAC_URL), /* 3 */
SETTING_FIELD (NM_SETTING_PROXY_PAC_SCRIPT), /* 4 */
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_PROXY_ALL "name"","\
NM_SETTING_PROXY_METHOD","\
NM_SETTING_PROXY_BROWSER_ONLY","\
NM_SETTING_PROXY_PAC_URL","\
NM_SETTING_PROXY_PAC_SCRIPT
/*----------------------------------------------------------------------------*/
/*****************************************************************************/
static char *
wep_key_type_to_string (NMWepKeyType type)
{
@ -4629,11 +4623,6 @@ DEFINE_GETTER (nmc_property_pppoe_get_password, NM_SETTING_PPPOE_PASSWORD)
DEFINE_SECRET_FLAGS_GETTER (nmc_property_pppoe_get_password_flags, NM_SETTING_PPPOE_PASSWORD_FLAGS)
/* --- NM_SETTING_PROXY_SETTING_NAME property functions --- */
DEFINE_GETTER (nmc_property_proxy_get_browser_only, NM_SETTING_PROXY_BROWSER_ONLY)
DEFINE_GETTER (nmc_property_proxy_get_pac_url, NM_SETTING_PROXY_PAC_URL)
DEFINE_GETTER (nmc_property_proxy_get_pac_script, NM_SETTING_PROXY_PAC_SCRIPT)
static char *
nmc_property_proxy_get_method (NMSetting *setting, NmcPropertyGetType get_type)
{
@ -5847,7 +5836,7 @@ nmc_property_wifi_set_psk (NMSetting *setting, const char *prop, const char *val
return TRUE;
}
/*----------------------------------------------------------------------------*/
/*****************************************************************************/
static void
nmc_value_transform_bool_string (const GValue *src_value,
@ -5870,7 +5859,7 @@ register_nmcli_value_transforms (void)
g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_STRING, nmc_value_transform_char_string);
}
/*----------------------------------------------------------------------------*/
/*****************************************************************************/
/* Main hash table storing function pointer for manipulating properties */
static GHashTable *nmc_properties = NULL;
@ -6246,7 +6235,7 @@ nmc_setting_custom_init (NMSetting *setting)
}
}
/*----------------------------------------------------------------------------*/
/*****************************************************************************/
static inline void
_nmc_add_prop_funcs (const char *key,
@ -8030,36 +8019,6 @@ nmc_properties_init (void)
NULL,
NULL,
NULL);
/* Add editable properties for NM_SETTING_PROXY_SETTING_NAME */
nmc_add_prop_funcs (NM_SETTING_PROXY_SETTING_NAME""NM_SETTING_PROXY_METHOD,
nmc_property_proxy_get_method,
nmc_property_proxy_set_method,
NULL,
NULL,
nmc_property_proxy_allowed_method,
NULL);
nmc_add_prop_funcs (NM_SETTING_PROXY_SETTING_NAME""NM_SETTING_PROXY_BROWSER_ONLY,
nmc_property_proxy_get_browser_only,
nmc_property_set_bool,
NULL,
NULL,
NULL,
NULL);
nmc_add_prop_funcs (NM_SETTING_PROXY_SETTING_NAME""NM_SETTING_PROXY_PAC_URL,
nmc_property_proxy_get_pac_url,
nmc_property_set_string,
NULL,
NULL,
NULL,
NULL);
nmc_add_prop_funcs (NM_SETTING_PROXY_SETTING_NAME""NM_SETTING_PROXY_PAC_SCRIPT,
nmc_property_proxy_get_pac_script,
nmc_property_proxy_set_pac_script,
NULL,
NULL,
NULL,
NULL);
}
void
@ -8449,7 +8408,7 @@ nmc_property_set_gvalue (NMSetting *setting, const char *prop, GValue *value)
return FALSE;
}
/*----------------------------------------------------------------------------*/
/*****************************************************************************/
#define GET_SECRET(show, setting, func) \
(show ? func (setting, NMC_PROPERTY_GET_PRETTY) : g_strdup (_("<hidden>")))
@ -9421,35 +9380,6 @@ setting_vxlan_details (const NmcSettingInfo *setting_info, NMSetting *setting, N
return TRUE;
}
static gboolean
setting_proxy_details (const NmcSettingInfo *setting_info, NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets)
{
NMSettingProxy *s_proxy = NM_SETTING_PROXY (setting);
NmcOutputField *tmpl, *arr;
size_t tmpl_len;
g_return_val_if_fail (NM_IS_SETTING_PROXY (s_proxy), FALSE);
tmpl = nmc_fields_setting_proxy;
tmpl_len = sizeof (nmc_fields_setting_proxy);
nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_PROXY_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_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
set_val_str (arr, 1, nmc_property_proxy_get_method (setting, NMC_PROPERTY_GET_PRETTY));
set_val_str (arr, 2, nmc_property_proxy_get_browser_only (setting, NMC_PROPERTY_GET_PRETTY));
set_val_str (arr, 3, nmc_property_proxy_get_pac_url (setting, NMC_PROPERTY_GET_PRETTY));
set_val_str (arr, 4, nmc_property_proxy_get_pac_script (setting, NMC_PROPERTY_GET_PRETTY));
g_ptr_array_add (nmc->output_data, arr);
print_data (nmc); /* Print all data */
return TRUE;
}
/*****************************************************************************/
#define DEFINE_PROPERTY_TYPE(...) \
@ -9977,6 +9907,41 @@ static const NmcPropertyInfo properties_setting_ip6_config[] = {
},
};
static const NmcPropertyInfo properties_setting_proxy[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_PROXY_METHOD),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_nmc,
.set_fcn = _set_fcn_nmc,
.values_fcn = _values_fcn_nmc,
),
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (nmc,
.get_fcn = nmc_property_proxy_get_method,
.set_fcn = nmc_property_proxy_set_method,
.values_fcn = nmc_property_proxy_allowed_method,
),
},
{
.property_name = N_ (NM_SETTING_PROXY_BROWSER_ONLY),
.property_type = &_pt_gobject_bool
},
{
.property_name = N_ (NM_SETTING_PROXY_PAC_URL),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_PROXY_PAC_SCRIPT),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_nmc,
),
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (nmc,
.set_fcn = nmc_property_proxy_set_pac_script,
),
},
};
const NmcSettingInfo nmc_setting_infos[_NM_META_SETTING_TYPE_NUM] = {
[NM_META_SETTING_TYPE_802_1X] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_802_1X],
@ -10059,7 +10024,8 @@ const NmcSettingInfo nmc_setting_infos[_NM_META_SETTING_TYPE_NUM] = {
},
[NM_META_SETTING_TYPE_PROXY] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_PROXY],
.get_setting_details = setting_proxy_details,
.properties = properties_setting_proxy,
.properties_num = G_N_ELEMENTS (properties_setting_proxy),
},
[NM_META_SETTING_TYPE_SERIAL] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_SERIAL],

18
clients/cli/settings.h
View file

@ -67,13 +67,16 @@ struct _NmcPropertyTypData {
gboolean (*set_fcn) (NMSetting *setting, const char *property_name, const char *value, GError **error);
gboolean (*remove_fcn) (NMSetting *setting, const char *property_name, const char *option, guint32 idx, GError **error);
union {
struct {
GType (*get_gtype) (void);
bool has_minmax:1;
int min;
int max;
} gobject_enum;
} values_data;
union {
struct {
GType (*get_gtype) (void);
bool has_minmax:1;
int min;
int max;
} gobject_enum;
} values_data;
const char *const* (*values_fcn) (NMSetting *setting, const char *prop);
};
} nmc;
};
const char *const*values_static;
@ -177,7 +180,6 @@ extern NmcOutputField nmc_fields_setting_ip_tunnel[];
extern NmcOutputField nmc_fields_setting_macvlan[];
extern NmcOutputField nmc_fields_setting_macsec[];
extern NmcOutputField nmc_fields_setting_vxlan[];
extern NmcOutputField nmc_fields_setting_proxy[];
extern NmcOutputField nmc_fields_setting_dummy[];
#endif /* NMC_SETTINGS_H */