Commit 29636535 authored by Lubomir Rintel's avatar Lubomir Rintel 🥕

client: support 6lowpan setting

parent 3cd93222
...@@ -661,6 +661,7 @@ const NmcMetaGenericInfo *const metagen_con_active_general[_NMC_GENERIC_INFO_TYP ...@@ -661,6 +661,7 @@ const NmcMetaGenericInfo *const metagen_con_active_general[_NMC_GENERIC_INFO_TYP
NM_SETTING_MACVLAN_SETTING_NAME"," \ NM_SETTING_MACVLAN_SETTING_NAME"," \
NM_SETTING_VXLAN_SETTING_NAME"," \ NM_SETTING_VXLAN_SETTING_NAME"," \
NM_SETTING_WPAN_SETTING_NAME","\ NM_SETTING_WPAN_SETTING_NAME","\
NM_SETTING_6LOWPAN_SETTING_NAME","\
NM_SETTING_PROXY_SETTING_NAME"," \ NM_SETTING_PROXY_SETTING_NAME"," \
NM_SETTING_TC_CONFIG_SETTING_NAME NM_SETTING_TC_CONFIG_SETTING_NAME
// NM_SETTING_DUMMY_SETTING_NAME // NM_SETTING_DUMMY_SETTING_NAME
...@@ -894,6 +895,7 @@ usage_connection_add (void) ...@@ -894,6 +895,7 @@ usage_connection_add (void)
" wpan: [short-addr <0x0000-0xffff>]\n\n" " wpan: [short-addr <0x0000-0xffff>]\n\n"
" [pan-id <0x0000-0xffff>]\n\n" " [pan-id <0x0000-0xffff>]\n\n"
" [mac <MAC address>]\n\n" " [mac <MAC address>]\n\n"
" 6lowpan: dev <parent device (connection UUID, ifname, or MAC)>\n"
" dummy:\n\n" " dummy:\n\n"
" SLAVE_OPTIONS:\n" " SLAVE_OPTIONS:\n"
" bridge: [priority <0-63>]\n" " bridge: [priority <0-63>]\n"
......
...@@ -7488,6 +7488,19 @@ static const NMMetaPropertyInfo *const property_infos_WPAN[] = { ...@@ -7488,6 +7488,19 @@ static const NMMetaPropertyInfo *const property_infos_WPAN[] = {
NULL NULL
}; };
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_6LOWPAN
static const NMMetaPropertyInfo *const property_infos_6LOWPAN[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_6LOWPAN_PARENT,
.is_cli_option = TRUE,
.property_alias = "dev",
.inf_flags = NM_META_PROPERTY_INF_FLAG_REQD,
.prompt = N_("IEEE 802.15.4 (WPAN) parent device or connection UUID"),
.property_type = &_pt_gobject_string,
),
NULL
};
/*****************************************************************************/ /*****************************************************************************/
static void static void
...@@ -7649,6 +7662,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN) ...@@ -7649,6 +7662,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
#define SETTING_PRETTY_NAME_WIRELESS N_("Wi-Fi connection") #define SETTING_PRETTY_NAME_WIRELESS N_("Wi-Fi connection")
#define SETTING_PRETTY_NAME_WIRELESS_SECURITY N_("Wi-Fi security settings") #define SETTING_PRETTY_NAME_WIRELESS_SECURITY N_("Wi-Fi security settings")
#define SETTING_PRETTY_NAME_WPAN N_("WPAN settings") #define SETTING_PRETTY_NAME_WPAN N_("WPAN settings")
#define SETTING_PRETTY_NAME_6LOWPAN N_("6LOWPAN settings")
#define NM_META_SETTING_VALID_PARTS(...) \ #define NM_META_SETTING_VALID_PARTS(...) \
((const NMMetaSettingValidPartItem *const[]) { __VA_ARGS__ NULL }) ((const NMMetaSettingValidPartItem *const[]) { __VA_ARGS__ NULL })
...@@ -7676,6 +7690,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = { ...@@ -7676,6 +7690,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
.pretty_name = SETTING_PRETTY_NAME_##type, \ .pretty_name = SETTING_PRETTY_NAME_##type, \
__VA_ARGS__ \ __VA_ARGS__ \
} }
SETTING_INFO (6LOWPAN,
.valid_parts = NM_META_SETTING_VALID_PARTS (
NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE),
NM_META_SETTING_VALID_PART_ITEM (6LOWPAN, TRUE),
),
),
SETTING_INFO (802_1X), SETTING_INFO (802_1X),
SETTING_INFO (ADSL, SETTING_INFO (ADSL,
.valid_parts = NM_META_SETTING_VALID_PARTS ( .valid_parts = NM_META_SETTING_VALID_PARTS (
......
...@@ -2014,6 +2014,15 @@ It's equivalent to the <literal>+bond.options 'option=value'</literal> syntax.</ ...@@ -2014,6 +2014,15 @@ It's equivalent to the <literal>+bond.options 'option=value'</literal> syntax.</
</tbody> </tbody>
</tgroup></table> </tgroup></table>
<table><title>6LoWPAN options</title><tgroup cols="2">
<thead>
<row><entry>Alias</entry><entry>Property</entry></row>
</thead>
<tbody>
<row><entry align="left">dev</entry><entry align="left"><link linkend="nm-settings.property.6lowpan.dev">6lowpan.parent</link></entry></row>
</tbody>
</tgroup></table>
<table><title>IPv4 options</title><tgroup cols="3"> <table><title>IPv4 options</title><tgroup cols="3">
<thead> <thead>
<row><entry>Alias</entry><entry>Property</entry><entry>Note</entry></row> <row><entry>Alias</entry><entry>Property</entry><entry>Note</entry></row>
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "nm-meta-setting.h" #include "nm-meta-setting.h"
#include "nm-setting-6lowpan.h"
#include "nm-setting-8021x.h" #include "nm-setting-8021x.h"
#include "nm-setting-adsl.h" #include "nm-setting-adsl.h"
#include "nm-setting-bluetooth.h" #include "nm-setting-bluetooth.h"
...@@ -146,6 +147,11 @@ const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[] = { ...@@ -146,6 +147,11 @@ const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[] = {
/*****************************************************************************/ /*****************************************************************************/
const NMMetaSettingInfo nm_meta_setting_infos[] = { const NMMetaSettingInfo nm_meta_setting_infos[] = {
[NM_META_SETTING_TYPE_6LOWPAN] = {
.meta_type = NM_META_SETTING_TYPE_6LOWPAN,
.setting_name = NM_SETTING_6LOWPAN_SETTING_NAME,
.get_setting_gtype = nm_setting_6lowpan_get_type,
},
[NM_META_SETTING_TYPE_802_1X] = { [NM_META_SETTING_TYPE_802_1X] = {
.meta_type = NM_META_SETTING_TYPE_802_1X, .meta_type = NM_META_SETTING_TYPE_802_1X,
.setting_name = NM_SETTING_802_1X_SETTING_NAME, .setting_name = NM_SETTING_802_1X_SETTING_NAME,
......
...@@ -56,6 +56,7 @@ extern const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[_NM_SETTI ...@@ -56,6 +56,7 @@ extern const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[_NM_SETTI
/*****************************************************************************/ /*****************************************************************************/
typedef enum { typedef enum {
NM_META_SETTING_TYPE_6LOWPAN,
NM_META_SETTING_TYPE_802_1X, NM_META_SETTING_TYPE_802_1X,
NM_META_SETTING_TYPE_ADSL, NM_META_SETTING_TYPE_ADSL,
NM_META_SETTING_TYPE_BLUETOOTH, NM_META_SETTING_TYPE_BLUETOOTH,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment