From 73e152af6e3fb4f5848bfb8394484026ff119003 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 11 May 2016 17:08:25 +0200 Subject: Imported Upstream version 1.2.2 --- libnm-core/Makefile.am | 8 +- libnm-core/Makefile.in | 8 +- libnm-core/nm-connection.c | 12 +- libnm-core/nm-dbus-interface.h | 4 +- libnm-core/nm-dbus-types.xml | 1291 +++++++++++++++++++++++++++++ libnm-core/nm-setting-8021x.h | 3 + libnm-core/nm-setting-adsl.h | 3 + libnm-core/nm-setting-bluetooth.h | 3 + libnm-core/nm-setting-bond.h | 3 + libnm-core/nm-setting-bridge-port.h | 3 + libnm-core/nm-setting-bridge.h | 3 + libnm-core/nm-setting-cdma.h | 3 + libnm-core/nm-setting-dcb.h | 4 +- libnm-core/nm-setting-generic.h | 3 + libnm-core/nm-setting-gsm.h | 3 + libnm-core/nm-setting-infiniband.h | 3 + libnm-core/nm-setting-ip-config.h | 3 + libnm-core/nm-setting-ip-tunnel.h | 3 + libnm-core/nm-setting-ip4-config.h | 3 + libnm-core/nm-setting-ip6-config.c | 8 +- libnm-core/nm-setting-ip6-config.h | 3 + libnm-core/nm-setting-macvlan.h | 3 + libnm-core/nm-setting-olpc-mesh.h | 3 + libnm-core/nm-setting-ppp.h | 3 + libnm-core/nm-setting-pppoe.h | 3 + libnm-core/nm-setting-serial.h | 3 + libnm-core/nm-setting-team-port.h | 3 + libnm-core/nm-setting-team.h | 3 + libnm-core/nm-setting-tun.h | 3 + libnm-core/nm-setting-vlan.h | 3 + libnm-core/nm-setting-vpn.h | 3 + libnm-core/nm-setting-vxlan.h | 3 + libnm-core/nm-setting-wimax.h | 3 + libnm-core/nm-setting-wired.h | 3 + libnm-core/nm-setting-wireless-security.h | 3 + libnm-core/nm-setting-wireless.h | 4 +- libnm-core/nm-simple-connection.h | 3 + libnm-core/nm-vpn-dbus-types.xml | 246 ++++++ libnm-core/nm-vpn-editor-plugin.c | 142 ++-- libnm-core/nm-vpn-plugin-info.h | 3 + 40 files changed, 1743 insertions(+), 74 deletions(-) create mode 100644 libnm-core/nm-dbus-types.xml create mode 100644 libnm-core/nm-vpn-dbus-types.xml (limited to 'libnm-core') diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am index 58dc204b..3335720a 100644 --- a/libnm-core/Makefile.am +++ b/libnm-core/Makefile.am @@ -53,5 +53,11 @@ libnm_core_la_SOURCES += crypto_nss.c libnm_core_la_LIBADD += $(NSS_LIBS) endif -BUILT_SOURCES = $(GLIB_GENERATED) +nm-vpn-dbus-types.xml: nm-vpn-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl + $(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $^ >$@ + +nm-dbus-types.xml: nm-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl + $(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $^ >$@ + +BUILT_SOURCES = $(GLIB_GENERATED) nm-vpn-dbus-types.xml nm-dbus-types.xml CLEANFILES = $(BUILT_SOURCES) diff --git a/libnm-core/Makefile.in b/libnm-core/Makefile.in index bd66c069..2bedf38b 100644 --- a/libnm-core/Makefile.in +++ b/libnm-core/Makefile.in @@ -721,7 +721,7 @@ libnm_core_la_LIBADD = $(GLIB_LIBS) $(UUID_LIBS) $(am__append_3) \ libnm_core_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) -BUILT_SOURCES = $(GLIB_GENERATED) +BUILT_SOURCES = $(GLIB_GENERATED) nm-vpn-dbus-types.xml nm-dbus-types.xml CLEANFILES = $(BUILT_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1490,6 +1490,12 @@ include $(GLIB_MAKEFILE) @GNOME_CODE_COVERAGE_RULES@ +nm-vpn-dbus-types.xml: nm-vpn-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl + $(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $^ >$@ + +nm-dbus-types.xml: nm-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl + $(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $^ >$@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index c03e6265..7a0e1f6b 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -2240,13 +2240,19 @@ nm_connection_private_free (NMConnectionPrivate *priv) static NMConnectionPrivate * nm_connection_get_private (NMConnection *connection) { + static GQuark key = 0; NMConnectionPrivate *priv; - priv = g_object_get_data (G_OBJECT (connection), "NMConnectionPrivate"); + nm_assert (NM_IS_CONNECTION (connection)); + + if (G_UNLIKELY (key == 0)) + key = g_quark_from_static_string ("NMConnectionPrivate"); + + priv = g_object_get_qdata ((GObject *) connection, key); if (!priv) { priv = g_slice_new0 (NMConnectionPrivate); - g_object_set_data_full (G_OBJECT (connection), "NMConnectionPrivate", - priv, (GDestroyNotify) nm_connection_private_free); + g_object_set_qdata_full ((GObject *) connection, key, + priv, (GDestroyNotify) nm_connection_private_free); priv->self = connection; priv->settings = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref); diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index 84e080af..1e0fbe68 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -150,8 +150,8 @@ typedef enum { * @NM_DEVICE_TYPE_VXLAN: a VXLAN interface * @NM_DEVICE_TYPE_VETH: a VETH interface * - * #NMDeviceType values indicate the type of hardware represented by - * an #NMDevice. + * #NMDeviceType values indicate the type of hardware represented by a + * device object. **/ typedef enum { NM_DEVICE_TYPE_UNKNOWN = 0, diff --git a/libnm-core/nm-dbus-types.xml b/libnm-core/nm-dbus-types.xml new file mode 100644 index 00000000..6d5d01bb --- /dev/null +++ b/libnm-core/nm-dbus-types.xml @@ -0,0 +1,1291 @@ + + + + + + + NetworkManager D-Bus API Types + 3 + NetworkManager D-Bus API Types + + + NetworkManager D-Bus API Types + + + + + enum NMState + + NMState + + NMState values indicate the current overall networking state. + + Values + + + + + + + + NM_STATE_UNKNOWN + = 0 + networking state is unknown + + + NM_STATE_ASLEEP + = 10 + networking is not enabled + + + NM_STATE_DISCONNECTED + = 20 + there is no active network connection + + + NM_STATE_DISCONNECTING + = 30 + network connections are being cleaned up + + + NM_STATE_CONNECTING + = 40 + a network connection is being started + + + NM_STATE_CONNECTED_LOCAL + = 50 + there is only local IPv4 and/or IPv6 connectivity + + + NM_STATE_CONNECTED_SITE + = 60 + there is only site-wide IPv4 and/or IPv6 connectivity + + + NM_STATE_CONNECTED_GLOBAL + = 70 + there is global IPv4 and/or IPv6 Internet connectivity + + + + + + + + + enum NMConnectivityState + + NMConnectivityState + + + + Values + + + + + + + + NM_CONNECTIVITY_UNKNOWN + = 1 + Network connectivity is unknown. + + + NM_CONNECTIVITY_NONE + = 2 + The host is not connected to any network. + + + NM_CONNECTIVITY_PORTAL + = 3 + The host is behind a captive portal and cannot reach the full Internet. + + + NM_CONNECTIVITY_LIMITED + = 4 + The host is connected to a network, but does not appear to be able to reach the full Internet. + + + NM_CONNECTIVITY_FULL + = 5 + The host is connected to a network, and appears to be able to reach the full Internet. + + + + + + + + + enum NMDeviceType + + NMDeviceType + + NMDeviceType values indicate the type of hardware represented by a device object. + + Values + + + + + + + + NM_DEVICE_TYPE_UNKNOWN + = 0 + unknown device + + + NM_DEVICE_TYPE_GENERIC + = 14 + generic support for unrecognized device types + + + NM_DEVICE_TYPE_ETHERNET + = 1 + a wired ethernet device + + + NM_DEVICE_TYPE_WIFI + = 2 + an 802.11 WiFi device + + + NM_DEVICE_TYPE_UNUSED1 + = 3 + not used + + + NM_DEVICE_TYPE_UNUSED2 + = 4 + not used + + + NM_DEVICE_TYPE_BT + = 5 + a Bluetooth device supporting PAN or DUN access protocols + + + NM_DEVICE_TYPE_OLPC_MESH + = 6 + an OLPC XO mesh networking device + + + NM_DEVICE_TYPE_WIMAX + = 7 + an 802.16e Mobile WiMAX broadband device + + + NM_DEVICE_TYPE_MODEM + = 8 + a modem supporting analog telephone, CDMA/EVDO, GSM/UMTS, or LTE network access protocols + + + NM_DEVICE_TYPE_INFINIBAND + = 9 + an IP-over-InfiniBand device + + + NM_DEVICE_TYPE_BOND + = 10 + a bond master interface + + + NM_DEVICE_TYPE_VLAN + = 11 + an 802.1Q VLAN interface + + + NM_DEVICE_TYPE_ADSL + = 12 + ADSL modem + + + NM_DEVICE_TYPE_BRIDGE + = 13 + a bridge master interface + + + NM_DEVICE_TYPE_TEAM + = 15 + a team master interface + + + NM_DEVICE_TYPE_TUN + = 16 + a TUN or TAP interface + + + NM_DEVICE_TYPE_IP_TUNNEL + = 17 + a IP tunnel interface + + + NM_DEVICE_TYPE_MACVLAN + = 18 + a MACVLAN interface + + + NM_DEVICE_TYPE_VXLAN + = 19 + a VXLAN interface + + + NM_DEVICE_TYPE_VETH + = 20 + a VETH interface + + + + + + + + + enum NMDeviceCapabilities + + NMDeviceCapabilities + + General device capability flags. + + Values + + + + + + + + NM_DEVICE_CAP_NONE + = 0x00000000 + device has no special capabilities + + + NM_DEVICE_CAP_NM_SUPPORTED + = 0x00000001 + NetworkManager supports this device + + + NM_DEVICE_CAP_CARRIER_DETECT + = 0x00000002 + this device can indicate carrier status + + + NM_DEVICE_CAP_IS_SOFTWARE + = 0x00000004 + this device is a software device + + + + + + + + + enum NMDeviceWifiCapabilities + + NMDeviceWifiCapabilities + + 802.11 specific device encryption and authentication capabilities. + + Values + + + + + + + + NM_WIFI_DEVICE_CAP_NONE + = 0x00000000 + device has no encryption/authentication capabilities + + + NM_WIFI_DEVICE_CAP_CIPHER_WEP40 + = 0x00000001 + device supports 40/64-bit WEP encryption + + + NM_WIFI_DEVICE_CAP_CIPHER_WEP104 + = 0x00000002 + device supports 104/128-bit WEP encryption + + + NM_WIFI_DEVICE_CAP_CIPHER_TKIP + = 0x00000004 + device supports TKIP encryption + + + NM_WIFI_DEVICE_CAP_CIPHER_CCMP + = 0x00000008 + device supports AES/CCMP encryption + + + NM_WIFI_DEVICE_CAP_WPA + = 0x00000010 + device supports WPA1 authentication + + + NM_WIFI_DEVICE_CAP_RSN + = 0x00000020 + device supports WPA2/RSN authentication + + + NM_WIFI_DEVICE_CAP_AP + = 0x00000040 + device supports Access Point mode + + + NM_WIFI_DEVICE_CAP_ADHOC + = 0x00000080 + device supports Ad-Hoc mode + + + NM_WIFI_DEVICE_CAP_FREQ_VALID + = 0x00000100 + device reports frequency capabilities + + + NM_WIFI_DEVICE_CAP_FREQ_2GHZ + = 0x00000200 + device supports 2.4GHz frequencies + + + NM_WIFI_DEVICE_CAP_FREQ_5GHZ + = 0x00000400 + device supports 5GHz frequencies + + + + + + + + + enum NM80211ApFlags + + NM80211ApFlags + + 802.11 access point flags. + + Values + + + + + + + + NM_802_11_AP_FLAGS_NONE + = 0x00000000 + access point has no special capabilities + + + NM_802_11_AP_FLAGS_PRIVACY + = 0x00000001 + access point requires authentication and encryption (usually means WEP) + + + + + + + + + enum NM80211ApSecurityFlags + + NM80211ApSecurityFlags + + 802.11 access point security and authentication flags. These flags describe the current security requirements of an access point as determined from the access point's beacon. + + Values + + + + + + + + NM_802_11_AP_SEC_NONE + = 0x00000000 + the access point has no special security requirements + + + NM_802_11_AP_SEC_PAIR_WEP40 + = 0x00000001 + 40/64-bit WEP is supported for pairwise/unicast encryption + + + NM_802_11_AP_SEC_PAIR_WEP104 + = 0x00000002 + 104/128-bit WEP is supported for pairwise/unicast encryption + + + NM_802_11_AP_SEC_PAIR_TKIP + = 0x00000004 + TKIP is supported for pairwise/unicast encryption + + + NM_802_11_AP_SEC_PAIR_CCMP + = 0x00000008 + AES/CCMP is supported for pairwise/unicast encryption + + + NM_802_11_AP_SEC_GROUP_WEP40 + = 0x00000010 + 40/64-bit WEP is supported for group/broadcast encryption + + + NM_802_11_AP_SEC_GROUP_WEP104 + = 0x00000020 + 104/128-bit WEP is supported for group/broadcast encryption + + + NM_802_11_AP_SEC_GROUP_TKIP + = 0x00000040 + TKIP is supported for group/broadcast encryption + + + NM_802_11_AP_SEC_GROUP_CCMP + = 0x00000080 + AES/CCMP is supported for group/broadcast encryption + + + NM_802_11_AP_SEC_KEY_MGMT_PSK + = 0x00000100 + WPA/RSN Pre-Shared Key encryption is supported + + + NM_802_11_AP_SEC_KEY_MGMT_802_1X + = 0x00000200 + 802.1x authentication and key management is supported + + + + + + + + + enum NM80211Mode + + NM80211Mode + + Indicates the 802.11 mode an access point or device is currently in. + + Values + + + + + + + + NM_802_11_MODE_UNKNOWN + = 0 + the device or access point mode is unknown + + + NM_802_11_MODE_ADHOC + = 1 + for both devices and access point objects, indicates the object is part of an Ad-Hoc 802.11 network without a central coordinating access point. + + + NM_802_11_MODE_INFRA + = 2 + the device or access point is in infrastructure mode. For devices, this indicates the device is an 802.11 client/station. For access point objects, this indicates the object is an access point that provides connectivity to clients. + + + NM_802_11_MODE_AP + = 3 + the device is an access point/hotspot. Not valid for access point objects; used only for hotspot mode on the local machine. + + + + + + + + + enum NMBluetoothCapabilities + + NMBluetoothCapabilities + + NMBluetoothCapabilities values indicate the usable capabilities of a Bluetooth device. + + Values + + + + + + + + NM_BT_CAPABILITY_NONE + = 0x00000000 + device has no usable capabilities + + + NM_BT_CAPABILITY_DUN + = 0x00000001 + device provides Dial-Up Networking capability + + + NM_BT_CAPABILITY_NAP + = 0x00000002 + device provides Network Access Point capability + + + + + + + + + enum NMDeviceModemCapabilities + + NMDeviceModemCapabilities + + NMDeviceModemCapabilities values indicate the generic radio access technology families a modem device supports. For more information on the specific access technologies the device supports use the ModemManager D-Bus API. + + Values + + + + + + + + NM_DEVICE_MODEM_CAPABILITY_NONE + = 0x00000000 + modem has no usable capabilities + + + NM_DEVICE_MODEM_CAPABILITY_POTS + = 0x00000001 + modem uses the analog wired telephone network and is not a wireless/cellular device + + + NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO + = 0x00000002 + modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO revision A, or EVDO revision B + + + NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS + = 0x00000004 + modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability + + + NM_DEVICE_MODEM_CAPABILITY_LTE + = 0x00000008 + modem has LTE data capability + + + + + + + + + enum NMWimaxNspNetworkType + + NMWimaxNspNetworkType + + WiMAX network type. + + Values + + + + + + + + NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN + = 0 + unknown network type + + + NM_WIMAX_NSP_NETWORK_TYPE_HOME + = 1 + home network + + + NM_WIMAX_NSP_NETWORK_TYPE_PARTNER + = 2 + partner network + + + NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER + = 3 + roaming partner network + + + + + + + + + enum NMDeviceState + + NMDeviceState + + + + Values + + + + + + + + NM_DEVICE_STATE_UNKNOWN + = 0 + the device's state is unknown + + + NM_DEVICE_STATE_UNMANAGED + = 10 + the device is recognized, but not managed by NetworkManager + + + NM_DEVICE_STATE_UNAVAILABLE + = 20 + the device is managed by NetworkManager, but is not available for use. Reasons may include the wireless switched off, missing firmware, no ethernet carrier, missing supplicant or modem manager, etc. + + + NM_DEVICE_STATE_DISCONNECTED + = 30 + the device can be activated, but is currently idle and not connected to a network. + + + NM_DEVICE_STATE_PREPARE + = 40 + the device is preparing the connection to the network. This may include operations like changing the MAC address, setting physical link properties, and anything else required to connect to the requested network. + + + NM_DEVICE_STATE_CONFIG + = 50 + the device is connecting to the requested network. This may include operations like associating with the WiFi AP, dialing the modem, connecting to the remote Bluetooth device, etc. + + + NM_DEVICE_STATE_NEED_AUTH + = 60 + the device requires more information to continue connecting to the requested network. This includes secrets like WiFi passphrases, login passwords, PIN codes, etc. + + + NM_DEVICE_STATE_IP_CONFIG + = 70 + the device is requesting IPv4 and/or IPv6 addresses and routing information from the network. + + + NM_DEVICE_STATE_IP_CHECK + = 80 + the device is checking whether further action is required for the requested network connection. This may include checking whether only local network access is available, whether a captive portal is blocking access to the Internet, etc. + + + NM_DEVICE_STATE_SECONDARIES + = 90 + the device is waiting for a secondary connection (like a VPN) which must activated before the device can be activated + + + NM_DEVICE_STATE_ACTIVATED + = 100 + the device has a network connection, either local or global. + + + NM_DEVICE_STATE_DEACTIVATING + = 110 + a disconnection from the current network connection was requested, and the device is cleaning up resources used for that connection. The network connection may still be valid. + + + NM_DEVICE_STATE_FAILED + = 120 + the device failed to connect to the requested network and is cleaning up the connection request + + + + + + + + + enum NMDeviceStateReason + + NMDeviceStateReason + + Device state change reason codes + + Values + + + + + + + + NM_DEVICE_STATE_REASON_NONE + = 0 + No reason given + + + NM_DEVICE_STATE_REASON_UNKNOWN + = 1 + Unknown error + + + NM_DEVICE_STATE_REASON_NOW_MANAGED + = 2 + Device is now managed + + + NM_DEVICE_STATE_REASON_NOW_UNMANAGED + = 3 + Device is now unmanaged + + + NM_DEVICE_STATE_REASON_CONFIG_FAILED + = 4 + The device could not be readied for configuration + + + NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE + = 5 + IP configuration could not be reserved (no available address, timeout, etc) + + + NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED + = 6 + The IP config is no longer valid + + + NM_DEVICE_STATE_REASON_NO_SECRETS + = 7 + Secrets were required, but not provided + + + NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT + = 8 + 802.1x supplicant disconnected + + + NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED + = 9 + 802.1x supplicant configuration failed + + + NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED + = 10 + 802.1x supplicant failed + + + NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT + = 11 + 802.1x supplicant took too long to authenticate + + + NM_DEVICE_STATE_REASON_PPP_START_FAILED + = 12 + PPP service failed to start + + + NM_DEVICE_STATE_REASON_PPP_DISCONNECT + = 13 + PPP service disconnected + + + NM_DEVICE_STATE_REASON_PPP_FAILED + = 14 + PPP failed + + + NM_DEVICE_STATE_REASON_DHCP_START_FAILED + = 15 + DHCP client failed to start + + + NM_DEVICE_STATE_REASON_DHCP_ERROR + = 16 + DHCP client error + + + NM_DEVICE_STATE_REASON_DHCP_FAILED + = 17 + DHCP client failed + + + NM_DEVICE_STATE_REASON_SHARED_START_FAILED + = 18 + Shared connection service failed to start + + + NM_DEVICE_STATE_REASON_SHARED_FAILED + = 19 + Shared connection service failed + + + NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED + = 20 + AutoIP service failed to start + + + NM_DEVICE_STATE_REASON_AUTOIP_ERROR + = 21 + AutoIP service error + + + NM_DEVICE_STATE_REASON_AUTOIP_FAILED + = 22 + AutoIP service failed + + + NM_DEVICE_STATE_REASON_MODEM_BUSY + = 23 + The line is busy + + + NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE + = 24 + No dial tone + + + NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER + = 25 + No carrier could be established + + + NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT + = 26 + The dialing request timed out + + + NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED + = 27 + The dialing attempt failed + + + NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED + = 28 + Modem initialization failed + + + NM_DEVICE_STATE_REASON_GSM_APN_FAILED + = 29 + Failed to select the specified APN + + + NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING + = 30 + Not searching for networks + + + NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED + = 31 + Network registration denied + + + NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT + = 32 + Network registration timed out + + + NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED + = 33 + Failed to register with the requested network + + + NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED + = 34 + PIN check failed + + + NM_DEVICE_STATE_REASON_FIRMWARE_MISSING + = 35 + Necessary firmware for the device may be missing + + + NM_DEVICE_STATE_REASON_REMOVED + = 36 + The device was removed + + + NM_DEVICE_STATE_REASON_SLEEPING + = 37 + NetworkManager went to sleep + + + NM_DEVICE_STATE_REASON_CONNECTION_REMOVED + = 38 + The device's active connection disappeared + + + NM_DEVICE_STATE_REASON_USER_REQUESTED + = 39 + Device disconnected by user or client + + + NM_DEVICE_STATE_REASON_CARRIER + = 40 + Carrier/link changed + + + NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED + = 41 + The device's existing connection was assumed + + + NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE + = 42 + The supplicant is now available + + + NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND + = 43 + The modem could not be found + + + NM_DEVICE_STATE_REASON_BT_FAILED + = 44 + The Bluetooth connection failed or timed out + + + NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED + = 45 + GSM Modem's SIM Card not inserted + + + NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED + = 46 + GSM Modem's SIM Pin required + + + NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED + = 47 + GSM Modem's SIM Puk required + + + NM_DEVICE_STATE_REASON_GSM_SIM_WRONG + = 48 + GSM Modem's SIM wrong + + + NM_DEVICE_STATE_REASON_INFINIBAND_MODE + = 49 + InfiniBand device does not support connected mode + + + NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED + = 50 + A dependency of the connection failed + + + NM_DEVICE_STATE_REASON_BR2684_FAILED + = 51 + Problem with the RFC 2684 Ethernet over ADSL bridge + + + NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE + = 52 + ModemManager not running + + + NM_DEVICE_STATE_REASON_SSID_NOT_FOUND + = 53 + The WiFi network could not be found + + + NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED + = 54 + A secondary connection of the base connection failed + + + NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED + = 55 + DCB or FCoE setup failed + + + NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED + = 56 + teamd control failed + + + NM_DEVICE_STATE_REASON_MODEM_FAILED + = 57 + Modem failed or no longer available + + + NM_DEVICE_STATE_REASON_MODEM_AVAILABLE + = 58 + Modem now ready and available + + + NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT + = 59 + SIM PIN was incorrect + + + NM_DEVICE_STATE_REASON_NEW_ACTIVATION + = 60 + New connection activation was enqueued + + + NM_DEVICE_STATE_REASON_PARENT_CHANGED + = 61 + the device's parent changed + + + NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED + = 62 + the device parent's management changed + + + + + + + + + enum NMMetered + + NMMetered + + Since: 1.2 + + Values + + + + + + + + NM_METERED_UNKNOWN + = 0 + The metered status is unknown + + + NM_METERED_YES + = 1 + Metered, the value was statically set + + + NM_METERED_NO + = 2 + Not metered, the value was statically set + + + NM_METERED_GUESS_YES + = 3 + Metered, the value was guessed + + + NM_METERED_GUESS_NO + = 4 + Not metered, the value was guessed + + + + + + + + + enum NMActiveConnectionState + + NMActiveConnectionState + + NMActiveConnectionState values indicate the state of a connection to a specific network while it is starting, connected, or disconnecting from that network. + + Values + + + + + + + + NM_ACTIVE_CONNECTION_STATE_UNKNOWN + = 0 + the state of the connection is unknown + + + NM_ACTIVE_CONNECTION_STATE_ACTIVATING + = 1 + a network connection is being prepared + + + NM_ACTIVE_CONNECTION_STATE_ACTIVATED + = 2 + there is a connection to the network + + + NM_ACTIVE_CONNECTION_STATE_DEACTIVATING + = 3 + the network connection is being torn down and cleaned up + + + NM_ACTIVE_CONNECTION_STATE_DEACTIVATED + = 4 + the network connection is disconnected and will be removed + + + + + + + + + enum NMSecretAgentGetSecretsFlags + + NMSecretAgentGetSecretsFlags + + NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request. + + Values + + + + + + + + NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE + = 0x0 + no special behavior; by default no user interaction is allowed and requests for secrets are fulfilled from persistent storage, or if no secrets are available an error is returned. + + + NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION + = 0x1 + allows the request to interact with the user, possibly prompting via UI for secrets if any are required, or if none are found in persistent storage. + + + NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW + = 0x2 + explicitly prompt for new secrets from the user. This flag signals that NetworkManager thinks any existing secrets are invalid or wrong. This flag implies that interaction is allowed. + + + NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED + = 0x4 + set if the request was initiated by user-requested action via the D-Bus interface, as opposed to automatically initiated by NetworkManager in response to (for example) scan results or carrier changes. + + + NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM + = 0x80000000 + Internal flag, not part of the D-Bus API. + + + NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS + = 0x40000000 + Internal flag, not part of the D-Bus API. + + + + + + + + + enum NMSecretAgentCapabilities + + NMSecretAgentCapabilities + + NMSecretAgentCapabilities indicate various capabilities of the agent. + + Values + + + + + + + + NM_SECRET_AGENT_CAPABILITY_NONE + = 0x0 + the agent supports no special capabilities + + + NM_SECRET_AGENT_CAPABILITY_VPN_HINTS + = 0x1 + the agent supports passing hints to VPN plugin authentication dialogs. + + + + + + + + + enum NMIPTunnelMode + + NMIPTunnelMode + + The tunneling mode.Since: 1.2 + + Values + + + + + + + + NM_IP_TUNNEL_MODE_UNKNOWN + = 0 + Unknown/unset tunnel mode + + + NM_IP_TUNNEL_MODE_IPIP + = 1 + IP in IP tunnel + + + NM_IP_TUNNEL_MODE_GRE + = 2 + GRE tunnel + + + NM_IP_TUNNEL_MODE_SIT + = 3 + SIT tunnel + + + NM_IP_TUNNEL_MODE_ISATAP + = 4 + ISATAP tunnel + + + NM_IP_TUNNEL_MODE_VTI + = 5 + VTI tunnel + + + NM_IP_TUNNEL_MODE_IP6IP6 + = 6 + IPv6 in IPv6 tunnel + + + NM_IP_TUNNEL_MODE_IPIP6 + = 7 + IPv4 in IPv6 tunnel + + + NM_IP_TUNNEL_MODE_IP6GRE + = 8 + IPv6 GRE tunnel + + + NM_IP_TUNNEL_MODE_VTI6 + = 9 + IPv6 VTI tunnel + + + + + + + + diff --git a/libnm-core/nm-setting-8021x.h b/libnm-core/nm-setting-8021x.h index d8867b92..5cdcb3d5 100644 --- a/libnm-core/nm-setting-8021x.h +++ b/libnm-core/nm-setting-8021x.h @@ -136,6 +136,9 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/ * properties to the paths to their respective objects. */ +/** + * NMSetting8021x: + */ struct _NMSetting8021x { NMSetting parent; }; diff --git a/libnm-core/nm-setting-adsl.h b/libnm-core/nm-setting-adsl.h index 2b44d686..5afbe5bf 100644 --- a/libnm-core/nm-setting-adsl.h +++ b/libnm-core/nm-setting-adsl.h @@ -54,6 +54,9 @@ G_BEGIN_DECLS #define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux" #define NM_SETTING_ADSL_ENCAPSULATION_LLC "llc" +/** + * NMSettingAdsl: + */ struct _NMSettingAdsl { NMSetting parent; }; diff --git a/libnm-core/nm-setting-bluetooth.h b/libnm-core/nm-setting-bluetooth.h index 6bb5ce80..6746782e 100644 --- a/libnm-core/nm-setting-bluetooth.h +++ b/libnm-core/nm-setting-bluetooth.h @@ -59,6 +59,9 @@ G_BEGIN_DECLS */ #define NM_SETTING_BLUETOOTH_TYPE_PANU "panu" +/** + * NMSettingBluetooth: + */ struct _NMSettingBluetooth { NMSetting parent; }; diff --git a/libnm-core/nm-setting-bond.h b/libnm-core/nm-setting-bond.h index 98fcc6d0..8ee31888 100644 --- a/libnm-core/nm-setting-bond.h +++ b/libnm-core/nm-setting-bond.h @@ -70,6 +70,9 @@ G_BEGIN_DECLS #define NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB "tlb_dynamic_lb" #define NM_SETTING_BOND_OPTION_LP_INTERVAL "lp_interval" +/** + * NMSettingBond: + */ struct _NMSettingBond { NMSetting parent; }; diff --git a/libnm-core/nm-setting-bridge-port.h b/libnm-core/nm-setting-bridge-port.h index 49ca38b3..b43f6366 100644 --- a/libnm-core/nm-setting-bridge-port.h +++ b/libnm-core/nm-setting-bridge-port.h @@ -43,6 +43,9 @@ G_BEGIN_DECLS #define NM_SETTING_BRIDGE_PORT_PATH_COST "path-cost" #define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode" +/** + * NMSettingBridgePort: + */ struct _NMSettingBridgePort { NMSetting parent; }; diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h index 020d6db6..844c06ad 100644 --- a/libnm-core/nm-setting-bridge.h +++ b/libnm-core/nm-setting-bridge.h @@ -48,6 +48,9 @@ G_BEGIN_DECLS #define NM_SETTING_BRIDGE_AGEING_TIME "ageing-time" #define NM_SETTING_BRIDGE_MULTICAST_SNOOPING "multicast-snooping" +/** + * NMSettingBridge: + */ struct _NMSettingBridge { NMSetting parent; }; diff --git a/libnm-core/nm-setting-cdma.h b/libnm-core/nm-setting-cdma.h index 6e333dcc..091c530e 100644 --- a/libnm-core/nm-setting-cdma.h +++ b/libnm-core/nm-setting-cdma.h @@ -45,6 +45,9 @@ G_BEGIN_DECLS #define NM_SETTING_CDMA_PASSWORD "password" #define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags" +/** + * NMSettingCdma: + */ struct _NMSettingCdma { NMSetting parent; }; diff --git a/libnm-core/nm-setting-dcb.h b/libnm-core/nm-setting-dcb.h index e5bc4bcf..6cc2ce41 100644 --- a/libnm-core/nm-setting-dcb.h +++ b/libnm-core/nm-setting-dcb.h @@ -92,7 +92,9 @@ typedef enum { /*< flags >*/ #define NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH "priority-strict-bandwidth" #define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS "priority-traffic-class" - +/** + * NMSettingDcb: + */ struct _NMSettingDcb { NMSetting parent; }; diff --git a/libnm-core/nm-setting-generic.h b/libnm-core/nm-setting-generic.h index 7a209da2..0ce3b160 100644 --- a/libnm-core/nm-setting-generic.h +++ b/libnm-core/nm-setting-generic.h @@ -39,6 +39,9 @@ G_BEGIN_DECLS #define NM_SETTING_GENERIC_SETTING_NAME "generic" +/** + * NMSettingGeneric: + */ struct _NMSettingGeneric { NMSetting parent; }; diff --git a/libnm-core/nm-setting-gsm.h b/libnm-core/nm-setting-gsm.h index 2dfe73fa..7f97d386 100644 --- a/libnm-core/nm-setting-gsm.h +++ b/libnm-core/nm-setting-gsm.h @@ -53,6 +53,9 @@ G_BEGIN_DECLS #define NM_SETTING_GSM_SIM_ID "sim-id" #define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id" +/** + * NMSettingGsm: + */ struct _NMSettingGsm { NMSetting parent; }; diff --git a/libnm-core/nm-setting-infiniband.h b/libnm-core/nm-setting-infiniband.h index c5ad418b..f19983b4 100644 --- a/libnm-core/nm-setting-infiniband.h +++ b/libnm-core/nm-setting-infiniband.h @@ -45,6 +45,9 @@ G_BEGIN_DECLS #define NM_SETTING_INFINIBAND_P_KEY "p-key" #define NM_SETTING_INFINIBAND_PARENT "parent" +/** + * NMSettingInfiniband: + */ struct _NMSettingInfiniband { NMSetting parent; }; diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h index 39e4c9f0..79c7e639 100644 --- a/libnm-core/nm-setting-ip-config.h +++ b/libnm-core/nm-setting-ip-config.h @@ -165,6 +165,9 @@ void nm_ip_route_set_attribute (NMIPRoute *route, #define NM_SETTING_DNS_OPTION_NO_TLD_QUERY "no-tld-query" #define NM_SETTING_DNS_OPTION_USE_VC "use-vc" +/** + * NMSettingIPConfig: + */ struct _NMSettingIPConfig { NMSetting parent; }; diff --git a/libnm-core/nm-setting-ip-tunnel.h b/libnm-core/nm-setting-ip-tunnel.h index 09814f35..3ee4aafe 100644 --- a/libnm-core/nm-setting-ip-tunnel.h +++ b/libnm-core/nm-setting-ip-tunnel.h @@ -51,6 +51,9 @@ G_BEGIN_DECLS #define NM_SETTING_IP_TUNNEL_FLOW_LABEL "flow-label" #define NM_SETTING_IP_TUNNEL_MTU "mtu" +/** + * NMSettingIPTunnel: + */ struct _NMSettingIPTunnel { NMSetting parent; }; diff --git a/libnm-core/nm-setting-ip4-config.h b/libnm-core/nm-setting-ip4-config.h index 8e6524cb..adef3754 100644 --- a/libnm-core/nm-setting-ip4-config.h +++ b/libnm-core/nm-setting-ip4-config.h @@ -87,6 +87,9 @@ G_BEGIN_DECLS */ #define NM_SETTING_IP4_CONFIG_METHOD_DISABLED "disabled" +/** + * NMSettingIP4Config: + */ struct _NMSettingIP4Config { NMSettingIPConfig parent; }; diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index bab8c535..1f0b11fc 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -601,7 +601,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class) * * Configure method for creating the address for use with RFC4862 IPv6 * Stateless Address Autoconfiguration. The permitted values are: "eui64", - * "stable-privacy" or unset. + * or "stable-privacy". * * If the property is set to "eui64", the addresses will be generated * using the interface tokens derived from hardware address. This makes @@ -616,8 +616,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class) * and makes the address stable when the network interface hardware is * replaced. * - * Leaving this unset causes a default that could be subject to change - * in future versions to be used. + * On D-Bus, the absence of an addr-gen-mode setting equals enabling + * "stable-privacy". For keyfile plugin, the absence of the setting + * on disk means "eui64" so that the property doesn't change on upgrade + * from older versions. * * Note that this setting is distinct from the Privacy Extensions as * configured by "ip6-privacy" property and it does not affect the diff --git a/libnm-core/nm-setting-ip6-config.h b/libnm-core/nm-setting-ip6-config.h index f8923d19..2966e558 100644 --- a/libnm-core/nm-setting-ip6-config.h +++ b/libnm-core/nm-setting-ip6-config.h @@ -135,6 +135,9 @@ typedef enum { NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY = 1, } NMSettingIP6ConfigAddrGenMode; +/** + * NMSettingIP6Config: + */ struct _NMSettingIP6Config { NMSettingIPConfig parent; }; diff --git a/libnm-core/nm-setting-macvlan.h b/libnm-core/nm-setting-macvlan.h index 3922cd93..33860aac 100644 --- a/libnm-core/nm-setting-macvlan.h +++ b/libnm-core/nm-setting-macvlan.h @@ -44,6 +44,9 @@ G_BEGIN_DECLS #define NM_SETTING_MACVLAN_PROMISCUOUS "promiscuous" #define NM_SETTING_MACVLAN_TAP "tap" +/** + * NMSettingMacvlan: + */ struct _NMSettingMacvlan { NMSetting parent; }; diff --git a/libnm-core/nm-setting-olpc-mesh.h b/libnm-core/nm-setting-olpc-mesh.h index 6a165651..2506cec9 100644 --- a/libnm-core/nm-setting-olpc-mesh.h +++ b/libnm-core/nm-setting-olpc-mesh.h @@ -44,6 +44,9 @@ G_BEGIN_DECLS #define NM_SETTING_OLPC_MESH_CHANNEL "channel" #define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address" +/** + * NMSettingOlpcMesh: + */ struct _NMSettingOlpcMesh { NMSetting parent; }; diff --git a/libnm-core/nm-setting-ppp.h b/libnm-core/nm-setting-ppp.h index 2e0162cc..a835ef8a 100644 --- a/libnm-core/nm-setting-ppp.h +++ b/libnm-core/nm-setting-ppp.h @@ -59,6 +59,9 @@ G_BEGIN_DECLS #define NM_SETTING_PPP_LCP_ECHO_FAILURE "lcp-echo-failure" #define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval" +/** + * NMSettingPpp: + */ struct _NMSettingPpp { NMSetting parent; }; diff --git a/libnm-core/nm-setting-pppoe.h b/libnm-core/nm-setting-pppoe.h index b1e0d92f..1f5b6ed9 100644 --- a/libnm-core/nm-setting-pppoe.h +++ b/libnm-core/nm-setting-pppoe.h @@ -45,6 +45,9 @@ G_BEGIN_DECLS #define NM_SETTING_PPPOE_PASSWORD "password" #define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags" +/** + * NMSettingPppoe: + */ struct _NMSettingPppoe { NMSetting parent; }; diff --git a/libnm-core/nm-setting-serial.h b/libnm-core/nm-setting-serial.h index 58289227..182efc61 100644 --- a/libnm-core/nm-setting-serial.h +++ b/libnm-core/nm-setting-serial.h @@ -60,6 +60,9 @@ typedef enum { #define NM_SETTING_SERIAL_STOPBITS "stopbits" #define NM_SETTING_SERIAL_SEND_DELAY "send-delay" +/** + * NMSettingSerial: + */ struct _NMSettingSerial { NMSetting parent; }; diff --git a/libnm-core/nm-setting-team-port.h b/libnm-core/nm-setting-team-port.h index 86efb97c..546cc69a 100644 --- a/libnm-core/nm-setting-team-port.h +++ b/libnm-core/nm-setting-team-port.h @@ -40,6 +40,9 @@ G_BEGIN_DECLS #define NM_SETTING_TEAM_PORT_CONFIG "config" +/** + * NMSettingTeamPort: + */ struct _NMSettingTeamPort { NMSetting parent; }; diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h index d66eb685..726f8420 100644 --- a/libnm-core/nm-setting-team.h +++ b/libnm-core/nm-setting-team.h @@ -40,6 +40,9 @@ G_BEGIN_DECLS #define NM_SETTING_TEAM_CONFIG "config" +/** + * NMSettingTeam: + */ struct _NMSettingTeam { NMSetting parent; }; diff --git a/libnm-core/nm-setting-tun.h b/libnm-core/nm-setting-tun.h index 2b368a69..63c0cbd8 100644 --- a/libnm-core/nm-setting-tun.h +++ b/libnm-core/nm-setting-tun.h @@ -60,6 +60,9 @@ typedef enum { NM_SETTING_TUN_MODE_TAP = 2, } NMSettingTunMode; +/** + * NMSettingTun: + */ struct _NMSettingTun { NMSetting parent; }; diff --git a/libnm-core/nm-setting-vlan.h b/libnm-core/nm-setting-vlan.h index cf41ba17..b147a185 100644 --- a/libnm-core/nm-setting-vlan.h +++ b/libnm-core/nm-setting-vlan.h @@ -46,6 +46,9 @@ G_BEGIN_DECLS #define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map" #define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP "egress-priority-map" +/** + * NMSettingVlan: + */ struct _NMSettingVlan { NMSetting parent; }; diff --git a/libnm-core/nm-setting-vpn.h b/libnm-core/nm-setting-vpn.h index 31f3c7b8..539656f8 100644 --- a/libnm-core/nm-setting-vpn.h +++ b/libnm-core/nm-setting-vpn.h @@ -47,6 +47,9 @@ G_BEGIN_DECLS #define NM_SETTING_VPN_SECRETS "secrets" #define NM_SETTING_VPN_TIMEOUT "timeout" +/** + * NMSettingVpn: + */ struct _NMSettingVpn { NMSetting parent; }; diff --git a/libnm-core/nm-setting-vxlan.h b/libnm-core/nm-setting-vxlan.h index c410338e..fab2d820 100644 --- a/libnm-core/nm-setting-vxlan.h +++ b/libnm-core/nm-setting-vxlan.h @@ -56,6 +56,9 @@ G_BEGIN_DECLS #define NM_SETTING_VXLAN_L2_MISS "l2-miss" #define NM_SETTING_VXLAN_L3_MISS "l3-miss" +/** + * NMSettingVxlan: + */ struct _NMSettingVxlan { NMSetting parent; }; diff --git a/libnm-core/nm-setting-wimax.h b/libnm-core/nm-setting-wimax.h index 0a98fbb5..3f0767e9 100644 --- a/libnm-core/nm-setting-wimax.h +++ b/libnm-core/nm-setting-wimax.h @@ -42,6 +42,9 @@ G_BEGIN_DECLS #define NM_SETTING_WIMAX_NETWORK_NAME "network-name" #define NM_SETTING_WIMAX_MAC_ADDRESS "mac-address" +/** + * NMSettingWimax: + */ struct _NMSettingWimax { NMSetting parent; }; diff --git a/libnm-core/nm-setting-wired.h b/libnm-core/nm-setting-wired.h index 7eb53d30..6bc66782 100644 --- a/libnm-core/nm-setting-wired.h +++ b/libnm-core/nm-setting-wired.h @@ -93,6 +93,9 @@ typedef enum { /*< flags >*/ #define NM_SETTING_WIRED_WAKE_ON_LAN "wake-on-lan" #define NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD "wake-on-lan-password" +/** + * NMSettingWired: + */ struct _NMSettingWired { NMSetting parent; }; diff --git a/libnm-core/nm-setting-wireless-security.h b/libnm-core/nm-setting-wireless-security.h index 8c4e1f03..093cb386 100644 --- a/libnm-core/nm-setting-wireless-security.h +++ b/libnm-core/nm-setting-wireless-security.h @@ -89,6 +89,9 @@ typedef enum { #define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password" #define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags" +/** + * NMSettingWirelessSecurity: + */ struct _NMSettingWirelessSecurity { NMSetting parent; }; diff --git a/libnm-core/nm-setting-wireless.h b/libnm-core/nm-setting-wireless.h index 606733fa..574cee54 100644 --- a/libnm-core/nm-setting-wireless.h +++ b/libnm-core/nm-setting-wireless.h @@ -98,7 +98,9 @@ typedef enum { NM_SETTING_WIRELESS_POWERSAVE_LAST = _NM_SETTING_WIRELESS_POWERSAVE_NUM - 1, /*< skip >*/ } NMSettingWirelessPowersave; - +/** + * NMSettingWireless: + */ struct _NMSettingWireless { NMSetting parent; }; diff --git a/libnm-core/nm-simple-connection.h b/libnm-core/nm-simple-connection.h index da6030a8..d6a60447 100644 --- a/libnm-core/nm-simple-connection.h +++ b/libnm-core/nm-simple-connection.h @@ -36,6 +36,9 @@ G_BEGIN_DECLS #define NM_IS_SIMPLE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SIMPLE_CONNECTION)) #define NM_SIMPLE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SIMPLE_CONNECTION, NMSimpleConnectionClass)) +/** + * NMSimpleConnection: + */ struct _NMSimpleConnection { GObject parent; }; diff --git a/libnm-core/nm-vpn-dbus-types.xml b/libnm-core/nm-vpn-dbus-types.xml new file mode 100644 index 00000000..6e10060c --- /dev/null +++ b/libnm-core/nm-vpn-dbus-types.xml @@ -0,0 +1,246 @@ + + + + + + + VPN Plugin D-Bus API Types + 3 + VPN Plugin D-Bus API Types + + + VPN Plugin D-Bus API Types + + + + + enum NMVpnServiceState + + NMVpnServiceState + + VPN daemon states + + Values + + + + + + + + NM_VPN_SERVICE_STATE_UNKNOWN + = 0 + The state of the VPN plugin is unknown. + + + NM_VPN_SERVICE_STATE_INIT + = 1 + The VPN plugin is initialized. + + + NM_VPN_SERVICE_STATE_SHUTDOWN + = 2 + Not used. + + + NM_VPN_SERVICE_STATE_STARTING + = 3 + The plugin is attempting to connect to a VPN server. + + + NM_VPN_SERVICE_STATE_STARTED + = 4 + The plugin has connected to a VPN server. + + + NM_VPN_SERVICE_STATE_STOPPING + = 5 + The plugin is disconnecting from the VPN server. + + + NM_VPN_SERVICE_STATE_STOPPED + = 6 + The plugin has disconnected from the VPN server. + + + + + + + + + enum NMVpnConnectionState + + NMVpnConnectionState + + VPN connection states + + Values + + + + + + + + NM_VPN_CONNECTION_STATE_UNKNOWN + = 0 + The state of the VPN connection is unknown. + + + NM_VPN_CONNECTION_STATE_PREPARE + = 1 + The VPN connection is preparing to connect. + + + NM_VPN_CONNECTION_STATE_NEED_AUTH + = 2 + The VPN connection needs authorization credentials. + + + NM_VPN_CONNECTION_STATE_CONNECT + = 3 + The VPN connection is being established. + + + NM_VPN_CONNECTION_STATE_IP_CONFIG_GET + = 4 + The VPN connection is getting an IP address. + + + NM_VPN_CONNECTION_STATE_ACTIVATED + = 5 + The VPN connection is active. + + + NM_VPN_CONNECTION_STATE_FAILED + = 6 + The VPN connection failed. + + + NM_VPN_CONNECTION_STATE_DISCONNECTED + = 7 + The VPN connection is disconnected. + + + + + + + + + enum NMVpnConnectionStateReason + + NMVpnConnectionStateReason + + VPN connection state reasons + + Values + + + + + + + + NM_VPN_CONNECTION_STATE_REASON_UNKNOWN + = 0 + The reason for the VPN connection state change is unknown. + + + NM_VPN_CONNECTION_STATE_REASON_NONE + = 1 + No reason was given for the VPN connection state change. + + + NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED + = 2 + The VPN connection changed state because the user disconnected it. + + + NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED + = 3 + The VPN connection changed state because the device it was using was disconnected. + + + NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED + = 4 + The service providing the VPN connection was stopped. + + + NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID + = 5 + The IP config of the VPN connection was invalid. + + + NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT + = 6 + The connection attempt to the VPN service timed out. + + + NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT + = 7 + A timeout occurred while starting the service providing the VPN connection. + + + NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED + = 8 + Starting the service starting the service providing the VPN connection failed. + + + NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS + = 9 + Necessary secrets for the VPN connection were not provided. + + + NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED + = 10 + Authentication to the VPN server failed. + + + NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED + = 11 + The connection was deleted from settings. + + + + + + + + + enum NMVpnPluginFailure + + NMVpnPluginFailure + + VPN plugin failure reasons + + Values + + + + + + + + NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED + = 1 + Login failed. + + + NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED + = 2 + Connect failed. + + + NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG + = 3 + Invalid IP configuration returned from the VPN plugin. + + + + + + + + diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c index a49c3957..c4db3788 100644 --- a/libnm-core/nm-vpn-editor-plugin.c +++ b/libnm-core/nm-vpn-editor-plugin.c @@ -24,6 +24,8 @@ #include "nm-vpn-editor-plugin.h" +#include + #include "nm-core-internal.h" static void nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface); @@ -80,11 +82,15 @@ _nm_vpn_editor_plugin_load (const char *plugin_name, gpointer user_data, GError **error) { - GModule *module = NULL; + void *dl_module = NULL; + gboolean loaded_before; NMVpnEditorPluginFactory factory = NULL; - NMVpnEditorPlugin *editor_plugin = NULL; + gs_unref_object NMVpnEditorPlugin *editor_plugin = NULL; gs_free char *plugin_filename_free = NULL; const char *plugin_filename; + gs_free_error GError *factory_error = NULL; + gs_free char *plug_name = NULL; + gs_free char *plug_service = NULL; g_return_val_if_fail (plugin_name && *plugin_name, NULL); @@ -105,8 +111,14 @@ _nm_vpn_editor_plugin_load (const char *plugin_name, plugin_filename_free = g_module_build_path (NMPLUGINDIR, plugin_name); plugin_filename = plugin_filename_free; } + } - /* _nm_utils_check_module_file() fails with ENOENT if the plugin file + dl_module = dlopen (plugin_filename, RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD); + if ( !dl_module + && do_file_checks) { + /* If the module is already loaded, we skip the file checks. + * + * _nm_utils_check_module_file() fails with ENOENT if the plugin file * does not exist. That is relevant, because nm-applet checks for that. */ if (!_nm_utils_check_module_file (plugin_filename, check_owner, @@ -116,79 +128,85 @@ _nm_vpn_editor_plugin_load (const char *plugin_name, return NULL; } - module = g_module_open (plugin_filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - if (!module) { + if (dl_module) { + loaded_before = TRUE; + } else { + loaded_before = FALSE; + dl_module = dlopen (plugin_filename, RTLD_LAZY | RTLD_LOCAL); + } + + if (!dl_module) { + g_set_error (error, + NM_VPN_PLUGIN_ERROR, + NM_VPN_PLUGIN_ERROR_FAILED, + _("cannot load plugin \"%s\": %s"), + plugin_name, + dlerror () ?: "unknown reason"); + return NULL; + } + + factory = dlsym (dl_module, "nm_vpn_editor_plugin_factory"); + if (!factory) { g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_FAILED, - _("cannot load plugin %s"), plugin_name); + _("failed to load nm_vpn_editor_plugin_factory() from %s (%s)"), + plugin_name, dlerror ()); + dlclose (dl_module); return NULL; } - if (g_module_symbol (module, "nm_vpn_editor_plugin_factory", (gpointer) &factory)) { - gs_free_error GError *factory_error = NULL; - gboolean success = FALSE; - - editor_plugin = factory (&factory_error); - - g_assert (!editor_plugin || G_IS_OBJECT (editor_plugin)); - - if (editor_plugin) { - gs_free char *plug_name = NULL, *plug_service = NULL; - - /* Validate plugin properties */ - - g_object_get (G_OBJECT (editor_plugin), - NM_VPN_EDITOR_PLUGIN_NAME, &plug_name, - NM_VPN_EDITOR_PLUGIN_SERVICE, &plug_service, - NULL); - - if (!plug_name || !*plug_name) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_FAILED, - _("cannot load VPN plugin in '%s': missing plugin name"), - g_module_name (module)); - } else if ( check_service - && g_strcmp0 (plug_service, check_service) != 0) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_FAILED, - _("cannot load VPN plugin in '%s': invalid service name"), - g_module_name (module)); - } else { - /* Success! */ - g_object_set_data_full (G_OBJECT (editor_plugin), "gmodule", module, - (GDestroyNotify) g_module_close); - success = TRUE; - } + editor_plugin = factory (&factory_error); + + if (loaded_before) { + /* we want to leak the library, because the factory will register glib + * types, which cannot be unregistered. + * + * However, if the library was already loaded before, we want to return + * our part of the reference count. */ + dlclose (dl_module); + } + + if (!editor_plugin) { + if (factory_error) { + g_propagate_error (error, factory_error); + factory_error = NULL; } else { - if (factory_error) { - g_propagate_error (error, factory_error); - factory_error = NULL; - } else { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_FAILED, - _("unknown error initializing plugin %s"), plugin_name); - } + g_set_error (error, + NM_VPN_PLUGIN_ERROR, + NM_VPN_PLUGIN_ERROR_FAILED, + _("unknown error initializing plugin %s"), plugin_name); } + return NULL; + } - if (!success) { - g_module_close (module); - editor_plugin = NULL; - } - } else { + g_return_val_if_fail (G_IS_OBJECT (editor_plugin), NULL); + + /* Validate plugin properties */ + g_object_get (G_OBJECT (editor_plugin), + NM_VPN_EDITOR_PLUGIN_NAME, &plug_name, + NM_VPN_EDITOR_PLUGIN_SERVICE, &plug_service, + NULL); + + if (!plug_name || !*plug_name) { g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_FAILED, - _("failed to load nm_vpn_editor_plugin_factory() from %s (%s)"), - g_module_name (module), g_module_error ()); - g_module_close (module); - editor_plugin = NULL; + _("cannot load VPN plugin in '%s': missing plugin name"), + plugin_name); + return NULL; + } + if ( check_service + && g_strcmp0 (plug_service, check_service) != 0) { + g_set_error (error, + NM_VPN_PLUGIN_ERROR, + NM_VPN_PLUGIN_ERROR_FAILED, + _("cannot load VPN plugin in '%s': invalid service name"), + plugin_name); + return NULL; } - return editor_plugin; + return nm_unauto (&editor_plugin); } /** diff --git a/libnm-core/nm-vpn-plugin-info.h b/libnm-core/nm-vpn-plugin-info.h index 667a4fe2..c7fef857 100644 --- a/libnm-core/nm-vpn-plugin-info.h +++ b/libnm-core/nm-vpn-plugin-info.h @@ -44,6 +44,9 @@ G_BEGIN_DECLS #define NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM "libnm" #define NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME "GNOME" +/** + * NMVpnPluginInfo: + */ typedef struct { NM_AVAILABLE_IN_1_2 GObject parent; -- cgit 1.3.0-6-gf8a5