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

clients: implement macvlan.mode property as enum

Browse source
This commit is contained in:
Thomas Haller 2017-05-20 21:45:45 +02:00
parent 5a98837b23
commit 3341e89e7c
1 changed files with 1 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3808,58 +3808,6 @@ _set_fcn_macsec_validation (ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static gconstpointer
_get_fcn_macvlan_mode (ARGS_GET_FCN)
{
NMSettingMacvlan *s_macvlan = NM_SETTING_MACVLAN (setting);
NMSettingMacvlanMode mode;
char *tmp, *str;
RETURN_UNSUPPORTED_GET_TYPE ();
mode = nm_setting_macvlan_get_mode (s_macvlan);
tmp = nm_utils_enum_to_str (nm_setting_macvlan_mode_get_type (), mode);
if (get_type != NM_META_ACCESSOR_GET_TYPE_PRETTY)
str = tmp ?: g_strdup ("");
else {
str = g_strdup_printf ("%d (%s)", mode, tmp ?: "");
g_free (tmp);
}
RETURN_STR_TO_FREE (str);
}
static gboolean
_set_fcn_macvlan_mode (ARGS_SET_FCN)
{
NMSettingMacvlanMode mode;
gs_free const char **options = NULL;
gs_free char *options_str = NULL;
long int t;
gboolean ret;
if (nmc_string_to_int_base (value, 0, TRUE, 0, _NM_SETTING_MACVLAN_MODE_NUM - 1, &t))
mode = (NMSettingMacvlanMode) t;
else {
ret = nm_utils_enum_from_str (nm_setting_macvlan_mode_get_type (), value,
(int *) &mode, NULL);
if (!ret) {
options = nm_utils_enum_get_values (nm_setting_macvlan_mode_get_type(),
NM_SETTING_MACVLAN_MODE_UNKNOWN + 1,
G_MAXINT);
options_str = g_strjoinv (",", (char **) options);
g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
value, options_str);
return FALSE;
}
}
g_object_set (setting, property_info->property_name, (guint) mode, NULL);
return TRUE;
}
static gconstpointer static gconstpointer
_get_fcn_olpc_mesh_ssid (ARGS_GET_FCN) _get_fcn_olpc_mesh_ssid (ARGS_GET_FCN)
{ {
@ -6200,11 +6148,7 @@ static const NMMetaPropertyInfo *const property_infos_MACVLAN[] = {
.property_alias = "mode", .property_alias = "mode",
.inf_flags = NM_META_PROPERTY_INF_FLAG_REQD, .inf_flags = NM_META_PROPERTY_INF_FLAG_REQD,
.prompt = NM_META_TEXT_PROMPT_MACVLAN_MODE, .prompt = NM_META_TEXT_PROMPT_MACVLAN_MODE,
.property_type = DEFINE_PROPERTY_TYPE ( .property_type = &_pt_gobject_enum,
.get_fcn = _get_fcn_macvlan_mode,
.set_fcn = _set_fcn_macvlan_mode,
.values_fcn = _values_fcn_gobject_enum,
),
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum, .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
.get_gtype = nm_setting_macvlan_mode_get_type, .get_gtype = nm_setting_macvlan_mode_get_type,
.min = NM_SETTING_MACVLAN_MODE_UNKNOWN + 1, .min = NM_SETTING_MACVLAN_MODE_UNKNOWN + 1,