summaryrefslogtreecommitdiff
path: root/clients/common/nm-meta-setting-desc.c
diff options
context:
space:
mode:
authorBenjamin Berg <bberg@redhat.com>2018-10-10 17:23:42 +0200
committerThomas Haller <thaller@redhat.com>2019-01-27 23:45:11 +0100
commit42e60e327f92b7469fa1584682c09771017990fb (patch)
treea209e93e797be446cd002646e9e760ca896c031a /clients/common/nm-meta-setting-desc.c
parentc7d6e55ed7ebbed23f620c76329a773a38511a9d (diff)
downloadNetworkManager-42e60e327f92b7469fa1584682c09771017990fb.tar.gz
core: Add basic P2P Wi-Fi Settings
The support is rather basic and only allows connecting to a specific peer. However, this is actually already enough for many usecases.
Diffstat (limited to 'clients/common/nm-meta-setting-desc.c')
-rw-r--r--clients/common/nm-meta-setting-desc.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 4befce259a..6b76d80be3 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -7843,6 +7843,27 @@ static const NMMetaPropertyInfo *const property_infos_6LOWPAN[] = {
NULL
};
+#undef _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_P2P_WIRELESS
+static const NMMetaPropertyInfo *const property_infos_P2P_WIRELESS[] = {
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_P2P_WIRELESS_PEER,
+ .is_cli_option = TRUE,
+ .property_alias = "peer",
+ .inf_flags = NM_META_PROPERTY_INF_FLAG_REQD,
+ .prompt = N_("Peer"),
+ .property_type = &_pt_gobject_mac,
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WPS_METHOD,
+ .property_type = &_pt_gobject_enum,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+ PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+ .get_gtype = nm_setting_wireless_security_wps_method_get_type,
+ ),
+ ),
+ ),
+ NULL
+};
+
/*****************************************************************************/
static void
@@ -8008,6 +8029,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
#define SETTING_PRETTY_NAME_WIRELESS_SECURITY N_("Wi-Fi security settings")
#define SETTING_PRETTY_NAME_WPAN N_("WPAN settings")
#define SETTING_PRETTY_NAME_6LOWPAN N_("6LOWPAN settings")
+#define SETTING_PRETTY_NAME_P2P_WIRELESS N_("P2P Wi-Fi connection")
#define NM_META_SETTING_VALID_PARTS(...) \
((const NMMetaSettingValidPartItem *const[]) { __VA_ARGS__ NULL })
@@ -8282,6 +8304,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
NM_META_SETTING_VALID_PART_ITEM (WPAN, TRUE),
),
),
+ SETTING_INFO (P2P_WIRELESS,
+ .valid_parts = NM_META_SETTING_VALID_PARTS (
+ NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE),
+ NM_META_SETTING_VALID_PART_ITEM (P2P_WIRELESS, TRUE),
+ ),
+ ),
};
/*****************************************************************************/