Commit 09090f26 authored by Thomas Haller's avatar Thomas Haller

wifi-p2p: rename Wi-Fi P2P

After renaming the files, also rename all the content
to follow the "Wi-Fi P2P" naming scheme.
parent 0420fa1f
...@@ -431,8 +431,6 @@ introspection_sources = \ ...@@ -431,8 +431,6 @@ introspection_sources = \
introspection/org.freedesktop.NetworkManager.Device.OvsInterface.h \ introspection/org.freedesktop.NetworkManager.Device.OvsInterface.h \
introspection/org.freedesktop.NetworkManager.Device.OvsPort.c \ introspection/org.freedesktop.NetworkManager.Device.OvsPort.c \
introspection/org.freedesktop.NetworkManager.Device.OvsPort.h \ introspection/org.freedesktop.NetworkManager.Device.OvsPort.h \
introspection/org.freedesktop.NetworkManager.Device.P2PWireless.c \
introspection/org.freedesktop.NetworkManager.Device.P2PWireless.h \
introspection/org.freedesktop.NetworkManager.Device.Ppp.c \ introspection/org.freedesktop.NetworkManager.Device.Ppp.c \
introspection/org.freedesktop.NetworkManager.Device.Ppp.h \ introspection/org.freedesktop.NetworkManager.Device.Ppp.h \
introspection/org.freedesktop.NetworkManager.Device.Statistics.c \ introspection/org.freedesktop.NetworkManager.Device.Statistics.c \
...@@ -449,6 +447,8 @@ introspection_sources = \ ...@@ -449,6 +447,8 @@ introspection_sources = \
introspection/org.freedesktop.NetworkManager.Device.Vxlan.h \ introspection/org.freedesktop.NetworkManager.Device.Vxlan.h \
introspection/org.freedesktop.NetworkManager.Device.WiMax.c \ introspection/org.freedesktop.NetworkManager.Device.WiMax.c \
introspection/org.freedesktop.NetworkManager.Device.WiMax.h \ introspection/org.freedesktop.NetworkManager.Device.WiMax.h \
introspection/org.freedesktop.NetworkManager.Device.WifiP2P.c \
introspection/org.freedesktop.NetworkManager.Device.WifiP2P.h \
introspection/org.freedesktop.NetworkManager.Device.WireGuard.c \ introspection/org.freedesktop.NetworkManager.Device.WireGuard.c \
introspection/org.freedesktop.NetworkManager.Device.WireGuard.h \ introspection/org.freedesktop.NetworkManager.Device.WireGuard.h \
introspection/org.freedesktop.NetworkManager.Device.Wired.c \ introspection/org.freedesktop.NetworkManager.Device.Wired.c \
...@@ -465,8 +465,8 @@ introspection_sources = \ ...@@ -465,8 +465,8 @@ introspection_sources = \
introspection/org.freedesktop.NetworkManager.IP4Config.h \ introspection/org.freedesktop.NetworkManager.IP4Config.h \
introspection/org.freedesktop.NetworkManager.IP6Config.c \ introspection/org.freedesktop.NetworkManager.IP6Config.c \
introspection/org.freedesktop.NetworkManager.IP6Config.h \ introspection/org.freedesktop.NetworkManager.IP6Config.h \
introspection/org.freedesktop.NetworkManager.P2PPeer.c \ introspection/org.freedesktop.NetworkManager.WifiP2PPeer.c \
introspection/org.freedesktop.NetworkManager.P2PPeer.h \ introspection/org.freedesktop.NetworkManager.WifiP2PPeer.h \
introspection/org.freedesktop.NetworkManager.PPP.c \ introspection/org.freedesktop.NetworkManager.PPP.c \
introspection/org.freedesktop.NetworkManager.PPP.h \ introspection/org.freedesktop.NetworkManager.PPP.h \
introspection/org.freedesktop.NetworkManager.SecretAgent.c \ introspection/org.freedesktop.NetworkManager.SecretAgent.c \
...@@ -508,7 +508,6 @@ DBUS_INTERFACE_DOCS = \ ...@@ -508,7 +508,6 @@ DBUS_INTERFACE_DOCS = \
docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsBridge.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsBridge.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsInterface.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsInterface.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsPort.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsPort.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.P2PWireless.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Ppp.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Ppp.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml \
...@@ -517,6 +516,7 @@ DBUS_INTERFACE_DOCS = \ ...@@ -517,6 +516,7 @@ DBUS_INTERFACE_DOCS = \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
...@@ -525,13 +525,13 @@ DBUS_INTERFACE_DOCS = \ ...@@ -525,13 +525,13 @@ DBUS_INTERFACE_DOCS = \
docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml \ docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml \
docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \ docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \
docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml \ docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml \
docs/api/dbus-org.freedesktop.NetworkManager.P2PPeer.xml \
docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml \ docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml \
docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml \ docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml \
docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \ docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \ docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
docs/api/dbus-org.freedesktop.NetworkManager.WifiP2PPeer.xml \
docs/api/dbus-org.freedesktop.NetworkManager.xml \ docs/api/dbus-org.freedesktop.NetworkManager.xml \
$(NULL) $(NULL)
...@@ -554,27 +554,27 @@ dbusinterfacesdir = $(datadir)/dbus-1/interfaces ...@@ -554,27 +554,27 @@ dbusinterfacesdir = $(datadir)/dbus-1/interfaces
dbusinterfaces_DATA = \ dbusinterfaces_DATA = \
introspection/org.freedesktop.NetworkManager.AccessPoint.xml \ introspection/org.freedesktop.NetworkManager.AccessPoint.xml \
introspection/org.freedesktop.NetworkManager.Connection.Active.xml \
introspection/org.freedesktop.NetworkManager.AgentManager.xml \ introspection/org.freedesktop.NetworkManager.AgentManager.xml \
introspection/org.freedesktop.NetworkManager.Checkpoint.xml \ introspection/org.freedesktop.NetworkManager.Checkpoint.xml \
introspection/org.freedesktop.NetworkManager.Connection.Active.xml \
introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \
introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \
introspection/org.freedesktop.NetworkManager.Device.Adsl.xml \ introspection/org.freedesktop.NetworkManager.Device.Adsl.xml \
introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml \
introspection/org.freedesktop.NetworkManager.Device.Bond.xml \ introspection/org.freedesktop.NetworkManager.Device.Bond.xml \
introspection/org.freedesktop.NetworkManager.Device.Bridge.xml \ introspection/org.freedesktop.NetworkManager.Device.Bridge.xml \
introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml \
introspection/org.freedesktop.NetworkManager.Device.Dummy.xml \ introspection/org.freedesktop.NetworkManager.Device.Dummy.xml \
introspection/org.freedesktop.NetworkManager.Device.Wired.xml \
introspection/org.freedesktop.NetworkManager.Device.Generic.xml \ introspection/org.freedesktop.NetworkManager.Device.Generic.xml \
introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \
introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \ introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \
introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \
introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml \ introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml \
introspection/org.freedesktop.NetworkManager.Device.Macsec.xml \ introspection/org.freedesktop.NetworkManager.Device.Macsec.xml \
introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \ introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \
introspection/org.freedesktop.NetworkManager.Device.Modem.xml \ introspection/org.freedesktop.NetworkManager.Device.Modem.xml \
introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml \ introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml \
introspection/org.freedesktop.NetworkManager.Device.OvsInterface.xml \ introspection/org.freedesktop.NetworkManager.Device.OvsInterface.xml \
introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml \ introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml \
introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml \
introspection/org.freedesktop.NetworkManager.Device.P2PWireless.xml \
introspection/org.freedesktop.NetworkManager.Device.Ppp.xml \ introspection/org.freedesktop.NetworkManager.Device.Ppp.xml \
introspection/org.freedesktop.NetworkManager.Device.Statistics.xml \ introspection/org.freedesktop.NetworkManager.Device.Statistics.xml \
introspection/org.freedesktop.NetworkManager.Device.Team.xml \ introspection/org.freedesktop.NetworkManager.Device.Team.xml \
...@@ -582,25 +582,26 @@ dbusinterfaces_DATA = \ ...@@ -582,25 +582,26 @@ dbusinterfaces_DATA = \
introspection/org.freedesktop.NetworkManager.Device.Veth.xml \ introspection/org.freedesktop.NetworkManager.Device.Veth.xml \
introspection/org.freedesktop.NetworkManager.Device.Vlan.xml \ introspection/org.freedesktop.NetworkManager.Device.Vlan.xml \
introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml \ introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml \
introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \
introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml \
introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml \ introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml \
introspection/org.freedesktop.NetworkManager.Device.Wired.xml \
introspection/org.freedesktop.NetworkManager.Device.Wireless.xml \ introspection/org.freedesktop.NetworkManager.Device.Wireless.xml \
introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \
introspection/org.freedesktop.NetworkManager.Device.Wpan.xml \ introspection/org.freedesktop.NetworkManager.Device.Wpan.xml \
introspection/org.freedesktop.NetworkManager.Device.xml \ introspection/org.freedesktop.NetworkManager.Device.xml \
introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \
introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \
introspection/org.freedesktop.NetworkManager.DnsManager.xml \ introspection/org.freedesktop.NetworkManager.DnsManager.xml \
introspection/org.freedesktop.NetworkManager.IP4Config.xml \ introspection/org.freedesktop.NetworkManager.IP4Config.xml \
introspection/org.freedesktop.NetworkManager.IP6Config.xml \ introspection/org.freedesktop.NetworkManager.IP6Config.xml \
introspection/org.freedesktop.NetworkManager.xml \
introspection/org.freedesktop.NetworkManager.P2PPeer.xml \
introspection/org.freedesktop.NetworkManager.PPP.xml \ introspection/org.freedesktop.NetworkManager.PPP.xml \
introspection/org.freedesktop.NetworkManager.SecretAgent.xml \ introspection/org.freedesktop.NetworkManager.SecretAgent.xml \
introspection/org.freedesktop.NetworkManager.Settings.Connection.xml \ introspection/org.freedesktop.NetworkManager.Settings.Connection.xml \
introspection/org.freedesktop.NetworkManager.Settings.xml \ introspection/org.freedesktop.NetworkManager.Settings.xml \
introspection/org.freedesktop.NetworkManager.VPN.Connection.xml \ introspection/org.freedesktop.NetworkManager.VPN.Connection.xml \
introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml \ introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml \
introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml \
introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml \
introspection/org.freedesktop.NetworkManager.xml \
$(NULL)
CLEANFILES += $(introspection_sources) CLEANFILES += $(introspection_sources)
CLEANFILES += $(DBUS_INTERFACE_DOCS) CLEANFILES += $(DBUS_INTERFACE_DOCS)
......
...@@ -796,7 +796,7 @@ const NmcMetaGenericInfo *const metagen_con_active_vpn[_NMC_GENERIC_INFO_TYPE_CO ...@@ -796,7 +796,7 @@ const NmcMetaGenericInfo *const metagen_con_active_vpn[_NMC_GENERIC_INFO_TYPE_CO
NM_SETTING_IP4_CONFIG_SETTING_NAME","\ NM_SETTING_IP4_CONFIG_SETTING_NAME","\
NM_SETTING_IP6_CONFIG_SETTING_NAME","\ NM_SETTING_IP6_CONFIG_SETTING_NAME","\
NM_SETTING_SERIAL_SETTING_NAME","\ NM_SETTING_SERIAL_SETTING_NAME","\
NM_SETTING_P2P_WIRELESS_SETTING_NAME","\ NM_SETTING_WIFI_P2P_SETTING_NAME","\
NM_SETTING_PPP_SETTING_NAME","\ NM_SETTING_PPP_SETTING_NAME","\
NM_SETTING_PPPOE_SETTING_NAME","\ NM_SETTING_PPPOE_SETTING_NAME","\
NM_SETTING_ADSL_SETTING_NAME","\ NM_SETTING_ADSL_SETTING_NAME","\
......
...@@ -6619,27 +6619,6 @@ static const NMMetaPropertyInfo *const property_infos_OLPC_MESH[] = { ...@@ -6619,27 +6619,6 @@ static const NMMetaPropertyInfo *const property_infos_OLPC_MESH[] = {
NULL 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
};
#undef _CURRENT_NM_META_SETTING_TYPE #undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PPPOE #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PPPOE
static const NMMetaPropertyInfo *const property_infos_PPPOE[] = { static const NMMetaPropertyInfo *const property_infos_PPPOE[] = {
...@@ -7385,6 +7364,27 @@ static const NMMetaPropertyInfo *const property_infos_VXLAN[] = { ...@@ -7385,6 +7364,27 @@ static const NMMetaPropertyInfo *const property_infos_VXLAN[] = {
NULL NULL
}; };
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIFI_P2P
static const NMMetaPropertyInfo *const property_infos_WIFI_P2P[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_WIFI_P2P_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
};
#undef _CURRENT_NM_META_SETTING_TYPE #undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIMAX #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIMAX
static const NMMetaPropertyInfo *const property_infos_WIMAX[] = { static const NMMetaPropertyInfo *const property_infos_WIMAX[] = {
...@@ -8011,7 +8011,6 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN) ...@@ -8011,7 +8011,6 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
#define SETTING_PRETTY_NAME_OVS_INTERFACE N_("Open vSwitch interface settings") #define SETTING_PRETTY_NAME_OVS_INTERFACE N_("Open vSwitch interface settings")
#define SETTING_PRETTY_NAME_OVS_PATCH N_("Open vSwitch patch interface settings") #define SETTING_PRETTY_NAME_OVS_PATCH N_("Open vSwitch patch interface settings")
#define SETTING_PRETTY_NAME_OVS_PORT N_("Open vSwitch port settings") #define SETTING_PRETTY_NAME_OVS_PORT N_("Open vSwitch port settings")
#define SETTING_PRETTY_NAME_P2P_WIRELESS N_("P2P Wi-Fi connection")
#define SETTING_PRETTY_NAME_PPP N_("PPP settings") #define SETTING_PRETTY_NAME_PPP N_("PPP settings")
#define SETTING_PRETTY_NAME_PPPOE N_("PPPoE") #define SETTING_PRETTY_NAME_PPPOE N_("PPPoE")
#define SETTING_PRETTY_NAME_PROXY N_("Proxy") #define SETTING_PRETTY_NAME_PROXY N_("Proxy")
...@@ -8025,6 +8024,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN) ...@@ -8025,6 +8024,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
#define SETTING_PRETTY_NAME_VLAN N_("VLAN connection") #define SETTING_PRETTY_NAME_VLAN N_("VLAN connection")
#define SETTING_PRETTY_NAME_VPN N_("VPN connection") #define SETTING_PRETTY_NAME_VPN N_("VPN connection")
#define SETTING_PRETTY_NAME_VXLAN N_("VXLAN connection") #define SETTING_PRETTY_NAME_VXLAN N_("VXLAN connection")
#define SETTING_PRETTY_NAME_WIFI_P2P N_("Wi-Fi P2P connection")
#define SETTING_PRETTY_NAME_WIMAX N_("WiMAX connection") #define SETTING_PRETTY_NAME_WIMAX N_("WiMAX connection")
#define SETTING_PRETTY_NAME_WIRED N_("Wired Ethernet") #define SETTING_PRETTY_NAME_WIRED N_("Wired Ethernet")
#define SETTING_PRETTY_NAME_WIRELESS N_("Wi-Fi connection") #define SETTING_PRETTY_NAME_WIRELESS N_("Wi-Fi connection")
...@@ -8205,12 +8205,6 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = { ...@@ -8205,12 +8205,6 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
NM_META_SETTING_VALID_PART_ITEM (OVS_PORT, TRUE), NM_META_SETTING_VALID_PART_ITEM (OVS_PORT, 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),
),
),
SETTING_INFO (PPPOE, SETTING_INFO (PPPOE,
/* PPPoE is a base connection type from historical reasons. /* PPPoE is a base connection type from historical reasons.
* See libnm-core/nm-setting.c:_nm_setting_is_base_type() * See libnm-core/nm-setting.c:_nm_setting_is_base_type()
...@@ -8273,6 +8267,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = { ...@@ -8273,6 +8267,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
NM_META_SETTING_VALID_PART_ITEM (ETHTOOL, FALSE), NM_META_SETTING_VALID_PART_ITEM (ETHTOOL, FALSE),
), ),
), ),
SETTING_INFO (WIFI_P2P,
.valid_parts = NM_META_SETTING_VALID_PARTS (
NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE),
NM_META_SETTING_VALID_PART_ITEM (WIFI_P2P, TRUE),
),
),
SETTING_INFO (WIMAX, SETTING_INFO (WIMAX,
.valid_parts = NM_META_SETTING_VALID_PARTS ( .valid_parts = NM_META_SETTING_VALID_PARTS (
NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE), NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE),
......
...@@ -263,8 +263,6 @@ ...@@ -263,8 +263,6 @@
#define DESCRIBE_DOC_NM_SETTING_OVS_PORT_LACP N_("LACP mode. One of \"active\", \"off\", or \"passive\".") #define DESCRIBE_DOC_NM_SETTING_OVS_PORT_LACP N_("LACP mode. One of \"active\", \"off\", or \"passive\".")
#define DESCRIBE_DOC_NM_SETTING_OVS_PORT_TAG N_("The VLAN tag in the range 0-4095.") #define DESCRIBE_DOC_NM_SETTING_OVS_PORT_TAG N_("The VLAN tag in the range 0-4095.")
#define DESCRIBE_DOC_NM_SETTING_OVS_PORT_VLAN_MODE N_("The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", \"trunk\" or unset.") #define DESCRIBE_DOC_NM_SETTING_OVS_PORT_VLAN_MODE N_("The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", \"trunk\" or unset.")
#define DESCRIBE_DOC_NM_SETTING_P2P_WIRELESS_PEER N_("The P2P device that should be connected to. Currently this is the only way to create or join a group.")
#define DESCRIBE_DOC_NM_SETTING_P2P_WIRELESS_WPS_METHOD N_("Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.")
#define DESCRIBE_DOC_NM_SETTING_PPP_BAUD N_("If non-zero, instruct pppd to set the serial port to the specified baudrate. This value should normally be left as 0 to automatically choose the speed.") #define DESCRIBE_DOC_NM_SETTING_PPP_BAUD N_("If non-zero, instruct pppd to set the serial port to the specified baudrate. This value should normally be left as 0 to automatically choose the speed.")
#define DESCRIBE_DOC_NM_SETTING_PPP_CRTSCTS N_("If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals. This value should normally be set to FALSE.") #define DESCRIBE_DOC_NM_SETTING_PPP_CRTSCTS N_("If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals. This value should normally be set to FALSE.")
#define DESCRIBE_DOC_NM_SETTING_PPP_LCP_ECHO_FAILURE N_("If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer. The \"lcp-echo-interval\" property must also be set to a non-zero value if this property is used.") #define DESCRIBE_DOC_NM_SETTING_PPP_LCP_ECHO_FAILURE N_("If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer. The \"lcp-echo-interval\" property must also be set to a non-zero value if this property is used.")
...@@ -359,6 +357,8 @@ ...@@ -359,6 +357,8 @@
#define DESCRIBE_DOC_NM_SETTING_VXLAN_SOURCE_PORT_MIN N_("Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.") #define DESCRIBE_DOC_NM_SETTING_VXLAN_SOURCE_PORT_MIN N_("Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.")
#define DESCRIBE_DOC_NM_SETTING_VXLAN_TOS N_("Specifies the TOS value to use in outgoing packets.") #define DESCRIBE_DOC_NM_SETTING_VXLAN_TOS N_("Specifies the TOS value to use in outgoing packets.")
#define DESCRIBE_DOC_NM_SETTING_VXLAN_TTL N_("Specifies the time-to-live value to use in outgoing packets.") #define DESCRIBE_DOC_NM_SETTING_VXLAN_TTL N_("Specifies the time-to-live value to use in outgoing packets.")
#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_PEER N_("The P2P device that should be connected to. Currently this is the only way to create or join a group.")
#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WPS_METHOD N_("Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.")
#define DESCRIBE_DOC_NM_SETTING_WIMAX_MAC_ADDRESS N_("If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1") #define DESCRIBE_DOC_NM_SETTING_WIMAX_MAC_ADDRESS N_("If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1")
#define DESCRIBE_DOC_NM_SETTING_WIMAX_NETWORK_NAME N_("Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1") #define DESCRIBE_DOC_NM_SETTING_WIMAX_NETWORK_NAME N_("Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1")
#define DESCRIBE_DOC_NM_SETTING_WPAN_CHANNEL N_("IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use whatever the device is already set to\".") #define DESCRIBE_DOC_NM_SETTING_WPAN_CHANNEL N_("IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use whatever the device is already set to\".")
......
...@@ -64,8 +64,8 @@ content_files = \ ...@@ -64,8 +64,8 @@ content_files = \
dbus-org.freedesktop.NetworkManager.Device.Veth.xml \ dbus-org.freedesktop.NetworkManager.Device.Veth.xml \
dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \ dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \ dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml \
dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml \ dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml \
dbus-org.freedesktop.NetworkManager.Device.P2PWireless.xml \
dbus-org.freedesktop.NetworkManager.Device.Wired.xml \ dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \ dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
dbus-org.freedesktop.NetworkManager.Device.xml \ dbus-org.freedesktop.NetworkManager.Device.xml \
......
...@@ -182,14 +182,13 @@ ...@@ -182,14 +182,13 @@
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Statistics.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Statistics.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Adsl.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Adsl.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bond.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bond.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bridge.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bridge.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Dummy.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Dummy.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wired.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Generic.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Generic.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Macsec.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Macsec.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml"/>
...@@ -204,9 +203,10 @@ ...@@ -204,9 +203,10 @@
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Veth.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Veth.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vlan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vlan.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wired.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wireless.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wireless.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.P2PWireless.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wpan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wpan.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.PPP.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.PPP.xml"/>
</chapter> </chapter>
...@@ -248,10 +248,10 @@ ...@@ -248,10 +248,10 @@
<xi:include href="dbus-org.freedesktop.NetworkManager.AccessPoint.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.AccessPoint.xml"/>
</chapter> </chapter>
<chapter id="ref-dbus-p2p-peers"> <chapter id="ref-dbus-wifi-p2p-peers">
<title>The <literal>/org/freedesktop/NetworkManager/P2PPeer/*</literal> objects</title> <title>The <literal>/org.freedesktop.NetworkManager.WifiP2PPeer/*</literal> objects</title>
<!-- TODO: Describe the objects here --> <!-- TODO: Describe the objects here -->
<xi:include href="dbus-org.freedesktop.NetworkManager.P2PPeer.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.WifiP2PPeer.xml"/>
</chapter> </chapter>
<chapter id="ref-dbus-checkpoint"> <chapter id="ref-dbus-checkpoint">
......
...@@ -3,27 +3,30 @@ ifaces_secret_agent_xml = files('org.freedesktop.NetworkManager.SecretAgent.xml' ...@@ -3,27 +3,30 @@ ifaces_secret_agent_xml = files('org.freedesktop.NetworkManager.SecretAgent.xml'
ifaces_vpn_plugin_xml = files('org.freedesktop.NetworkManager.VPN.Plugin.xml') ifaces_vpn_plugin_xml = files('org.freedesktop.NetworkManager.VPN.Plugin.xml')
ifaces = [ ifaces = [
'org.freedesktop.NetworkManager',
'org.freedesktop.NetworkManager.AccessPoint', 'org.freedesktop.NetworkManager.AccessPoint',
'org.freedesktop.NetworkManager.AgentManager', 'org.freedesktop.NetworkManager.AgentManager',
'org.freedesktop.NetworkManager.Checkpoint', 'org.freedesktop.NetworkManager.Checkpoint',
'org.freedesktop.NetworkManager.Connection.Active', 'org.freedesktop.NetworkManager.Connection.Active',
'org.freedesktop.NetworkManager.DHCP4Config',
'org.freedesktop.NetworkManager.DHCP6Config',
'org.freedesktop.NetworkManager.Device',
'org.freedesktop.NetworkManager.Device.Adsl', 'org.freedesktop.NetworkManager.Device.Adsl',
'org.freedesktop.NetworkManager.Device.Bluetooth', 'org.freedesktop.NetworkManager.Device.Bluetooth',
'org.freedesktop.NetworkManager.Device.Bond', 'org.freedesktop.NetworkManager.Device.Bond',
'org.freedesktop.NetworkManager.Device.Bridge', 'org.freedesktop.NetworkManager.Device.Bridge',
'org.freedesktop.NetworkManager.Device.Dummy', 'org.freedesktop.NetworkManager.Device.Dummy',
'org.freedesktop.NetworkManager.Device.Generic', 'org.freedesktop.NetworkManager.Device.Generic',
'org.freedesktop.NetworkManager.Device.Infiniband',
'org.freedesktop.NetworkManager.Device.IPTunnel', 'org.freedesktop.NetworkManager.Device.IPTunnel',
'org.freedesktop.NetworkManager.Device.Infiniband',
'org.freedesktop.NetworkManager.Device.Lowpan', 'org.freedesktop.NetworkManager.Device.Lowpan',
'org.freedesktop.NetworkManager.Device.Macsec', 'org.freedesktop.NetworkManager.Device.Macsec',
'org.freedesktop.NetworkManager.Device.Macvlan', 'org.freedesktop.NetworkManager.Device.Macvlan',
'org.freedesktop.NetworkManager.Device.Modem', 'org.freedesktop.NetworkManager.Device.Modem',
'org.freedesktop.NetworkManager.Device.OlpcMesh', 'org.freedesktop.NetworkManager.Device.OlpcMesh',
'org.freedesktop.NetworkManager.Device.OvsBridge',
'org.freedesktop.NetworkManager.Device.OvsInterface', 'org.freedesktop.NetworkManager.Device.OvsInterface',
'org.freedesktop.NetworkManager.Device.OvsPort', 'org.freedesktop.NetworkManager.Device.OvsPort',
'org.freedesktop.NetworkManager.Device.OvsBridge',
'org.freedesktop.NetworkManager.Device.P2PWireless',
'org.freedesktop.NetworkManager.Device.Ppp', 'org.freedesktop.NetworkManager.Device.Ppp',
'org.freedesktop.NetworkManager.Device.Statistics', 'org.freedesktop.NetworkManager.Device.Statistics',
'org.freedesktop.NetworkManager.Device.Team', 'org.freedesktop.NetworkManager.Device.Team',
...@@ -32,25 +35,22 @@ ifaces = [ ...@@ -32,25 +35,22 @@ ifaces = [
'org.freedesktop.NetworkManager.Device.Vlan', 'org.freedesktop.NetworkManager.Device.Vlan',
'org.freedesktop.NetworkManager.Device.Vxlan', 'org.freedesktop.NetworkManager.Device.Vxlan',
'org.freedesktop.NetworkManager.Device.WiMax', 'org.freedesktop.NetworkManager.Device.WiMax',
'org.freedesktop.NetworkManager.Device.Wpan', 'org.freedesktop.NetworkManager.Device.WifiP2P',
'org.freedesktop.NetworkManager.Device.WireGuard', 'org.freedesktop.NetworkManager.Device.WireGuard',
'org.freedesktop.NetworkManager.Device.Wired', 'org.freedesktop.NetworkManager.Device.Wired',
'org.freedesktop.NetworkManager.Device.Wireless', 'org.freedesktop.NetworkManager.Device.Wireless',
'org.freedesktop.NetworkManager.Device', 'org.freedesktop.NetworkManager.Device.Wpan',
'org.freedesktop.NetworkManager.DHCP4Config',
'org.freedesktop.NetworkManager.DHCP6Config',
'org.freedesktop.NetworkManager.DnsManager', 'org.freedesktop.NetworkManager.DnsManager',
'org.freedesktop.NetworkManager.IP4Config', 'org.freedesktop.NetworkManager.IP4Config',
'org.freedesktop.NetworkManager.IP6Config', 'org.freedesktop.NetworkManager.IP6Config',
'org.freedesktop.NetworkManager',
'org.freedesktop.NetworkManager.P2PPeer',
'org.freedesktop.NetworkManager.PPP', 'org.freedesktop.NetworkManager.PPP',
'org.freedesktop.NetworkManager.SecretAgent', 'org.freedesktop.NetworkManager.SecretAgent',
'org.freedesktop.NetworkManager.Settings.Connection',
'org.freedesktop.NetworkManager.Settings', 'org.freedesktop.NetworkManager.Settings',
'org.freedesktop.NetworkManager.Settings.Connection',
'org.freedesktop.NetworkManager.VPN.Connection', 'org.freedesktop.NetworkManager.VPN.Connection',
'org.freedesktop.NetworkManager.VPN.Plugin', 'org.freedesktop.NetworkManager.VPN.Plugin',
'org.freedesktop.NetworkManager.WiMax.Nsp', 'org.freedesktop.NetworkManager.WiMax.Nsp',
'org.freedesktop.NetworkManager.WifiP2PPeer',
] ]
ifaces_xmls = [] ifaces_xmls = []
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<node name="/"> <node name="/">
<!-- <!--
org.freedesktop.NetworkManager.Device.P2PWireless: org.freedesktop.NetworkManager.Device.WifiP2P:
@short_description: P2P Wi-Fi Device @short_description: Wi-Fi P2P Device
Since: 1.16 Since: 1.16
--> -->
<interface name="org.freedesktop.NetworkManager.Device.P2PWireless"> <interface name="org.freedesktop.NetworkManager.Device.WifiP2P">
<annotation name="org.gtk.GDBus.C.Name" value="Device_P2P_Wifi"/> <annotation name="org.gtk.GDBus.C.Name" value="Device_Wifi_P2P"/>
<!-- <!--
HwAddress: HwAddress:
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<!-- <!--
Peers: Peers:
List of object paths of peers visible to this p2p wireless device. List of object paths of peers visible to this Wi-Fi P2P device.
Since: 1.16 Since: 1.16
--> -->
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
in the range of 1-600 seconds is supported. The default is in the range of 1-600 seconds is supported. The default is
30 seconds. 30 seconds.
Start a find operation for P2P peers. Start a find operation for Wi-Fi P2P peers.
Since: 1.16 Since: 1.16
--> -->
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
PeerAdded: PeerAdded:
@peer: The object path of the newly found access point. @peer: The object path of the newly found access point.
Emitted when a new P2P peer is found by the device. Emitted when a new Wi-Fi P2P peer is found by the device.
Since: 1.16 Since: 1.16
--> -->
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
<!-- <!--
PeerRemoved: PeerRemoved:
@peer: The object path of the P2P peer that has disappeared. @peer: The object path of the Wi-Fi P2P peer that has disappeared.
Emitted when a P2P peer disappears from view of the device. Emitted when a Wi-Fi P2P peer disappears from view of the device.
Since: 1.16 Since: 1.16
--> -->
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<node name="/"> <node name="/">
<!-- <!--
org.freedesktop.NetworkManager.P2PPeer: org.freedesktop.NetworkManager.WifiP2PPeer:
@short_description: P2P Wi-Fi Peer @short_description: Wi-Fi P2P Peer
Since: 1.16 Since: 1.16
--> -->
<interface name="org.freedesktop.NetworkManager.P2PPeer"> <interface name="org.freedesktop.NetworkManager.WifiP2PPeer">
<annotation name="org.gtk.GDBus.C.Name" value="P2P_Peer"/> <annotation name="org.gtk.GDBus.C.Name" value="Wifi_P2P_Peer"/>
<!-- <!--
Flags: Flags:
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<!-- <!--
Manufacturer: Manufacturer:
The manufacturer of the P2P peer. The manufacturer of the Wi-Fi P2P peer.
Since: 1.16 Since: 1.16
--> -->
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<!-- <!--
Model: Model:
The model of the P2P peer. The model of the Wi-Fi P2P peer.
Since: 1.16 Since: 1.16
--> -->
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<!-- <!--
ModelNumber: ModelNumber:
The model number of the P2P peer. The model number of the Wi-Fi P2P peer.
Since: 1.16 Since: 1.16
--> -->
...@@ -50,16 +50,16 @@ ...@@ -50,16 +50,16 @@
<!-- <!--
Serial: Serial:
The serial number of the P2P peer. The serial number of the Wi-Fi P2P peer.
Since: 1.16 Since: 1.16
--> -->
<property name="Serial" type="s" access="read"/>