From d465e5fac63f36bcf4069e36827f4b62c494556d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 27 May 2011 19:57:25 +0200 Subject: Imported Upstream version 0.8.9997 --- docs/api/html/NetworkManager.devhelp | 28 +- docs/api/html/NetworkManager.devhelp2 | 28 +- docs/api/html/index.html | 32 +- docs/api/html/ix01.html | 2 +- docs/api/html/ref-migrating.html | 58 +- docs/api/html/ref-settings.html | 36 +- docs/api/html/spec.html | 18 +- docs/api/spec.html | 18 +- docs/api/version.xml | 2 +- docs/libnm-glib/html/NMAccessPoint.html | 8 +- docs/libnm-glib/html/NMActiveConnection.html | 8 +- docs/libnm-glib/html/NMClient.html | 12 +- docs/libnm-glib/html/NMDevice.html | 52 +- docs/libnm-glib/html/NMRemoteConnection.html | 6 +- docs/libnm-glib/html/NMRemoteSettings.html | 4 +- docs/libnm-glib/html/NMSecretAgent.html | 30 +- docs/libnm-glib/html/NMWimaxNsp.html | 8 +- docs/libnm-glib/html/api-index-full.html | 12 + docs/libnm-glib/html/ch02.html | 2 +- docs/libnm-glib/html/index.html | 2 +- docs/libnm-glib/html/index.sgml | 3 + docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html | 28 +- docs/libnm-glib/html/libnm-glib.devhelp | 3 + docs/libnm-glib/html/libnm-glib.devhelp2 | 3 + docs/libnm-glib/html/object-tree.html | 2 +- docs/libnm-glib/libnm-glib-sections.txt | 2 + docs/libnm-util/html/NMConnection.html | 1371 ++++++++++++++++++++ docs/libnm-util/html/NMSetting.html | 30 +- docs/libnm-util/html/NMSetting8021x.html | 60 +- docs/libnm-util/html/NMSettingConnection.html | 6 +- docs/libnm-util/html/NMSettingVPN.html | 8 +- docs/libnm-util/html/annotation-glossary.html | 6 + docs/libnm-util/html/api-index-full.html | 98 +- docs/libnm-util/html/ch01.html | 10 +- docs/libnm-util/html/index.html | 3 + docs/libnm-util/html/index.sgml | 63 + docs/libnm-util/html/libnm-util.devhelp | 50 + docs/libnm-util/html/libnm-util.devhelp2 | 53 + docs/libnm-util/html/object-tree.html | 4 +- 39 files changed, 1909 insertions(+), 260 deletions(-) create mode 100644 docs/libnm-util/html/NMConnection.html (limited to 'docs') diff --git a/docs/api/html/NetworkManager.devhelp b/docs/api/html/NetworkManager.devhelp index 3954eb81..bf173496 100644 --- a/docs/api/html/NetworkManager.devhelp +++ b/docs/api/html/NetworkManager.devhelp @@ -4,23 +4,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 5ca2e583..20f2b147 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -4,23 +4,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 392f24f2..091a4290 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -22,11 +22,11 @@     
  

-

Version 0.8.999 +

Version 0.8.9997

Copyright © 2011 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later @@ -61,25 +61,25 @@

D-Bus API Reference
Network Configuration Setting Specification
-
Configuration Settings
+
Configuration Settings
Secret flag types
Migrating from NetworkManager 0.8 to NetworkManager 0.9
-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed
Index
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index f5efded9..1387212f 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -21,7 +21,7 @@

-Index

+Index
diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index 8798b9a4..8324e263 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -23,20 +23,20 @@

Migrating from NetworkManager 0.8 to NetworkManager 0.9

-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed

@@ -50,14 +50,14 @@

-Architecture and D-Bus API Changes in 0.9

+Architecture and D-Bus API Changes in 0.9

This section details the architectural and D-Bus API changes in NetworkManager 0.9.

-Elimination of the User Settings Service

+Elimination of the User Settings Service

Previously there were two "settings services", or D-Bus services that provided and saved network configuration information. NetworkManager @@ -103,7 +103,7 @@

-User Secret Agents

+User Secret Agents

Even with the elimination of the user settings service, in some cases it is still desirable to store secrets in the user's session and not in @@ -152,7 +152,7 @@

-Settings Service Interface Changes

+Settings Service Interface Changes

With the elimination of the user settings service, the old org.freedesktop.NetworkManagerUserSettings and @@ -188,7 +188,7 @@

-Connection Object Interface Changes

+Connection Object Interface Changes

Consistent with the interface changes to the Settings object, the Connection object's D-Bus interface has changed to @@ -222,7 +222,7 @@

-Permissions Methods Consolidation

+Permissions Methods Consolidation

Previously there were two D-Bus method calls to retrieve the list of operations that a user client could perform, and two signals notifying @@ -254,7 +254,7 @@ are now string-based permissions. The mapping is as follows:

-

Table 17. 

+

Table 17. 

@@ -305,7 +305,7 @@

-AddConnection Returns Object Path of New Connection

+AddConnection Returns Object Path of New Connection

The org.freedesktop.NetworkManager.Settings.AddConnection @@ -323,7 +323,7 @@

-Support for WiMAX Devices

+Support for WiMAX Devices

NetworkManager now supports Intel WiMAX mobile broadband devices. A corresponding device type (NM_DEVICE_TYPE_WIMAX) and @@ -346,7 +346,7 @@

-New Device States

+New Device States

A few new device states have been added, and all device states have been renumbered for flexibility. @@ -361,7 +361,7 @@

-New Active Connection State

+New Active Connection State

Along with the new device states, an additional @@ -377,7 +377,7 @@

-Consolidated Modem Devices

+Consolidated Modem Devices

Many new mobile broadband devices support multiple access families, like Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE @@ -413,7 +413,7 @@

-Secret Property Flags

+Secret Property Flags

In the Connection object's configuration properties, each setting's secret properties (like WiFi passphrases, or public key passwords, etc) now has @@ -422,7 +422,7 @@ following values:

-

Table 18. 

+

Table 18. 

@@ -484,7 +484,7 @@

-Deprecated Methods Removed

+Deprecated Methods Removed

A few methods and signals of the org.freedesktop.NetworkManager interface deprecated in version 0.7 have been removed. All the @@ -494,7 +494,7 @@ their replacements:

-

Table 19. 

+

Table 19. 

diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index 7924bbce..6f947c7d 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -23,7 +23,7 @@

Network Configuration Setting Specification

-
Configuration Settings
+
Configuration Settings
Secret flag types

@@ -35,11 +35,11 @@

-Configuration Settings

+Configuration Settings

-

Table 1. 802-1x setting

+

Table 1. 802-1x setting

@@ -204,7 +204,7 @@


-

Table 2. bluetooth setting

+

Table 2. bluetooth setting

@@ -243,7 +243,7 @@


-

Table 3. cdma setting

+

Table 3. cdma setting

@@ -294,7 +294,7 @@


-

Table 4. connection setting

+

Table 4. connection setting

@@ -363,7 +363,7 @@


-

Table 5. gsm setting

+

Table 5. gsm setting

@@ -456,7 +456,7 @@


-

Table 6. ipv4 setting

+

Table 6. ipv4 setting

@@ -555,7 +555,7 @@


-

Table 7. ipv6 setting

+

Table 7. ipv6 setting

@@ -636,7 +636,7 @@


-

Table 8. 802-11-olpc-mesh setting

+

Table 8. 802-11-olpc-mesh setting

@@ -681,7 +681,7 @@


-

Table 9. ppp setting

+

Table 9. ppp setting

@@ -816,7 +816,7 @@


-

Table 10. pppoe setting

+

Table 10. pppoe setting

@@ -867,7 +867,7 @@


-

Table 11. serial setting

+

Table 11. serial setting

@@ -924,7 +924,7 @@


-

Table 12. vpn setting

+

Table 12. vpn setting

@@ -975,7 +975,7 @@


-

Table 13. wimax setting

+

Table 13. wimax setting

@@ -1014,7 +1014,7 @@


-

Table 14. 802-3-ethernet setting

+

Table 14. 802-3-ethernet setting

@@ -1101,7 +1101,7 @@


-

Table 15. 802-11-wireless setting

+

Table 15. 802-11-wireless setting

@@ -1200,7 +1200,7 @@


-

Table 16. 802-11-wireless-security setting

+

Table 16. 802-11-wireless-security setting

diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html index 5bb127d4..4533e786 100644 --- a/docs/api/html/spec.html +++ b/docs/api/html/spec.html @@ -258,7 +258,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

state ( ) → @@ -476,6 +477,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_DEVICE_STATE)
The current state of the device. +
ActiveConnection - + o - + (read)
+ Object path of an ActiveConnection object that "owns" this device during + activation. The ActiveConnection object tracks the life-cycle of a + connection to a specific network and implements the + org.freedesktop.NetworkManager.Connection.Active D-Bus interface.
Ip4Config - o - (read)
@@ -1093,7 +1101,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

Interface has no properties.

-

org.freedesktop.NetworkManager.Connection.Active

Interface has no methods.

Signals:

PropertiesChanged ( +

org.freedesktop.NetworkManager.Connection.Active

+ Objects that implement the Connection.Active interface represent an attempt + to connect to a network using the details provided by a Connection object. + The Connection.Active object tracks the life-cycle of the connection + attempt and if successful indicates whether the connected network is the + "default" or preferred network for access. +

Interface has no methods.

Signals:

PropertiesChanged ( a{sv}: properties )

Parameters

properties - a{sv} diff --git a/docs/api/spec.html b/docs/api/spec.html index 5bb127d4..4533e786 100644 --- a/docs/api/spec.html +++ b/docs/api/spec.html @@ -258,7 +258,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

state ( ) → @@ -476,6 +477,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_DEVICE_STATE)
The current state of the device. +
ActiveConnection - + o - + (read)
+ Object path of an ActiveConnection object that "owns" this device during + activation. The ActiveConnection object tracks the life-cycle of a + connection to a specific network and implements the + org.freedesktop.NetworkManager.Connection.Active D-Bus interface.
Ip4Config - o - (read)
@@ -1093,7 +1101,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

Interface has no properties.

-

org.freedesktop.NetworkManager.Connection.Active

Interface has no methods.

Signals:

PropertiesChanged ( +

org.freedesktop.NetworkManager.Connection.Active

+ Objects that implement the Connection.Active interface represent an attempt + to connect to a network using the details provided by a Connection object. + The Connection.Active object tracks the life-cycle of the connection + attempt and if successful indicates whether the connected network is the + "default" or preferred network for access. +

Interface has no methods.

Signals:

PropertiesChanged ( a{sv}: properties )

Parameters

properties - a{sv} diff --git a/docs/api/version.xml b/docs/api/version.xml index b81eb02c..02098219 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -0.8.999 +0.8.9997 diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html index 08cf78e8..6124f9bb 100644 --- a/docs/libnm-glib/html/NMAccessPoint.html +++ b/docs/libnm-glib/html/NMAccessPoint.html @@ -68,7 +68,7 @@ const char * NMAccessPoint *ap, const GSList *connections); gboolean nm_access_point_connection_valid (NMAccessPoint *ap, - NMConnection *connection); + NMConnection *connection); const char * nm_access_point_get_hw_address (NMAccessPoint *ap);
@@ -457,13 +457,13 @@ other attributes like security settings, channel, etc.
- - @@ -782,6 +816,14 @@ if is incompatible with the device's capabilities and characteristics.

Property Details

+

The "active-connection" property

+
  "active-connection"        NMActiveConnection*   : Read
+

+The NMActiveConnection object that "owns" this device during activation. +

+
+
+

The "capabilities" property

  "capabilities"             guint                 : Read

diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html index 07e3564b..8be508be 100644 --- a/docs/libnm-glib/html/NMRemoteConnection.html +++ b/docs/libnm-glib/html/NMRemoteConnection.html @@ -75,7 +75,7 @@

Object Hierarchy

   GObject
-   +----NMConnection
+   +----NMConnection
          +----NMRemoteConnection
@@ -329,7 +329,7 @@ invisible to the current user.
- @@ -353,7 +353,7 @@ still visible to the user. - diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html index b3741ef3..4274c72a 100644 --- a/docs/libnm-glib/html/NMRemoteSettings.html +++ b/docs/libnm-glib/html/NMRemoteSettings.html @@ -73,7 +73,7 @@ struct NMRemoteSettings *settings, const char *uuid); gbooleannm_remote_settings_add_connection (NMRemoteSettings *settings, - NMConnection *connection, + NMConnection *connection, NMRemoteSettingsAddConnectionFunc callback, gpointer user_data); gbooleannm_remote_settings_save_hostname (NMRemoteSettings *settings, @@ -394,7 +394,7 @@ not known. [

nm_remote_settings_add_connection ()

gboolean            nm_remote_settings_add_connection   (NMRemoteSettings *settings,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          NMRemoteSettingsAddConnectionFunc callback,
                                                          gpointer user_data);

diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html index 8da09f9c..4b08499c 100644 --- a/docs/libnm-glib/html/NMSecretAgent.html +++ b/docs/libnm-glib/html/NMSecretAgent.html @@ -53,16 +53,16 @@ enum NM_SECRET_AGENT_REGISTRATION_RESULT NMSecretAgent; void (*NMSecretAgentGetSecretsFunc) (NMSecretAgent *agent, - NMConnection *connection, + NMConnection *connection, GHashTable *secrets, GError *error, gpointer user_data); void (*NMSecretAgentSaveSecretsFunc) (NMSecretAgent *agent, - NMConnection *connection, + NMConnection *connection, GError *error, gpointer user_data); void (*NMSecretAgentDeleteSecretsFunc) (NMSecretAgent *agent, - NMConnection *connection, + NMConnection *connection, GError *error, gpointer user_data); NMSecretAgentClass; @@ -70,18 +70,18 @@ enum gboolean nm_secret_agent_register (NMSecretAgent *self); gboolean nm_secret_agent_unregister (NMSecretAgent *self); void nm_secret_agent_get_secrets (NMSecretAgent *self, - NMConnection *connection, + NMConnection *connection, const char *setting_name, const char **hints, NMSecretAgentGetSecretsFlags flags, NMSecretAgentGetSecretsFunc callback, gpointer callback_data); void nm_secret_agent_save_secrets (NMSecretAgent *self, - NMConnection *connection, + NMConnection *connection, NMSecretAgentSaveSecretsFunc callback, gpointer callback_data); void nm_secret_agent_delete_secrets (NMSecretAgent *self, - NMConnection *connection, + NMConnection *connection, NMSecretAgentDeleteSecretsFunc callback, gpointer callback_data); @@ -225,7 +225,7 @@ is allowed.

NMSecretAgentGetSecretsFunc ()

void                (*NMSecretAgentGetSecretsFunc)      (NMSecretAgent *agent,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          GHashTable *secrets,
                                                          GError *error,
                                                          gpointer user_data);
@@ -236,7 +236,7 @@ is allowed.

NMSecretAgentSaveSecretsFunc ()

void                (*NMSecretAgentSaveSecretsFunc)     (NMSecretAgent *agent,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          GError *error,
                                                          gpointer user_data);

@@ -246,7 +246,7 @@ is allowed.

NMSecretAgentDeleteSecretsFunc ()

void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          GError *error,
                                                          gpointer user_data);

@@ -388,7 +388,7 @@ store secrets on behalf of this user.

nm_secret_agent_get_secrets ()

void                nm_secret_agent_get_secrets         (NMSecretAgent *self,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          const char *setting_name,
                                                          const char **hints,
                                                          NMSecretAgentGetSecretsFlags flags,
@@ -414,7 +414,7 @@ VFunc: get_secrets
- + @@ -446,7 +446,7 @@ VFunc: get_secrets

nm_secret_agent_save_secrets ()

void                nm_secret_agent_save_secrets        (NMSecretAgent *self,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          NMSecretAgentSaveSecretsFunc callback,
                                                          gpointer callback_data);

@@ -466,7 +466,7 @@ VFunc: save_secrets

- @@ -486,7 +486,7 @@ VFunc: save_secrets

nm_secret_agent_delete_secrets ()

void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          NMSecretAgentDeleteSecretsFunc callback,
                                                          gpointer callback_data);

@@ -506,7 +506,7 @@ VFunc: delete_secrets

- diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html index 10f11410..dfff7ffd 100644 --- a/docs/libnm-glib/html/NMWimaxNsp.html +++ b/docs/libnm-glib/html/NMWimaxNsp.html @@ -55,7 +55,7 @@ const char * GSList * nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp, const GSList *connections); gbooleannm_wimax_nsp_connection_valid (NMWimaxNsp *nsp, - NMConnection *connection); + NMConnection *connection);
@@ -256,13 +256,13 @@ returned connections will match the nsp'

connections :

 a list of -NMConnection objects to filter. [element-type NetworkManager.Connection] +NMConnection objects to filter. [element-type NetworkManager.Connection]

Returns :

 a -list of NMConnection objects that could be activated with the given ap. +list of NMConnection objects that could be activated with the given ap. The elements of the list are owned by their creator and should not be freed by the caller, but the returned list itself is owned by the caller and should be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] @@ -476,7 +476,7 @@ be freed with

nm_access_point_connection_valid ()

gboolean            nm_access_point_connection_valid    (NMAccessPoint *ap,
-                                                         NMConnection *connection);
+ NMConnection *connection);

diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html index 7f597bfe..f8548683 100644 --- a/docs/libnm-glib/html/NMActiveConnection.html +++ b/docs/libnm-glib/html/NMActiveConnection.html @@ -202,7 +202,7 @@ Creates a new

nm_active_connection_get_connection ()

const char *        nm_active_connection_get_connection (NMActiveConnection *connection);

-Gets the NMConnection's DBus object path. +Gets the NMConnection's DBus object path.

@@ -214,7 +214,7 @@ Gets the NMConnection's DBus object path. - @@ -225,7 +225,7 @@ This is the internal string used by the connection, and must not be modified.

nm_active_connection_get_uuid ()

const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);

-Gets the NMConnection's UUID. +Gets the NMConnection's UUID.

Returns :

the object path of the NMConnection inside of NMActiveConnection. +the object path of the NMConnection inside of NMActiveConnection. This is the internal string used by the connection, and must not be modified.
@@ -237,7 +237,7 @@ Gets the NMConnection's UUID. - diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html index b8834f84..26d99de0 100644 --- a/docs/libnm-glib/html/NMClient.html +++ b/docs/libnm-glib/html/NMClient.html @@ -67,7 +67,7 @@ const GError *error, gpointer user_data); voidnm_client_activate_connection (NMClient *client, - NMConnection *connection, + NMConnection *connection, NMDevice *device, const char *specific_object, NMClientActivateFn callback, @@ -79,7 +79,7 @@ const gpointer user_data); voidnm_client_add_and_activate_connection (NMClient *client, - NMConnection *partial, + NMConnection *partial, NMDevice *device, const char *specific_object, NMClientAddActivateFn callback, @@ -390,7 +390,7 @@ Gets a

nm_client_activate_connection ()

void                nm_client_activate_connection       (NMClient *client,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          NMDevice *device,
                                                          const char *specific_object,
                                                          NMClientActivateFn callback,
@@ -414,7 +414,7 @@ determine which network to connect to given the settings in connection :

-
@@ -462,7 +462,7 @@ details of the newly added connection. [

nm_client_add_and_activate_connection ()

void                nm_client_add_and_activate_connection
                                                         (NMClient *client,
-                                                         NMConnection *partial,
+                                                         NMConnection *partial,
                                                          NMDevice *device,
                                                          const char *specific_object,
                                                          NMClientAddActivateFn callback,
@@ -483,7 +483,7 @@ Cannot be used for VPN connections at this time.
- diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index 3af508c4..f7f01aa2 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -56,6 +56,7 @@ #define NM_DEVICE_IP6_CONFIG #define NM_DEVICE_DHCP6_CONFIG #define NM_DEVICE_STATE +#define NM_DEVICE_ACTIVE_CONNECTION #define NM_DEVICE_VENDOR #define NM_DEVICE_PRODUCT NMDevice; @@ -75,6 +76,7 @@ const char * NMIP6Config * nm_device_get_ip6_config (NMDevice *device); NMDHCP6Config * nm_device_get_dhcp6_config (NMDevice *device); NMDeviceState nm_device_get_state (NMDevice *device); +NMActiveConnection * nm_device_get_active_connection (NMDevice *device); const char * nm_device_get_product (NMDevice *device); const char * nm_device_get_vendor (NMDevice *device); void (*NMDeviceDeactivateFn) (NMDevice *device, @@ -86,7 +88,7 @@ const char * GSList * nm_device_filter_connections (NMDevice *device, const GSList *connections); gboolean nm_device_connection_valid (NMDevice *device, - NMConnection *connection); + NMConnection *connection);
@@ -105,6 +107,7 @@ const char *

Properties

+  "active-connection"        NMActiveConnection*   : Read
   "capabilities"             guint                 : Read
   "device-type"              guint                 : Read / Write / Construct Only
   "dhcp4-config"             NMDHCP4Config*        : Read
@@ -240,6 +243,14 @@ const char *          
+
NM_DEVICE_ACTIVE_CONNECTION

+
#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
+

+

+

+
+
+

NM_DEVICE_VENDOR

#define NM_DEVICE_VENDOR "vendor"
@@ -620,6 +631,29 @@ Gets the current
+

nm_device_get_active_connection ()

+
NMActiveConnection *  nm_device_get_active_connection   (NMDevice *device);
+

+Gets the NMActiveConnection object which owns this device during activation. +

+

Returns :

the UUID of the NMConnection that backs the NMActiveConnection. +the UUID of the NMConnection that backs the NMActiveConnection. This is the internal string used by the connection, and must not be modified.
an NMConnection +an NMConnection

partial :

an NMConnection to add; the connection may be +an NMConnection to add; the connection may be partially filled (or even NULL) and will be completed by NetworkManager using the given device and specific_object before being added. [allow-none]
++ + + + + + + + + + +

device :

a NMDevice +

Returns :

the NMActiveConnection +
+ +
+

nm_device_get_product ()

const char *          nm_device_get_product             (NMDevice *device);

@@ -728,13 +762,13 @@ incompatible with the device.

connections :

a list of NMConnection objects to filter. [element-type NetworkManager.Connection] +a list of NMConnection objects to filter. [element-type NetworkManager.Connection]

Returns :

 a -list of NMConnection objects that could be activated with the given device. +list of NMConnection objects that could be activated with the given device. The elements of the list are owned by their creator and should not be freed by the caller, but the returned list itself is owned by the caller and should be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] @@ -747,7 +781,7 @@ be freed with

nm_device_connection_valid ()

gboolean            nm_device_connection_valid          (NMDevice *device,
-                                                         NMConnection *connection);
+ NMConnection *connection);

Validates a given connection for a given NMDevice object and returns whether the connection may be activated with the device. For example if @@ -766,7 +800,7 @@ device.

connection :

an NMConnection to validate against device +an NMConnection to validate against device

connection :

a NMConnection +a NMConnection

connection :

a NMConnection +a NMConnection

connection :

the NMConnection for which we're asked secretsthe NMConnection for which we're asked secrets

setting_name :

connection :

a NMConnection +a NMConnection

connection :

a NMConnection +a NMConnection

connections :

 a list of -NMConnection objects to filter. [element-type NetworkManager.Connection] +NMConnection objects to filter. [element-type NetworkManager.Connection]

Returns :

 a -list of NMConnection objects that could be activated with the given nsp. +list of NMConnection objects that could be activated with the given nsp. The elements of the list are owned by their creator and should not be freed by the caller, but the returned list itself is owned by the caller and should be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] @@ -275,7 +275,7 @@ be freed with

nm_wimax_nsp_connection_valid ()

gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
-                                                         NMConnection *connection);
+ NMConnection *connection);

diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html index f2b1352a..311e8996 100644 --- a/docs/libnm-glib/html/api-index-full.html +++ b/docs/libnm-glib/html/api-index-full.html @@ -533,6 +533,10 @@ dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER, function in nm-sec
+NMDevice:active-connection, object property in NMDevice +
+
+
NMDevice:capabilities, object property in NMDevice
@@ -745,6 +749,10 @@ dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER, function in nm-sec
+NM_DEVICE_ACTIVE_CONNECTION, macro in NMDevice +
+
+
NM_DEVICE_BT_CAPABILITIES, macro in NMDeviceBt
@@ -845,6 +853,10 @@ dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER, function in nm-sec
+nm_device_get_active_connection, function in NMDevice +
+
+
nm_device_get_capabilities, function in NMDevice
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html index 6d814661..bfc17007 100644 --- a/docs/libnm-glib/html/ch02.html +++ b/docs/libnm-glib/html/ch02.html @@ -21,7 +21,7 @@

-libnm-glib API Reference

+libnm-glib API Reference
NMClient diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index 0eb745a3..665edd03 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -29,7 +29,7 @@

Copyright © 2011 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml index de8edceb..db6d2d8a 100644 --- a/docs/libnm-glib/html/index.sgml +++ b/docs/libnm-glib/html/index.sgml @@ -112,6 +112,7 @@ + @@ -130,6 +131,7 @@ + @@ -137,6 +139,7 @@ + diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html index d517644e..834996c2 100644 --- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html +++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html @@ -49,23 +49,23 @@ enum NMVpnPluginUiInterface; NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface, - NMConnection *connection, + NMConnection *connection, GError **error); guint32 nm_vpn_plugin_ui_interface_get_capabilities (NMVpnPluginUiInterface *iface); -NMConnection * nm_vpn_plugin_ui_interface_import (NMVpnPluginUiInterface *iface, +NMConnection * nm_vpn_plugin_ui_interface_import (NMVpnPluginUiInterface *iface, const char *path, GError **error); gboolean nm_vpn_plugin_ui_interface_export (NMVpnPluginUiInterface *iface, const char *path, - NMConnection *connection, + NMConnection *connection, GError **error); char * nm_vpn_plugin_ui_interface_get_suggested_name (NMVpnPluginUiInterface *iface, - NMConnection *connection); + NMConnection *connection); gboolean nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface, - NMConnection *connection, + NMConnection *connection, GError **error); #define NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE #define NM_VPN_PLUGIN_UI_WIDGET_INTERFACE (obj) @@ -78,11 +78,11 @@ struct NMVpnPluginUiWidgetInterface *iface); gboolean nm_vpn_plugin_ui_widget_interface_update_connection (NMVpnPluginUiWidgetInterface *iface, - NMConnection *connection, + NMConnection *connection, GError **error); gboolean nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInterface *iface, - NMConnection *connection, + NMConnection *connection, GError **error);

@@ -236,7 +236,7 @@ struct

nm_vpn_plugin_ui_interface_ui_factory ()

NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
                                                         (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          GError **error);

@@ -252,7 +252,7 @@ struct

nm_vpn_plugin_ui_interface_import ()

-
NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
+
NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
                                                          const char *path,
                                                          GError **error);

 

@@ -263,7 +263,7 @@ struct              
nm_vpn_plugin_ui_interface_export ()

 
gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
                                                          const char *path,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          GError **error);

 

 

@@ -273,7 +273,7 @@ struct              
nm_vpn_plugin_ui_interface_get_suggested_name ()

 
char *              nm_vpn_plugin_ui_interface_get_suggested_name
                                                         (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection);

+                                                         NMConnection *connection);

@@ -282,7 +282,7 @@ struct

nm_vpn_plugin_ui_interface_delete_connection ()

gboolean            nm_vpn_plugin_ui_interface_delete_connection
                                                         (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          GError **error);

@@ -377,7 +377,7 @@ struct

nm_vpn_plugin_ui_widget_interface_update_connection ()

gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
                                                         (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          GError **error);

@@ -387,7 +387,7 @@ struct

nm_vpn_plugin_ui_widget_interface_save_secrets ()

gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
                                                         (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          GError **error);

diff --git a/docs/libnm-glib/html/libnm-glib.devhelp b/docs/libnm-glib/html/libnm-glib.devhelp index 784eca14..cd1d0857 100644 --- a/docs/libnm-glib/html/libnm-glib.devhelp +++ b/docs/libnm-glib/html/libnm-glib.devhelp @@ -122,6 +122,7 @@ + @@ -140,12 +141,14 @@ + + diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2 index 4cc1d64b..a74fd687 100644 --- a/docs/libnm-glib/html/libnm-glib.devhelp2 +++ b/docs/libnm-glib/html/libnm-glib.devhelp2 @@ -122,6 +122,7 @@ + @@ -140,12 +141,14 @@ + + diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html index 1ebe1369..6bcd8f42 100644 --- a/docs/libnm-glib/html/object-tree.html +++ b/docs/libnm-glib/html/object-tree.html @@ -41,7 +41,7 @@ NMDHCP4Config NMDHCP6Config NMRemoteSettings - NMConnection + NMConnection NMRemoteConnection NMSecretAgent diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt index 71910fd5..90733f9b 100644 --- a/docs/libnm-glib/libnm-glib-sections.txt +++ b/docs/libnm-glib/libnm-glib-sections.txt @@ -302,6 +302,7 @@ NM_DEVICE_DHCP4_CONFIG NM_DEVICE_IP6_CONFIG NM_DEVICE_DHCP6_CONFIG NM_DEVICE_STATE +NM_DEVICE_ACTIVE_CONNECTION NM_DEVICE_VENDOR NM_DEVICE_PRODUCT NMDevice @@ -320,6 +321,7 @@ nm_device_get_dhcp4_config nm_device_get_ip6_config nm_device_get_dhcp6_config nm_device_get_state +nm_device_get_active_connection nm_device_get_product nm_device_get_vendor NMDeviceDeactivateFn diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html new file mode 100644 index 00000000..489a2fd6 --- /dev/null +++ b/docs/libnm-util/html/NMConnection.html @@ -0,0 +1,1371 @@ + + + + +NMConnection + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

NMConnection

+

NMConnection — Describes a connection to specific network or provider

+
+
+

Synopsis

+
+#include <nm-connection.h>
+
+enum                NMConnectionError;
+#define             NM_TYPE_CONNECTION_ERROR
+#define             NM_CONNECTION_ERROR
+GQuark              nm_connection_error_quark           (void);
+#define             NM_CONNECTION_PATH
+                    NMConnection;
+                    NMConnectionClass;
+GType               nm_connection_get_type              (void);
+NMConnection *      nm_connection_new                   (void);
+NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
+                                                         GError **error);
+NMConnection *      nm_connection_duplicate             (NMConnection *connection);
+NMSetting *         nm_connection_create_setting        (const char *name);
+void                nm_connection_add_setting           (NMConnection *connection,
+                                                         NMSetting *setting);
+void                nm_connection_remove_setting        (NMConnection *connection,
+                                                         GType setting_type);
+NMSetting *         nm_connection_get_setting           (NMConnection *connection,
+                                                         GType setting_type);
+NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
+                                                         const char *name);
+gboolean            nm_connection_replace_settings      (NMConnection *connection,
+                                                         GHashTable *new_settings,
+                                                         GError **error);
+gboolean            nm_connection_compare               (NMConnection *a,
+                                                         NMConnection *b,
+                                                         NMSettingCompareFlags flags);
+gboolean            nm_connection_diff                  (NMConnection *a,
+                                                         NMConnection *b,
+                                                         NMSettingCompareFlags flags,
+                                                         GHashTable **out_settings);
+gboolean            nm_connection_verify                (NMConnection *connection,
+                                                         GError **error);
+const char *        nm_connection_need_secrets          (NMConnection *connection,
+                                                         GPtrArray **hints);
+void                nm_connection_clear_secrets         (NMConnection *connection);
+gboolean            nm_connection_update_secrets        (NMConnection *connection,
+                                                         const char *setting_name,
+                                                         GHashTable *setting_secrets,
+                                                         GError **error);
+void                nm_connection_set_path              (NMConnection *connection,
+                                                         const char *path);
+const char *        nm_connection_get_path              (NMConnection *connection);
+void                nm_connection_for_each_setting_value
+                                                        (NMConnection *connection,
+                                                         NMSettingValueIterFn func,
+                                                         gpointer user_data);
+GHashTable *        nm_connection_to_hash               (NMConnection *connection,
+                                                         NMSettingHashFlags flags);
+void                nm_connection_dump                  (NMConnection *connection);
+GType               nm_connection_lookup_setting_type   (const char *name);
+GType               nm_connection_lookup_setting_type_by_quark
+                                                        (GQuark error_quark);
+const char *        nm_connection_get_uuid              (NMConnection *connection);
+const char *        nm_connection_get_id                (NMConnection *connection);
+NMSetting8021x *            nm_connection_get_setting_802_1x
+                                                        (NMConnection *connection);
+NMSettingBluetooth *        nm_connection_get_setting_bluetooth
+                                                        (NMConnection *connection);
+NMSettingCdma *             nm_connection_get_setting_cdma
+                                                        (NMConnection *connection);
+NMSettingConnection *       nm_connection_get_setting_connection
+                                                        (NMConnection *connection);
+NMSettingGsm *              nm_connection_get_setting_gsm
+                                                        (NMConnection *connection);
+NMSettingIP4Config *        nm_connection_get_setting_ip4_config
+                                                        (NMConnection *connection);
+NMSettingIP6Config *        nm_connection_get_setting_ip6_config
+                                                        (NMConnection *connection);
+NMSettingOlpcMesh *         nm_connection_get_setting_olpc_mesh
+                                                        (NMConnection *connection);
+NMSettingPPP *              nm_connection_get_setting_ppp
+                                                        (NMConnection *connection);
+NMSettingPPPOE *            nm_connection_get_setting_pppoe
+                                                        (NMConnection *connection);
+NMSettingVPN *              nm_connection_get_setting_vpn
+                                                        (NMConnection *connection);
+NMSettingWimax *            nm_connection_get_setting_wimax
+                                                        (NMConnection *connection);
+NMSettingWired *            nm_connection_get_setting_wired
+                                                        (NMConnection *connection);
+NMSettingWireless *         nm_connection_get_setting_wireless
+                                                        (NMConnection *connection);
+NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
+                                                        (NMConnection *connection);
+
+
+
+

Object Hierarchy

+
+  GEnum
+   +----NMConnectionError
+
+
+  GObject
+   +----NMConnection
+
+
+
+

Properties

+
+  "path"                     gchar*                : Read / Write / Construct
+
+
+
+

Signals

+
+  "secrets-updated"                                : Run First
+
+
+
+

Description

+

+An NMConnection describes all the settings and configuration values that +are necessary to configure network devices for operation on a specific +network. Connections are the fundamental operating object for +NetworkManager; no device is connected without a NMConnection, or +disconnected without having been connected with a NMConnection. +

+

+Each NMConnection contains a list of NMSetting objects usually referenced +by name (using nm_connection_get_setting_by_name()) or by type (with +nm_connection_get_setting()). The settings describe the actual parameters +with which the network devices are configured, including device-specific +parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters +(addresses, routes, addressing methods, etc). +

+
+
+

Details

+
+

enum NMConnectionError

+
typedef enum
+{
+	NM_CONNECTION_ERROR_UNKNOWN = 0,
+	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND,
+	NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID
+} NMConnectionError;
+
+

+Describes errors that may result from operations involving a NMConnection. +

+
++ + + + + + + + + + + + + + +

NM_CONNECTION_ERROR_UNKNOWN

unknown or unclassified error +

NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND

the NMConnection object + did not contain the required NMSettingConnection object, which must be + present for all connections +

NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID

the 'type' property of the + 'connection' setting did not point to a valid connection base type; ie + it was not a hardware-related setting like NMSettingWired or + NMSettingWireless. +
+
+
+
+

NM_TYPE_CONNECTION_ERROR

+
#define NM_TYPE_CONNECTION_ERROR (nm_connection_error_get_type ()) 
+
+

+

+
+
+
+

NM_CONNECTION_ERROR

+
#define NM_CONNECTION_ERROR nm_connection_error_quark ()
+
+

+

+
+
+
+

nm_connection_error_quark ()

+
GQuark              nm_connection_error_quark           (void);
+

+Registers an error quark for NMConnection if necessary. +

+
++ + + + +

Returns :

the error quark used for NMConnection errors.
+
+
+
+

NM_CONNECTION_PATH

+
#define NM_CONNECTION_PATH "path"
+
+

+

+
+
+
+

NMConnection

+
typedef struct _NMConnection NMConnection;
+

+The NMConnection struct contains only private data. +It should only be accessed through the functions described below. +

+
+
+
+

NMConnectionClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* Signals */
+	void (*secrets_updated) (NMConnection *connection, const char * setting);
+} NMConnectionClass;
+
+

+

+
+
+
+

nm_connection_get_type ()

+
GType               nm_connection_get_type              (void);
+

+

+
+
+
+

nm_connection_new ()

+
NMConnection *      nm_connection_new                   (void);
+

+Creates a new NMConnection object with no NMSetting objects. +

+
++ + + + +

Returns :

the new empty NMConnection object
+
+
+
+

nm_connection_new_from_hash ()

+
NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
+                                                         GError **error);
+

+Creates a new NMConnection from a hash table describing the connection. See +nm_connection_to_hash() for a description of the expected hash table. +

+
++ + + + + + + + + + + + + + +

hash :

the GHashTable describing +the connection. [element-type utf8 GLib.HashTable] +

error :

on unsuccessful return, an error

Returns :

the new NMConnection object, populated with settings created +from the values in the hash table, or NULL if the connection failed to +validate
+
+
+
+

nm_connection_duplicate ()

+
NMConnection *      nm_connection_duplicate             (NMConnection *connection);
+

+Duplicates a NMConnection. +

+
++ + + + + + + + + + +

connection :

the NMConnection to duplicate

Returns :

a new NMConnection containing the same settings and properties +as the source NMConnection. [transfer full] +
+
+
+
+

nm_connection_create_setting ()

+
NMSetting *         nm_connection_create_setting        (const char *name);
+

+Create a new NMSetting object of the desired type, given a setting name. +

+
++ + + + + + + + + + +

name :

a setting name

Returns :

the new setting object, or NULL if the setting name was unknown. [transfer full] +
+
+
+
+

nm_connection_add_setting ()

+
void                nm_connection_add_setting           (NMConnection *connection,
+                                                         NMSetting *setting);
+

+Adds a NMSetting to the connection, replacing any previous NMSetting of the +same name which has previously been added to the NMConnection. The +connection takes ownership of the NMSetting object and does not increase +the setting object's reference count. +

+
++ + + + + + + + + + +

connection :

a NMConnection +

setting :

the NMSetting to add to the connection object. [transfer full] +
+
+
+
+

nm_connection_remove_setting ()

+
void                nm_connection_remove_setting        (NMConnection *connection,
+                                                         GType setting_type);
+

+Removes the NMSetting with the given GType from the NMConnection. This +operation dereferences the NMSetting object. +

+
++ + + + + + + + + + +

connection :

a NMConnection +

setting_type :

the GType of the setting object to remove
+
+
+
+

nm_connection_get_setting ()

+
NMSetting *         nm_connection_get_setting           (NMConnection *connection,
+                                                         GType setting_type);
+

+Gets the NMSetting with the given GType, if one has been previously added +to the NMConnection. +

+
++ + + + + + + + + + + + + + +

connection :

a NMConnection +

setting_type :

the GType of the setting object to return

Returns :

the NMSetting, or NULL if no setting of that type was previously +added to the NMConnection. [transfer none] +
+
+
+
+

nm_connection_get_setting_by_name ()

+
NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
+                                                         const char *name);
+

+Gets the NMSetting with the given name, if one has been previously added +the the NMConnection. +

+
++ + + + + + + + + + + + + + +

connection :

a NMConnection +

name :

a setting name

Returns :

the NMSetting, or NULL if no setting with that name was previously +added to the NMConnection. [transfer none] +
+
+
+
+

nm_connection_replace_settings ()

+
gboolean            nm_connection_replace_settings      (NMConnection *connection,
+                                                         GHashTable *new_settings,
+                                                         GError **error);
+
++ + + + + + + + + + + + + + + + + + +

connection :

a NMConnection +

new_settings :

a GHashTable of settings. [element-type utf8 GLib.HashTable] +

error :

location to store error, or NULL +

Returns :

 +TRUE if the settings were valid and added to the connection, FALSE +if they were not
+
+
+
+

nm_connection_compare ()

+
gboolean            nm_connection_compare               (NMConnection *a,
+                                                         NMConnection *b,
+                                                         NMSettingCompareFlags flags);
+

+Compares two NMConnection objects for similarity, with comparison behavior +modified by a set of flags. See nm_setting_compare() for a description of +each flag's behavior. +

+
++ + + + + + + + + + + + + + + + + + +

a :

a NMConnection +

b :

a second NMConnection to compare with the first

flags :

compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT +

Returns :

 +TRUE if the comparison succeeds, FALSE if it does not
+
+
+
+

nm_connection_diff ()

+
gboolean            nm_connection_diff                  (NMConnection *a,
+                                                         NMConnection *b,
+                                                         NMSettingCompareFlags flags,
+                                                         GHashTable **out_settings);
+

+Compares two NMConnection objects for similarity, with comparison behavior +modified by a set of flags. See nm_setting_compare() for a description of +each flag's behavior. If the connections differ, settings and keys within +each setting that differ are added to the returned out_settings hash table. +No values are returned, only key names. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

a :

a NMConnection +

b :

a second NMConnection to compare with the first

flags :

compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT +

out_settings :

if the +connections differ, on return a hash table mapping setting names to +second-level GHashTable (utf8 to guint32), which contains the key names that +differ mapped to one or more of NMSettingDiffResult as a bitfield. [element-type utf8 GLib.HashTable] +

Returns :

 +TRUE if the connections contain the same values, FALSE if they do +not
+
+
+
+

nm_connection_verify ()

+
gboolean            nm_connection_verify                (NMConnection *connection,
+                                                         GError **error);
+

+Validates the connection and all its settings. Each setting's properties +have allowed values, and some values are dependent on other values. For +example, if a WiFi connection is security enabled, the NMSettingWireless +setting object's 'security' property must contain the setting name of the +NMSettingWirelessSecurity object, which must also be present in the +connection for the connection to be valid. As another example, the +NMSettingWired object's 'mac-address' property must be a validly formatted +MAC address. The returned GError contains information about which +setting and which property failed validation, and how it failed validation. +

+
++ + + + + + + + + + + + + + +

connection :

the NMConnection to verify

error :

location to store error, or NULL +

Returns :

 +TRUE if the connection is valid, FALSE if it is not
+
+
+
+

nm_connection_need_secrets ()

+
const char *        nm_connection_need_secrets          (NMConnection *connection,
+                                                         GPtrArray **hints);
+

+Returns the name of the first setting object in the connection which would +need secrets to make a successful connection. The returned hints are only +intended as a guide to what secrets may be required, because in some +circumstances, there is no way to conclusively determine exactly which +secrets are needed. +

+
++ + + + + + + + + + + + + + +

connection :

the NMConnection +

hints :

the address of a pointer to a GPtrArray, initialized to NULL, which on +return points to an allocated GPtrArray containing the property names of +secrets of the NMSetting which may be required; the caller owns the array +and must free the each array element with g_free(), as well as the array +itself with g_ptr_array_free(). [out callee-allocates][element-type utf8][allow-none][transfer full] +

Returns :

the setting name of the NMSetting object which has invalid or +missing secrets
+
+
+
+

nm_connection_clear_secrets ()

+
void                nm_connection_clear_secrets         (NMConnection *connection);
+

+Clears and frees any secrets that may be stored in the connection, to avoid +keeping secret data in memory when not needed. +

+
++ + + + +

connection :

the NMConnection +
+
+
+
+

nm_connection_update_secrets ()

+
gboolean            nm_connection_update_secrets        (NMConnection *connection,
+                                                         const char *setting_name,
+                                                         GHashTable *setting_secrets,
+                                                         GError **error);
+

+Update the specified setting's secrets, given a hash table of secrets +intended for that setting (deserialized from D-Bus for example). Will also +extract the given setting's secrets hash if given a hash of hashes, as would +be returned from nm_connection_to_hash(). +

+
++ + + + + + + + + + + + + + + + + + + + + + +

connection :

the NMConnection +

setting_name :

the setting object name to which the secrets apply

setting_secrets :

a GHashTable mapping +string:GValue of setting property names and secrets of the given setting_name. [element-type utf8 GObject.Value] +

error :

location to store error, or NULL +

Returns :

 +TRUE if the secrets were successfully updated and the connection +is valid, FALSE on failure or if the setting was never added to the connection
+
+
+
+

nm_connection_set_path ()

+
void                nm_connection_set_path              (NMConnection *connection,
+                                                         const char *path);
+

+Sets the D-Bus path of the connection. This property is not serialized, and +is only for the reference of the caller. Sets the "path" +property. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

path :

the D-Bus path of the connection as given by the settings service +which provides the connection
+
+
+
+

nm_connection_get_path ()

+
const char *        nm_connection_get_path              (NMConnection *connection);
+

+Returns the connection's D-Bus path. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

the D-Bus path of the connection, previously set by a call to +nm_connection_set_path().
+
+
+
+

nm_connection_for_each_setting_value ()

+
void                nm_connection_for_each_setting_value
+                                                        (NMConnection *connection,
+                                                         NMSettingValueIterFn func,
+                                                         gpointer user_data);
+

+Iterates over the properties of each NMSetting object in the NMConnection, +calling the supplied user function for each property. +

+
++ + + + + + + + + + + + + + +

connection :

the NMConnection +

func :

user-supplied function called for each setting's property. [scope call] +

user_data :

user data passed to func at each invocation
+
+
+
+

nm_connection_to_hash ()

+
GHashTable *        nm_connection_to_hash               (NMConnection *connection,
+                                                         NMSettingHashFlags flags);
+

+Converts the NMConnection into a GHashTable describing the connection, +suitable for marshalling over D-Bus or serializing. The hash table mapping +is string:GHashTable with each element in the returned hash representing +a NMSetting object. The keys are setting object names, and the values +are GHashTables mapping string:GValue, each of which represents the +properties of the NMSetting object. +

+
++ + + + + + + + + + + + + + +

connection :

the NMConnection +

flags :

hash flags, e.g. NM_SETTING_HASH_FLAG_ALL +

Returns :

a new +GHashTable describing the connection, its settings, and each setting's +properties. The caller owns the hash table and must unref the hash table +with g_hash_table_unref() when it is no longer needed. [transfer full][element-type utf8 GLib.HashTable] +
+
+
+
+

nm_connection_dump ()

+
void                nm_connection_dump                  (NMConnection *connection);
+

+Print the connection to stdout. For debugging purposes ONLY, should NOT +be used for serialization of the connection or machine-parsed in any way. The +output format is not guaranteed to be stable and may change at any time. +

+
++ + + + +

connection :

the NMConnection +
+
+
+
+

nm_connection_lookup_setting_type ()

+
GType               nm_connection_lookup_setting_type   (const char *name);
+

+Returns the GType of the setting's class for a given setting name. +

+
++ + + + + + + + + + +

name :

a setting name

Returns :

the GType of the setting's class
+
+
+
+

nm_connection_lookup_setting_type_by_quark ()

+
GType               nm_connection_lookup_setting_type_by_quark
+                                                        (GQuark error_quark);
+

+Returns the GType of the setting's class for a given setting error quark. +Useful for figuring out which setting a returned error is for. +

+
++ + + + + + + + + + +

error_quark :

a setting error quark

Returns :

the GType of the setting's class
+
+
+
+

nm_connection_get_uuid ()

+
const char *        nm_connection_get_uuid              (NMConnection *connection);
+

+A shortcut to return the UUID from the connection's NMSettingConnection. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

the UUID from the connection's 'connection' setting
+
+
+
+

nm_connection_get_id ()

+
const char *        nm_connection_get_id                (NMConnection *connection);
+

+A shortcut to return the ID from the connection's NMSettingConnection. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

the ID from the connection's 'connection' setting
+
+
+
+

nm_connection_get_setting_802_1x ()

+
NMSetting8021x *            nm_connection_get_setting_802_1x
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSetting8021x the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSetting8021x if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_bluetooth ()

+
NMSettingBluetooth *        nm_connection_get_setting_bluetooth
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingBluetooth the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingBluetooth if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_cdma ()

+
NMSettingCdma *             nm_connection_get_setting_cdma
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingCdma the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingCdma if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_connection ()

+
NMSettingConnection *       nm_connection_get_setting_connection
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingConnection the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingConnection if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_gsm ()

+
NMSettingGsm *              nm_connection_get_setting_gsm
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingGsm the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingGsm if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_ip4_config ()

+
NMSettingIP4Config *        nm_connection_get_setting_ip4_config
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingIP4Config the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingIP4Config if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_ip6_config ()

+
NMSettingIP6Config *        nm_connection_get_setting_ip6_config
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingIP6Config the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingIP6Config if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_olpc_mesh ()

+
NMSettingOlpcMesh *         nm_connection_get_setting_olpc_mesh
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingOlpcMesh the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingOlpcMesh if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_ppp ()

+
NMSettingPPP *              nm_connection_get_setting_ppp
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingPPP the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingPPP if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_pppoe ()

+
NMSettingPPPOE *            nm_connection_get_setting_pppoe
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingPPOE the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingPPPOE if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_vpn ()

+
NMSettingVPN *              nm_connection_get_setting_vpn
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingVPN the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingVPN if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_wimax ()

+
NMSettingWimax *            nm_connection_get_setting_wimax
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingWimax the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingWimax if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_wired ()

+
NMSettingWired *            nm_connection_get_setting_wired
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingWired the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingWired if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_wireless ()

+
NMSettingWireless *         nm_connection_get_setting_wireless
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingWireless the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingWireless if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

nm_connection_get_setting_wireless_security ()

+
NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
+                                                        (NMConnection *connection);
+

+A shortcut to return any NMSettingWirelessSecurity the connection might contain. +

+
++ + + + + + + + + + +

connection :

the NMConnection +

Returns :

an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. [transfer none] +
+
+
+
+

Property Details

+
+

The "path" property

+
  "path"                     gchar*                : Read / Write / Construct
+

+The connection's D-Bus path, used only by the calling process as a record +of the D-Bus path of the connection as provided by a settings service. +

+

Default value: NULL

+
+
+
+

Signal Details

+
+

The "secrets-updated" signal

+
void                user_function                      (NMConnection *connection,
+                                                        gchar        *setting_name,
+                                                        gpointer      user_data)         : Run First
+

+The ::secrets-updated signal is emitted when the secrets of a setting +have been changed. +

+
++ + + + + + + + + + + + + + +

connection :

the object on which the signal is emitted

setting_name :

the setting name of the NMSetting for which secrets were +updated

user_data :

user data set when the signal handler was connected.
+
+
+
+
+
+ Generated by GTK-Doc V1.17
+ + \ No newline at end of file diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html index c77c5985..b9c258d2 100644 --- a/docs/libnm-util/html/NMSetting.html +++ b/docs/libnm-util/html/NMSetting.html @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -140,7 +140,7 @@ enum NMSetting contains properties that describe configuration that applies to a specific network layer (like IPv4 or IPv6 configuration) or device type (like Ethernet, or WiFi). A collection of individual settings together -make up an NMConnection. Each property is strongly typed and usually has +make up an NMConnection. Each property is strongly typed and usually has a number of allowed values. See each NMSetting subclass for a description of properties and allowed values.

@@ -420,7 +420,7 @@ when calling NMSetting into a GHashTable mapping each setting property name to a GValue describing that property, suitable for marshalling over -D-Bus or serializing. The mapping is string:GValue. +D-Bus or serializing. The mapping is string to GValue.

@@ -437,7 +437,8 @@ D-Bus or serializing. The mapping is string:GValue. - @@ -465,8 +466,9 @@ property names and value types. - + @@ -709,10 +711,11 @@ be set to results :

- @@ -847,8 +850,9 @@ setting (deserialized from D-Bus for example). - + diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html index 8ef172c1..c9e533b5 100644 --- a/docs/libnm-util/html/NMSetting8021x.html +++ b/docs/libnm-util/html/NMSetting8021x.html @@ -104,7 +104,7 @@ const char * nm_setting_802_1x_get_ca_cert_path (NMSetting8021x *setting); gbooleannm_setting_802_1x_set_ca_cert (NMSetting8021x *setting, - const char *value, + const char *cert_path, NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, GError **error); @@ -115,7 +115,7 @@ const char * nm_setting_802_1x_get_client_cert_path (NMSetting8021x *setting); gbooleannm_setting_802_1x_set_client_cert (NMSetting8021x *setting, - const char *value, + const char *cert_path, NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, GError **error); @@ -136,7 +136,7 @@ const char * NMSetting8021x *setting); gbooleannm_setting_802_1x_set_phase2_ca_cert (NMSetting8021x *setting, - const char *value, + const char *cert_path, NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, GError **error); @@ -148,7 +148,7 @@ const char * NMSetting8021x *setting); gbooleannm_setting_802_1x_set_phase2_client_cert (NMSetting8021x *setting, - const char *value, + const char *cert_path, NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, GError **error); @@ -164,7 +164,7 @@ const char * nm_setting_802_1x_get_private_key_path (NMSetting8021x *setting); gbooleannm_setting_802_1x_set_private_key (NMSetting8021x *setting, - const char *value, + const char *key_path, const char *password, NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, @@ -183,7 +183,7 @@ const char * NMSetting8021x *setting); gbooleannm_setting_802_1x_set_phase2_private_key (NMSetting8021x *setting, - const char *value, + const char *key_path, const char *password, NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, @@ -984,7 +984,7 @@ of the network cannot be confirmed by the client.

nm_setting_802_1x_set_ca_cert ()

gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
-                                                         const char *value,
+                                                         const char *cert_path,
                                                          NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
@@ -1003,10 +1003,10 @@ scheme, or with the path to the certificate file if using the
- - + @@ -1108,7 +1108,7 @@ authentication method.

nm_setting_802_1x_set_client_cert ()

gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
-                                                         const char *value,
+                                                         const char *cert_path,
                                                          NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
@@ -1132,12 +1132,12 @@ authentication method.
- - + + @@ -1354,7 +1354,7 @@ of the network cannot be confirmed by the client.

nm_setting_802_1x_set_phase2_ca_cert ()

gboolean            nm_setting_802_1x_set_phase2_ca_cert
                                                         (NMSetting8021x *setting,
-                                                         const char *value,
+                                                         const char *cert_path,
                                                          NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
@@ -1373,9 +1373,9 @@ file if using the value :

- + @@ -1481,7 +1481,7 @@ authentication method.

nm_setting_802_1x_set_phase2_client_cert ()

gboolean            nm_setting_802_1x_set_phase2_client_cert
                                                         (NMSetting8021x *setting,
-                                                         const char *value,
+                                                         const char *cert_path,
                                                          NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
@@ -1505,9 +1505,9 @@ authentication method. - - + @@ -1699,7 +1699,7 @@ authentication method.

nm_setting_802_1x_set_private_key ()

gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
-                                                         const char *value,
+                                                         const char *key_path,
                                                          const char *password,
                                                          NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
@@ -1739,7 +1739,7 @@ key password to prevent unauthorized access to unencrypted private key data.
- + - + diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html index e8cd2fb9..c2e4ce52 100644 --- a/docs/libnm-util/html/NMSettingVPN.html +++ b/docs/libnm-util/html/NMSettingVPN.html @@ -276,7 +276,9 @@ const char * NMVPNIterFunc func, gpointer user_data);

-Iterates all data items stored in this setting +Iterates all data items stored in this setting. It is safe to add, remove, +and modify data items inside func, though any additions or removals made +during iteration will not be part of the iteration.

Returns :

a new GHashTable describing the setting's properties. [transfer full][element-type utf8 GObject.Value] +a new GHashTable +describing the setting's properties. [transfer full][element-type utf8 GObject.Value]

hash :

the GHashTable containing a string:GValue mapping of properties -that apply to the settingthe GHashTable containing a +string to GValue mapping of properties that apply to the setting. [element-type utf8 GObject.Value] +

Returns :

if the settings differ, on return a -hash table mapping the differing keys to one or more NMSettingDiffResult -values OR-ed together. If the settings do not differ, any hash table passed -in is unmodified. If no hash table is passed in, a new one is created. [element-type utf8 guint32] +if the +settings differ, on return a hash table mapping the differing keys to one or +more NMSettingDiffResult values OR-ed together. If the settings do not +differ, any hash table passed in is unmodified. If no hash table is passed +in and the settings differ, a new one is created and returned. [inout][transfer full][element-type utf8 guint32]

secrets :

a GHashTable mapping string:GValue of setting property names and -secretsa GHashTable mapping +string to GValue of setting property names and secrets. [element-type utf8 GObject.Value] +

error :

value :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or -NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate file -(PEM or DER format). The path must be UTF-8 encoded; use +

cert_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH +or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate +file (PEM or DER format). The path must be UTF-8 encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with any scheme clears the CA certificate.

value :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or -NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client certificate -file (PEM, DER, or PKCS12 format). The path must be UTF-8 encoded; use -g_filename_to_utf8() to convert if needed. Passing NULL with any scheme -clears the client certificate.

cert_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH +or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client +certificate file (PEM, DER, or PKCS12 format). The path must be UTF-8 +encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with +any scheme clears the client certificate.

scheme :

 when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or -NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA +

cert_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH +or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA certificate file (PEM or DER format). The path must be UTF-8 encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with any scheme clears the "phase2" CA certificate.

value :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or -NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client +

cert_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH +or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client certificate file (PEM, DER, or PKCS12 format). The path must be UTF-8 encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with any scheme clears the "phase2" client certificate.

value :

key_path :

 when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file (PEM, DER, or PKCS12 format). The path must be UTF-8 encoded; use @@ -1924,7 +1924,7 @@ authentication method.

nm_setting_802_1x_set_phase2_private_key ()

gboolean            nm_setting_802_1x_set_phase2_private_key
                                                         (NMSetting8021x *setting,
-                                                         const char *value,
+                                                         const char *key_path,
                                                          const char *password,
                                                          NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
@@ -1964,7 +1964,7 @@ key password to prevent unauthorized access to unencrypted private key data.

value :

key_path :

 when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private key file (PEM, DER, or PKCS12 format). The path must be UTF-8 encoded; diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html index 27c30ebd..2b113d2d 100644 --- a/docs/libnm-util/html/NMSettingConnection.html +++ b/docs/libnm-util/html/NMSettingConnection.html @@ -117,8 +117,8 @@ const char *

Description

The NMSettingConnection object is a NMSetting subclass that describes -properties that apply to all NMConnection objects, regardless of what type -of network connection they describe. Each NMConnection object must contain +properties that apply to all NMConnection objects, regardless of what type +of network connection they describe. Each NMConnection object must contain a NMSettingConnection setting.

@@ -170,7 +170,7 @@ Describes errors that may result from operations involving a

NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND

 the NMSetting object referenced by the setting name contained in the - "type" property was not present in the NMConnection + "type" property was not present in the NMConnection
@@ -331,7 +333,9 @@ Iterates all data items stored in this setting NMVPNIterFunc func, gpointer user_data);

-Iterates all secrets stored in this setting. +Iterates all secrets stored in this setting. It is safe to add, remove, +and modify secrets inside func, though any additions or removals made during +iteration will not be part of the iteration.

diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html index e0a1c869..5c359816 100644 --- a/docs/libnm-util/html/annotation-glossary.html +++ b/docs/libnm-util/html/annotation-glossary.html @@ -24,6 +24,8 @@  |  A  |  + I +  |  E  |  T @@ -44,6 +46,10 @@
allow-none

NULL is ok, both for passing and for returning.

+

I

+
+inout
+

Parameter for input and for returning results. Default is transfer full.

E

element-type
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html index b6776b7d..0ea92385 100644 --- a/docs/libnm-util/html/api-index-full.html +++ b/docs/libnm-util/html/api-index-full.html @@ -41,195 +41,195 @@ API Index

C

-NMConnection, struct in NMConnection +NMConnection, struct in NMConnection
-NMConnection::secrets-updated, object signal in NMConnection +NMConnection::secrets-updated, object signal in NMConnection
-NMConnection:path, object property in NMConnection +NMConnection:path, object property in NMConnection
-NMConnectionClass, struct in NMConnection +NMConnectionClass, struct in NMConnection
-NMConnectionError, enum in NMConnection +NMConnectionError, enum in NMConnection
-nm_connection_add_setting, function in NMConnection +nm_connection_add_setting, function in NMConnection
-nm_connection_clear_secrets, function in NMConnection +nm_connection_clear_secrets, function in NMConnection
-nm_connection_compare, function in NMConnection +nm_connection_compare, function in NMConnection
-nm_connection_create_setting, function in NMConnection +nm_connection_create_setting, function in NMConnection
-nm_connection_diff, function in NMConnection +nm_connection_diff, function in NMConnection
-nm_connection_dump, function in NMConnection +nm_connection_dump, function in NMConnection
-nm_connection_duplicate, function in NMConnection +nm_connection_duplicate, function in NMConnection
-NM_CONNECTION_ERROR, macro in NMConnection +NM_CONNECTION_ERROR, macro in NMConnection
-nm_connection_error_quark, function in NMConnection +nm_connection_error_quark, function in NMConnection
-nm_connection_for_each_setting_value, function in NMConnection +nm_connection_for_each_setting_value, function in NMConnection
-nm_connection_get_id, function in NMConnection +nm_connection_get_id, function in NMConnection
-nm_connection_get_path, function in NMConnection +nm_connection_get_path, function in NMConnection
-nm_connection_get_setting, function in NMConnection +nm_connection_get_setting, function in NMConnection
-nm_connection_get_setting_802_1x, function in NMConnection +nm_connection_get_setting_802_1x, function in NMConnection
-nm_connection_get_setting_bluetooth, function in NMConnection +nm_connection_get_setting_bluetooth, function in NMConnection
-nm_connection_get_setting_by_name, function in NMConnection +nm_connection_get_setting_by_name, function in NMConnection
-nm_connection_get_setting_cdma, function in NMConnection +nm_connection_get_setting_cdma, function in NMConnection
-nm_connection_get_setting_connection, function in NMConnection +nm_connection_get_setting_connection, function in NMConnection
-nm_connection_get_setting_gsm, function in NMConnection +nm_connection_get_setting_gsm, function in NMConnection
-nm_connection_get_setting_ip4_config, function in NMConnection +nm_connection_get_setting_ip4_config, function in NMConnection
-nm_connection_get_setting_ip6_config, function in NMConnection +nm_connection_get_setting_ip6_config, function in NMConnection
-nm_connection_get_setting_olpc_mesh, function in NMConnection +nm_connection_get_setting_olpc_mesh, function in NMConnection
-nm_connection_get_setting_ppp, function in NMConnection +nm_connection_get_setting_ppp, function in NMConnection
-nm_connection_get_setting_pppoe, function in NMConnection +nm_connection_get_setting_pppoe, function in NMConnection
-nm_connection_get_setting_vpn, function in NMConnection +nm_connection_get_setting_vpn, function in NMConnection
-nm_connection_get_setting_wimax, function in NMConnection +nm_connection_get_setting_wimax, function in NMConnection
-nm_connection_get_setting_wired, function in NMConnection +nm_connection_get_setting_wired, function in NMConnection
-nm_connection_get_setting_wireless, function in NMConnection +nm_connection_get_setting_wireless, function in NMConnection
-nm_connection_get_setting_wireless_security, function in NMConnection +nm_connection_get_setting_wireless_security, function in NMConnection
-nm_connection_get_type, function in NMConnection +nm_connection_get_type, function in NMConnection
-nm_connection_get_uuid, function in NMConnection +nm_connection_get_uuid, function in NMConnection
-nm_connection_lookup_setting_type, function in NMConnection +nm_connection_lookup_setting_type, function in NMConnection
-nm_connection_lookup_setting_type_by_quark, function in NMConnection +nm_connection_lookup_setting_type_by_quark, function in NMConnection
-nm_connection_need_secrets, function in NMConnection +nm_connection_need_secrets, function in NMConnection
-nm_connection_new, function in NMConnection +nm_connection_new, function in NMConnection
-nm_connection_new_from_hash, function in NMConnection +nm_connection_new_from_hash, function in NMConnection
-NM_CONNECTION_PATH, macro in NMConnection +NM_CONNECTION_PATH, macro in NMConnection
-nm_connection_remove_setting, function in NMConnection +nm_connection_remove_setting, function in NMConnection
-nm_connection_replace_settings, function in NMConnection +nm_connection_replace_settings, function in NMConnection
-nm_connection_set_path, function in NMConnection +nm_connection_set_path, function in NMConnection
-nm_connection_to_hash, function in NMConnection +nm_connection_to_hash, function in NMConnection
-nm_connection_update_secrets, function in NMConnection +nm_connection_update_secrets, function in NMConnection
-nm_connection_verify, function in NMConnection +nm_connection_verify, function in NMConnection

I

@@ -3240,7 +3240,7 @@ NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax

T

-NM_TYPE_CONNECTION_ERROR, macro in NMConnection +NM_TYPE_CONNECTION_ERROR, macro in NMConnection
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html index 2800abf2..52f73af9 100644 --- a/docs/libnm-util/html/ch01.html +++ b/docs/libnm-util/html/ch01.html @@ -7,7 +7,7 @@ - + @@ -17,13 +17,16 @@
- +
  Home libnm-util Reference ManualNextNext

-libnm-util API Reference

+libnm-util API Reference
+NMConnection — Describes a connection to specific network or provider +
+
NMSetting — Describes related configuration information
@@ -75,7 +78,6 @@ nm-utils — Utility functions
-<xi:include></xi:include>
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html index 90ada1bf..feb9a71b 100644 --- a/docs/libnm-util/html/index.html +++ b/docs/libnm-util/html/index.html @@ -26,6 +26,9 @@
libnm-util API Reference
+NMConnection — Describes a connection to specific network or provider +
+
NMSetting — Describes related configuration information
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml index d9981473..4140e896 100644 --- a/docs/libnm-util/html/index.sgml +++ b/docs/libnm-util/html/index.sgml @@ -1,4 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -950,6 +1012,7 @@ + diff --git a/docs/libnm-util/html/libnm-util.devhelp b/docs/libnm-util/html/libnm-util.devhelp index 3fa339f1..b8b98e40 100644 --- a/docs/libnm-util/html/libnm-util.devhelp +++ b/docs/libnm-util/html/libnm-util.devhelp @@ -3,6 +3,7 @@ + @@ -26,6 +27,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2 index 9cb466dd..0104b4d0 100644 --- a/docs/libnm-util/html/libnm-util.devhelp2 +++ b/docs/libnm-util/html/libnm-util.devhelp2 @@ -3,6 +3,7 @@ + @@ -26,6 +27,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -810,6 +860,9 @@ + + + diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html index bbe2a6d2..a69c8dbb 100644 --- a/docs/libnm-util/html/object-tree.html +++ b/docs/libnm-util/html/object-tree.html @@ -24,7 +24,7 @@ Object Hierarchy
     GObject
-        NMConnection
+        NMConnection
         NMSetting
             NMSetting8021x
             NMSettingBluetooth
@@ -43,7 +43,7 @@
             NMSettingWireless
             NMSettingWirelessSecurity
     GEnum
-        NMConnectionError
+        NMConnectionError
         NMSetting8021xError
         NMSettingBluetoothError
         NMSettingCdmaError
-- 
cgit 1.3.0-6-gf8a5