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

cli: implement NM_SETTING_VPN_DATA with the optionlist setter

Browse source
This commit is contained in:
Thomas Haller 2019-03-19 08:52:08 +01:00
parent bcee2d7cc9
commit e58ec47d1b
2 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
clients/common/nm-meta-setting-desc.c
View file

@ -1709,6 +1709,7 @@ _set_fcn_optionlist (ARGS_SET_FCN)
strv = nm_utils_strsplit_set (value, ",", FALSE);
for (iter = strv; iter && *iter; iter++) {
const char *opt_name;
const char *opt_value;
char *left;
char *right;
@ -1717,10 +1718,14 @@ _set_fcn_optionlist (ARGS_SET_FCN)
/* FIXME: support backslash escaping for the option list. */
right = strchr (left, '=');
if (!right) {
g_set_error (error, 1, 0, _("'%s' is not valid; use <option>=<value>"), *iter);
if ( !right
|| left == right) {
nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT,
_("'%s' is not valid; use <option>=<value>"),
left);
return FALSE;
}
*right++ = '\0';
right = nm_str_skip_leading_spaces (right);
@ -1744,11 +1749,27 @@ _set_fcn_optionlist (ARGS_SET_FCN)
} else
opt_name = left;
if (!property_info->property_typ_data->subtype.optionlist.add_fcn (setting,
opt_name,
right,
error))
opt_value = right;
if ( opt_value[0] == '\0'
&& property_info->property_typ_data->subtype.optionlist.no_empty_value) {
nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT,
_("cannot set empty \"%s\" option"),
opt_name);
return FALSE;
}
if (property_info->property_typ_data->subtype.optionlist.add_fcn) {
if (!property_info->property_typ_data->subtype.optionlist.add_fcn (setting,
opt_name,
opt_value,
error))
return FALSE;
} else {
property_info->property_typ_data->subtype.optionlist.add2_fcn (setting,
opt_name,
opt_value);
}
}
return TRUE;
}
@ -4141,13 +4162,6 @@ _validate_vpn_hash_value (const char *option, const char *value, GError **error)
return value;
}
DEFINE_SETTER_OPTIONS (_set_fcn_vpn_data,
NM_SETTING_VPN,
NMSettingVpn,
nm_setting_vpn_add_data_item,
NULL,
_validate_vpn_hash_value)
static gboolean
_remove_fcn_vpn_data (ARGS_REMOVE_FCN)
{
@ -4728,6 +4742,8 @@ static const NMMetaPropertyType _pt_multilist = {
.remove_fcn = _remove_fcn_multilist,
};
#define OPTIONLIST_ADD2_FCN(type, func) (((func) == ((void (*) (type *, const char *, const char *)) (func))) ? ((void (*) (NMSetting *, const char *, const char *)) (func)) : NULL)
/*****************************************************************************/
#include "settings-docs.h"
@ -6929,9 +6945,13 @@ static const NMMetaPropertyInfo *const property_infos_VPN[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_VPN_DATA,
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_vpn_data,
.set_fcn = _set_fcn_vpn_data,
.set_fcn = _set_fcn_optionlist,
.remove_fcn = _remove_fcn_vpn_data,
),
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (optionlist,
.add2_fcn = OPTIONLIST_ADD2_FCN (NMSettingVpn, nm_setting_vpn_add_data_item),
.no_empty_value = TRUE,
),
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_VPN_SECRETS,
.is_secret = TRUE,

4
clients/common/nm-meta-setting-desc.h
View file

@ -282,6 +282,10 @@ struct _NMMetaPropertyTypData {
const char *option,
const char *value,
GError **error);
void (*add2_fcn) (NMSetting *setting,
const char *option,
const char *value);
bool no_empty_value:1;
} optionlist;
struct {
guint32 (*get_fcn) (NMSetting *setting);