summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2017-04-24 14:39:46 +0200
committerLubomir Rintel <lkundrak@v3.sk>2017-04-30 13:58:57 +0200
commit3380e64afc61bdedb43debb60ea404f98b90e297 (patch)
tree278e7be785c3ac7c9c1b8be7414b9cc6a35b27e2
parentdaff9033646845342b233e67943870252f2289ec (diff)
downloadNetworkManager-3380e64afc61bdedb43debb60ea404f98b90e297.tar.gz
cli: add WPS properties
-rw-r--r--clients/common/nm-meta-setting-desc.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 6807735937..cef32a4518 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -1034,7 +1034,6 @@ fail:
max = property_info->property_typ_data->subtype.gobject_enum.max;
}
}
-
valid_all = nm_utils_enum_get_values (gtype, min, max);
valid_str = g_strjoinv (",", (char **) valid_all);
g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT,
@@ -6994,6 +6993,20 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS,
.property_type = &_pt_gobject_secret_flags,
),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WPS,
+ .property_type = &_pt_gobject_enum,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+ PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+ .get_gtype = nm_802_11_wps_flags_get_type,
+ .min = NM_802_11_WPS_AUTO,
+ .max = G_MAXINT,
+ ),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WPS_PIN,
+ .is_secret = TRUE,
+ .property_type = &_pt_gobject_string,
+ ),
NULL
};