From de06e5715e780baade318f3490ac7a4c9ce84e32 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 24 Mar 2012 01:37:02 +0100 Subject: Imported Upstream version 0.9.4.0 --- docs/libnm-util/html/NMConnection.html | 157 +++++- docs/libnm-util/html/NMSetting.html | 124 +++-- docs/libnm-util/html/NMSetting8021x.html | 277 ++++++++--- docs/libnm-util/html/NMSettingBluetooth.html | 17 +- docs/libnm-util/html/NMSettingCdma.html | 23 +- docs/libnm-util/html/NMSettingConnection.html | 230 ++++++++- docs/libnm-util/html/NMSettingGsm.html | 55 ++- docs/libnm-util/html/NMSettingIP4Config.html | 19 +- docs/libnm-util/html/NMSettingIP6Config.html | 118 ++++- docs/libnm-util/html/NMSettingOlpcMesh.html | 15 +- docs/libnm-util/html/NMSettingPPP.html | 17 +- docs/libnm-util/html/NMSettingPPPOE.html | 23 +- docs/libnm-util/html/NMSettingSerial.html | 17 +- docs/libnm-util/html/NMSettingVPN.html | 70 ++- docs/libnm-util/html/NMSettingWimax.html | 15 +- docs/libnm-util/html/NMSettingWired.html | 15 +- docs/libnm-util/html/NMSettingWireless.html | 19 +- .../libnm-util/html/NMSettingWirelessSecurity.html | 59 ++- docs/libnm-util/html/api-index-full.html | 548 ++++++++++++++++++++- docs/libnm-util/html/ch01.html | 2 +- docs/libnm-util/html/index.sgml | 97 +++- docs/libnm-util/html/libnm-util-nm-utils.html | 178 ++++++- docs/libnm-util/html/libnm-util.devhelp2 | 85 +++- docs/libnm-util/html/object-tree.html | 19 + 24 files changed, 1954 insertions(+), 245 deletions(-) (limited to 'docs/libnm-util/html') diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html index 19914db2..45911ba8 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -49,6 +49,7 @@ NMConnection; NMConnectionClass; enum NMConnectionError; +#define NM_CONNECTION_ERROR #define NM_CONNECTION_PATH void nm_connection_add_setting (NMConnection *connection, NMSetting *setting); @@ -59,11 +60,11 @@ enum gpointer user_data); gboolean nm_connection_compare (NMConnection *a, NMConnection *b, - NMSettingCompareFlags flags); + NMSettingCompareFlags flags); NMSetting * nm_connection_create_setting (const char *name); gboolean nm_connection_diff (NMConnection *a, NMConnection *b, - NMSettingCompareFlags flags, + NMSettingCompareFlags flags, GHashTable **out_settings); void nm_connection_dump (NMConnection *connection); NMConnection * nm_connection_duplicate (NMConnection *connection); @@ -79,12 +80,15 @@ const char * NMSetting8021x * nm_connection_get_setting_802_1x (NMConnection *connection); NMSettingBluetooth * nm_connection_get_setting_bluetooth (NMConnection *connection); +NMSettingBond * nm_connection_get_setting_bond (NMConnection *connection); NMSetting * nm_connection_get_setting_by_name (NMConnection *connection, const char *name); NMSettingCdma * nm_connection_get_setting_cdma (NMConnection *connection); NMSettingConnection * nm_connection_get_setting_connection (NMConnection *connection); NMSettingGsm * nm_connection_get_setting_gsm (NMConnection *connection); +NMSettingInfiniband * nm_connection_get_setting_infiniband + (NMConnection *connection); NMSettingIP4Config * nm_connection_get_setting_ip4_config (NMConnection *connection); NMSettingIP6Config * nm_connection_get_setting_ip6_config @@ -92,6 +96,8 @@ const char * 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); +NMSettingSerial * nm_connection_get_setting_serial (NMConnection *connection); +NMSettingVlan * nm_connection_get_setting_vlan (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); @@ -99,6 +105,8 @@ const char * NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security (NMConnection *connection); const char * nm_connection_get_uuid (NMConnection *connection); +const char * nm_connection_get_virtual_iface_name + (NMConnection *connection); gboolean nm_connection_is_type (NMConnection *connection, const char *type); GType nm_connection_lookup_setting_type (const char *name); @@ -117,7 +125,7 @@ const char * void nm_connection_set_path (NMConnection *connection, const char *path); GHashTable * nm_connection_to_hash (NMConnection *connection, - NMSettingHashFlags flags); + NMSettingHashFlags flags); gboolean nm_connection_update_secrets (NMConnection *connection, const char *setting_name, GHashTable *secrets, @@ -195,10 +203,10 @@ It should only be accessed through the functions described below.

enum NMConnectionError

typedef enum {
-	NM_CONNECTION_ERROR_UNKNOWN = 0,
-	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND,
-	NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,
-	NM_CONNECTION_ERROR_SETTING_NOT_FOUND
+	NM_CONNECTION_ERROR_UNKNOWN = 0,                  /*< nick=UnknownError >*/
+	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND, /*< nick=ConnectionSettingNotFound >*/
+	NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,      /*< nick=ConnectionTypeInvalid >*/
+	NM_CONNECTION_ERROR_SETTING_NOT_FOUND             /*< nick=SettingNotFound >*/
 } NMConnectionError;

@@ -238,6 +246,14 @@ Describes errors that may result from operations involving a

+

NM_CONNECTION_ERROR

+
#define NM_CONNECTION_ERROR nm_connection_error_quark ()
+
+

+

+
+
+

NM_CONNECTION_PATH

#define NM_CONNECTION_PATH "path"
@@ -325,7 +341,7 @@ specific secret should be cleared or not. [

nm_connection_compare ()

gboolean            nm_connection_compare               (NMConnection *a,
                                                          NMConnection *b,
-                                                         NMSettingCompareFlags flags);
+ 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 @@ -383,7 +399,7 @@ Create a new

nm_connection_diff ()

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

Compares two NMConnection objects for similarity, with comparison behavior @@ -414,7 +430,7 @@ No values are returned, only key names. 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] +differ mapped to one or more of NMSettingDiffResult as a bitfield. [element-type utf8 GLib.HashTable] @@ -637,6 +653,29 @@ A shortcut to return any +

nm_connection_get_setting_bond ()

+
NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);
+

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

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

connection :

the NMConnection +

Returns :

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

nm_connection_get_setting_by_name ()

NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
                                                          const char *name);
@@ -737,6 +776,30 @@ A shortcut to return any +

nm_connection_get_setting_infiniband ()

+
NMSettingInfiniband * nm_connection_get_setting_infiniband
+                                                        (NMConnection *connection);
+

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

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

connection :

the NMConnection +

Returns :

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

nm_connection_get_setting_ip4_config ()

NMSettingIP4Config * nm_connection_get_setting_ip4_config
                                                         (NMConnection *connection);
@@ -854,6 +917,52 @@ A shortcut to return any NMSettingPPOE the connection
+

nm_connection_get_setting_serial ()

+
NMSettingSerial *   nm_connection_get_setting_serial    (NMConnection *connection);
+

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

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

connection :

the NMConnection +

Returns :

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

nm_connection_get_setting_vlan ()

+
NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);
+

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

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

connection :

the NMConnection +

Returns :

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

nm_connection_get_setting_vpn ()

NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);

@@ -992,6 +1101,32 @@ A shortcut to return the UUID from the connection's +

nm_connection_get_virtual_iface_name ()

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

+Returns the name of the virtual kernel interface which the connection +needs to use if specified in the settings. This function abstracts all +connection types which require this functionality. For all other +connection types, this function will return NULL. +

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

connection :

The NMConnection +

Returns :

Name of the kernel interface or NULL
+
+
+

nm_connection_is_type ()

gboolean            nm_connection_is_type               (NMConnection *connection,
                                                          const char *type);
@@ -1235,7 +1370,7 @@ which provides the connection

nm_connection_to_hash ()

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

Converts the NMConnection into a GHashTable describing the connection, suitable for marshalling over D-Bus or serializing. The hash table mapping diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html index 63319e1a..3e64eeb0 100644 --- a/docs/libnm-util/html/NMSetting.html +++ b/docs/libnm-util/html/NMSetting.html @@ -41,25 +41,26 @@

Synopsis

-
+
 #include <nm-setting.h>
 
                     NMSetting;
                     NMSettingClass;
 gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
                                                          const char *secret,
-                                                         NMSettingSecretFlags flags,
+                                                         NMSettingSecretFlags flags,
                                                          gpointer user_data);
-enum                NMSettingCompareFlags;
-enum                NMSettingDiffResult;
+enum                NMSettingCompareFlags;
+enum                NMSettingDiffResult;
 enum                NMSettingError;
-enum                NMSettingHashFlags;
-enum                NMSettingSecretFlags;
+enum                NMSettingHashFlags;
+enum                NMSettingSecretFlags;
 void                (*NMSettingValueIterFn)             (NMSetting *setting,
                                                          const char *key,
                                                          const GValue *value,
                                                          GParamFlags flags,
                                                          gpointer user_data);
+#define             NM_SETTING_ERROR
 #define             NM_SETTING_NAME
 #define             NM_SETTING_PARAM_FUZZY_IGNORE
 #define             NM_SETTING_PARAM_REQUIRED
@@ -71,10 +72,10 @@ enum                gpointer user_data);
 gboolean            nm_setting_compare                  (NMSetting *a,
                                                          NMSetting *b,
-                                                         NMSettingCompareFlags flags);
+                                                         NMSettingCompareFlags flags);
 gboolean            nm_setting_diff                     (NMSetting *a,
                                                          NMSetting *b,
-                                                         NMSettingCompareFlags flags,
+                                                         NMSettingCompareFlags flags,
                                                          gboolean invert_results,
                                                          GHashTable **results);
 NMSetting *         nm_setting_duplicate                (NMSetting *setting);
@@ -85,17 +86,18 @@ enum                char *        nm_setting_get_name                 (NMSetting *setting);
 gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags,
+                                                         NMSettingSecretFlags *out_flags,
                                                          GError **error);
+const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);
 GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);
 NMSetting *         nm_setting_new_from_hash            (GType setting_type,
                                                          GHashTable *hash);
 gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
-                                                         NMSettingSecretFlags flags,
+                                                         NMSettingSecretFlags flags,
                                                          GError **error);
 GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);
+                                                         NMSettingHashFlags flags);
 char *              nm_setting_to_string                (NMSetting *setting);
 gboolean            nm_setting_update_secrets           (NMSetting *setting,
                                                          GHashTable *secrets,
@@ -112,25 +114,44 @@ const char *        NMSetting8021x
          +----NMSettingBluetooth
+         +----NMSettingBond
          +----NMSettingCdma
          +----NMSettingConnection
          +----NMSettingGsm
+         +----NMSettingInfiniband
          +----NMSettingIP4Config
          +----NMSettingIP6Config
          +----NMSettingOlpcMesh
          +----NMSettingPPP
          +----NMSettingPPPOE
          +----NMSettingSerial
+         +----NMSettingVlan
          +----NMSettingVPN
          +----NMSettingWimax
          +----NMSettingWired
          +----NMSettingWireless
          +----NMSettingWirelessSecurity
 

+
+  GEnum
+   +----NMSettingCompareFlags
+

+
+  GEnum
+   +----NMSettingDiffResult
+

 
   GEnum
    +----NMSettingError
 

+
+  GEnum
+   +----NMSettingHashFlags
+

+
+  GEnum
+   +----NMSettingSecretFlags
+

Properties

@@ -200,9 +221,10 @@ It should only be accessed through the functions described below. NMSettingClearSecretsWithFlagsFn func, gpointer user_data); + const char *(*get_virtual_iface_name) (NMSetting *setting); + /* Padding for future expansion */ void (*_reserved1) (void); - void (*_reserved2) (void); } NMSettingClass;

@@ -213,7 +235,7 @@ It should only be accessed through the functions described below.

NMSettingClearSecretsWithFlagsFn ()

gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
                                                          const char *secret,
-                                                         NMSettingSecretFlags flags,
+                                                         NMSettingSecretFlags flags,
                                                          gpointer user_data);
@@ -246,7 +268,7 @@ It should only be accessed through the functions described below.
-

enum NMSettingCompareFlags

+

enum NMSettingCompareFlags

typedef enum {
 	NM_SETTING_COMPARE_FLAG_EXACT = 0x00000000,
 	NM_SETTING_COMPARE_FLAG_FUZZY = 0x00000001,
@@ -304,7 +326,7 @@ storage (ie, the secret's flag includes NM_SETTING_S
-

enum NMSettingDiffResult

+

enum NMSettingDiffResult

typedef enum {
 	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
 	NM_SETTING_DIFF_RESULT_IN_A =    0x00000001,
@@ -339,10 +361,10 @@ These values indicate the result of a setting difference operation.
 

 
enum NMSettingError

 
typedef enum {
-	NM_SETTING_ERROR_UNKNOWN = 0,
-	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,
-	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,
-	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH
+	NM_SETTING_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,    /*< nick=PropertyNotFound >*/
+	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,   /*< nick=PropertyNotSecret >*/
+	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH /*< nick=PropertyTypeMismatch >*/
 } NMSettingError;
 

 

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

 

-
enum NMSettingHashFlags

+
enum NMSettingHashFlags

 
typedef enum {
 	NM_SETTING_HASH_FLAG_ALL = 0x00000000,
 	NM_SETTING_HASH_FLAG_NO_SECRETS = 0x00000001,
@@ -414,7 +436,7 @@ when calling 
-
enum NMSettingSecretFlags

+
enum NMSettingSecretFlags

 
typedef enum {
 	NM_SETTING_SECRET_FLAG_NONE         = 0x00000000,
 	NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 0x00000001,
@@ -502,6 +524,14 @@ secret is not required
 

 

 

+
NM_SETTING_ERROR

+
#define NM_SETTING_ERROR nm_setting_error_quark ()
+

+

+

+

+

+

 
NM_SETTING_NAME

 
#define NM_SETTING_NAME "name"
 

@@ -594,10 +624,10 @@ specific secret should be cleared or not. [
nm_setting_compare ()

 
gboolean            nm_setting_compare                  (NMSetting *a,
                                                          NMSetting *b,
-                                                         NMSettingCompareFlags flags);

+                                                         NMSettingCompareFlags flags);

Compares two NMSetting objects for similarity, with comparison behavior -modified by a set of flags. See the documentation for NMSettingCompareFlags +modified by a set of flags. See the documentation for NMSettingCompareFlags for a description of each flag's behavior.

@@ -630,15 +660,15 @@ for a description of each flag's behavior.

nm_setting_diff ()

gboolean            nm_setting_diff                     (NMSetting *a,
                                                          NMSetting *b,
-                                                         NMSettingCompareFlags flags,
+                                                         NMSettingCompareFlags flags,
                                                          gboolean invert_results,
                                                          GHashTable **results);

Compares two NMSetting objects for similarity, with comparison behavior -modified by a set of flags. See the documentation for NMSettingCompareFlags +modified by a set of flags. See the documentation for NMSettingCompareFlags for a description of each flag's behavior. If the settings differ, the keys of each setting that differ from the other are added to results, mapped to -one or more NMSettingDiffResult values. +one or more NMSettingDiffResult values.

@@ -660,13 +690,13 @@ one or more invert_results :

 +be set to FALSE. If TRUE inverts the meaning of the NMSettingDiffResult. @@ -775,10 +805,10 @@ like 'ppp' or 'wireless' or 'wired'.

nm_setting_get_secret_flags ()

gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags,
+                                                         NMSettingSecretFlags *out_flags,
                                                          GError **error);

-For a given secret, retrieves the NMSettingSecretFlags describing how to +For a given secret, retrieves the NMSettingSecretFlags describing how to handle that secret.

this parameter is used internally by libnm-util and should -be set to FALSE. If TRUE inverts the meaning of the NMSettingDiffResult.

results :

 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 +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]
@@ -795,7 +825,7 @@ handle that secret. - + @@ -812,6 +842,30 @@ this setting, and if that property is secret), FALSE if not
+

nm_setting_get_virtual_iface_name ()

+
const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);
+

+Returns the name of the virtual kernel interface which the connection +needs to use if specified in the settings. +

+

out_flags :

on success, the NMSettingSecretFlags for the secreton success, the NMSettingSecretFlags for the secret

error :

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

setting :

the NMSetting +

Returns :

Name of the virtual interface or NULL if the setting does not +support this feature
+
+
+

nm_setting_need_secrets ()

GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);

@@ -878,10 +932,10 @@ hash table, or NULL on failure

nm_setting_set_secret_flags ()

gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
-                                                         NMSettingSecretFlags flags,
+                                                         NMSettingSecretFlags flags,
                                                          GError **error);

-For a given secret, retrieves the NMSettingSecretFlags describing how to +For a given secret, retrieves the NMSettingSecretFlags describing how to handle that secret.

@@ -898,7 +952,7 @@ handle that secret. - + @@ -917,7 +971,7 @@ this setting, and if that property is secret), FALSE if not

nm_setting_to_hash ()

GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);
+ NMSettingHashFlags flags);

Converts the NMSetting into a GHashTable mapping each setting property name to a GValue describing that property, suitable for marshalling over diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html index 1318a65c..ba179c4a 100644 --- a/docs/libnm-util/html/NMSetting8021x.html +++ b/docs/libnm-util/html/NMSetting8021x.html @@ -41,12 +41,12 @@

flags :

the NMSettingSecretFlags for the secretthe NMSettingSecretFlags for the secret

error :

Synopsis

-
+
 #include <nm-setting-8021x.h>
 
                     NMSetting8021x;
-enum                NMSetting8021xCKFormat;
-enum                NMSetting8021xCKScheme;
+enum                NMSetting8021xCKFormat;
+enum                NMSetting8021xCKScheme;
                     NMSetting8021xClass;
 enum                NMSetting8021xError;
 #define             NM_SETTING_802_1X_ALTSUBJECT_MATCHES
@@ -55,9 +55,13 @@ enum                NM_SETTING_802_1X_CA_PATH
 #define             NM_SETTING_802_1X_CLIENT_CERT
 #define             NM_SETTING_802_1X_EAP
+#define             NM_SETTING_802_1X_ERROR
 #define             NM_SETTING_802_1X_IDENTITY
+#define             NM_SETTING_802_1X_PAC_FILE
 #define             NM_SETTING_802_1X_PASSWORD
 #define             NM_SETTING_802_1X_PASSWORD_FLAGS
+#define             NM_SETTING_802_1X_PASSWORD_RAW
+#define             NM_SETTING_802_1X_PASSWORD_RAW_FLAGS
 #define             NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
 #define             NM_SETTING_802_1X_PHASE1_PEAPLABEL
 #define             NM_SETTING_802_1X_PHASE1_PEAPVER
@@ -100,14 +104,14 @@ const char *        NMSetting8021x *setting);
 const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);
 const GByteArray *  nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_client_cert_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
                                                          guint32 i);
@@ -118,8 +122,12 @@ const char *        NMSetting8021x *setting);
 guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
                                                         (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_password_flags
+NMSettingSecretFlags nm_setting_802_1x_get_password_flags
+                                                        (NMSetting8021x *setting);
+const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (NMSetting8021x *setting);
@@ -137,7 +145,7 @@ const NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_ca_path
                                                         (NMSetting8021x *setting);
@@ -145,35 +153,35 @@ const NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);
 const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
+NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_private_key_password
                                                         (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_private_key_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_subject_match
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);
 const GByteArray *  nm_setting_802_1x_get_private_key_blob
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
+NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_private_key_password
                                                         (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
+NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_private_key_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_get_system_ca_certs
@@ -189,38 +197,38 @@ const char *        guint32 i);
 gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 gboolean            nm_setting_802_1x_set_phase2_ca_cert
                                                         (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 gboolean            nm_setting_802_1x_set_phase2_client_cert
                                                         (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 gboolean            nm_setting_802_1x_set_phase2_private_key
                                                         (NMSetting8021x *setting,
                                                          const char *key_path,
                                                          const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
                                                          const char *key_path,
                                                          const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);
@@ -231,6 +239,14 @@ const char * NMSetting +----NMSetting8021x +
+  GEnum
+   +----NMSetting8021xCKFormat
+
+
+  GEnum
+   +----NMSetting8021xCKScheme
+
   GEnum
    +----NMSetting8021xError
@@ -246,8 +262,11 @@ const char *        client-cert"              GArray_guchar_*       : Read / Write
   "eap"                      GSList_gchararray_*   : Read / Write
   "identity"                 gchar*                : Read / Write
+  "pac-file"                 gchar*                : Read / Write
   "password"                 gchar*                : Read / Write
   "password-flags"           guint                 : Read / Write
+  "password-raw"             GArray_guchar_*       : Read / Write
+  "password-raw-flags"       guint                 : Read / Write
   "phase1-fast-provisioning" gchar*                : Read / Write
   "phase1-peaplabel"         gchar*                : Read / Write
   "phase1-peapver"           gchar*                : Read / Write
@@ -309,8 +328,9 @@ following books.
-

enum NMSetting8021xCKFormat

+

enum NMSetting8021xCKFormat

typedef enum {
+ /*< underscore_name=nm_setting_802_1x_ck_format >*/
 	NM_SETTING_802_1X_CK_FORMAT_UNKNOWN = 0,
 	NM_SETTING_802_1X_CK_FORMAT_X509,
 	NM_SETTING_802_1X_CK_FORMAT_RAW_KEY,
@@ -318,7 +338,7 @@ following books.
 } NMSetting8021xCKFormat;

-NMSetting8021xCKFormat values indicate the general type of a certificate +NMSetting8021xCKFormat values indicate the general type of a certificate or private key

@@ -351,15 +371,16 @@ and private key
-

enum NMSetting8021xCKScheme

+

enum NMSetting8021xCKScheme

typedef enum {
+ /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
 	NM_SETTING_802_1X_CK_SCHEME_UNKNOWN = 0,
 	NM_SETTING_802_1X_CK_SCHEME_BLOB,
 	NM_SETTING_802_1X_CK_SCHEME_PATH
 } NMSetting8021xCKScheme;

-NMSetting8021xCKScheme values indicate how a certificate or private key is +NMSetting8021xCKScheme values indicate how a certificate or private key is stored in the setting properties, either as a blob of the item's data, or as a path to a certificate or private key file on the filesystem

@@ -407,9 +428,10 @@ to a file containing the certificate or key data

enum NMSetting8021xError

typedef enum {
-	NM_SETTING_802_1X_ERROR_UNKNOWN = 0,
-	NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
-	NM_SETTING_802_1X_ERROR_MISSING_PROPERTY
+ /*< underscore_name=nm_setting_802_1x_error >*/
+	NM_SETTING_802_1X_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_802_1X_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSetting8021xError;
@@ -484,6 +506,14 @@ required
+

NM_SETTING_802_1X_ERROR

+
#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
+
+

+

+
+
+

NM_SETTING_802_1X_IDENTITY

#define NM_SETTING_802_1X_IDENTITY "identity"
@@ -492,6 +522,14 @@ required
+

NM_SETTING_802_1X_PAC_FILE

+
#define NM_SETTING_802_1X_PAC_FILE "pac-file"
+
+

+

+
+
+

NM_SETTING_802_1X_PASSWORD

#define NM_SETTING_802_1X_PASSWORD "password"
@@ -508,6 +546,22 @@ required
+

NM_SETTING_802_1X_PASSWORD_RAW

+
#define NM_SETTING_802_1X_PASSWORD_RAW "password-raw"
+
+

+

+
+
+
+

NM_SETTING_802_1X_PASSWORD_RAW_FLAGS

+
#define NM_SETTING_802_1X_PASSWORD_RAW_FLAGS "password-raw-flags"
+
+

+

+
+
+

NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING

#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
@@ -944,7 +998,7 @@ of the network cannot be confirmed by the client.

nm_setting_802_1x_get_ca_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the CA certificate.  If the returned scheme
@@ -1045,7 +1099,7 @@ authentication method.
 

 

 
nm_setting_802_1x_get_client_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the client certificate.  If the returned scheme
@@ -1195,6 +1249,28 @@ Returns the number of entries in the
 

 

 

+
nm_setting_802_1x_get_pac_file ()

+
const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);

+

+Returns the file containing PAC credentials used by EAP-FAST method.
+

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

setting :

the NMSetting8021x +

Returns :

the PAC file
+
+
+

nm_setting_802_1x_get_password ()

const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
@@ -1216,7 +1292,7 @@ by the

nm_setting_802_1x_get_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_password_flags
+
NMSettingSecretFlags nm_setting_802_1x_get_password_flags
                                                         (NMSetting8021x *setting);
@@ -1228,7 +1304,50 @@ by the - + + +

Returns :

the NMSettingSecretFlags pertaining to the "password" +the NMSettingSecretFlags pertaining to the "password" +
+
+
+
+

nm_setting_802_1x_get_password_raw ()

+
const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);
+
++ + + + + + + + + + +

setting :

the NMSetting8021x +

Returns :

the password used by the authentication method as a +UTF-8-encoded array of bytes, as specified by the +"password-raw" property
+
+
+
+

nm_setting_802_1x_get_password_raw_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
+                                                        (NMSetting8021x *setting);
+
++ + + + + + + + @@ -1431,7 +1550,7 @@ of the network cannot be confirmed by the client.

nm_setting_802_1x_get_phase2_ca_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the "phase 2" CA certificate.  If the
@@ -1534,7 +1653,7 @@ authentication method.
 

 

 
nm_setting_802_1x_get_phase2_client_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the "phase 2" client certificate.  If the
@@ -1591,7 +1710,7 @@ keys should always be encrypted with a private key password.
 

 

 
nm_setting_802_1x_get_phase2_private_key_format ()

-
NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
+
NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
                                                         (NMSetting8021x *setting);

setting :

the NMSetting8021x +

Returns :

the NMSettingSecretFlags pertaining to the +"password-raw"
@@ -1634,7 +1753,7 @@ previously set with

nm_setting_802_1x_get_phase2_private_key_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+
NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
                                                         (NMSetting8021x *setting);
@@ -1646,7 +1765,7 @@ previously set with Returns :

- @@ -1681,7 +1800,7 @@ authentication method.

nm_setting_802_1x_get_phase2_private_key_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the "phase 2" private key.  If the returned
@@ -1751,7 +1870,7 @@ by the "pin" property
 

 

 
nm_setting_802_1x_get_pin_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);

+
NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);
the NMSettingSecretFlags pertaining to the +the NMSettingSecretFlags pertaining to the "phase2-private-key-password"
@@ -1762,7 +1881,7 @@ by the "pin" property - @@ -1802,7 +1921,7 @@ keys should always be encrypted with a private key password.

nm_setting_802_1x_get_private_key_format ()

-
NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
+
NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
                                                         (NMSetting8021x *setting);

Returns :

the NMSettingSecretFlags pertaining to the +the NMSettingSecretFlags pertaining to the "pin"
@@ -1845,7 +1964,7 @@ previously set with

nm_setting_802_1x_get_private_key_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
+
NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
                                                         (NMSetting8021x *setting);
@@ -1857,7 +1976,7 @@ previously set with Returns :

- @@ -1892,7 +2011,7 @@ authentication method.

nm_setting_802_1x_get_private_key_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the private key.  If the returned scheme is
@@ -2057,8 +2176,8 @@ Removes the allowed "phase 2" altSubjectName at the specified index.
 
nm_setting_802_1x_set_ca_cert ()

 
gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

 Reads a certificate from disk and sets the "ca-cert" property
@@ -2106,8 +2225,8 @@ clears the CA certificate.
 
nm_setting_802_1x_set_client_cert ()

 
gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

 Reads a certificate from disk and sets the "client-cert"
@@ -2161,8 +2280,8 @@ any scheme clears the client certificate
 
gboolean            nm_setting_802_1x_set_phase2_ca_cert
                                                         (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

 Reads a certificate from disk and sets the "phase2-ca-cert"
@@ -2211,8 +2330,8 @@ clears the "phase2" CA certificate.
 
gboolean            nm_setting_802_1x_set_phase2_client_cert
                                                         (NMSetting8021x *setting,
                                                          const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

 Reads a certificate from disk and sets the "phase2-client-cert"
@@ -2267,8 +2386,8 @@ any scheme clears the "phase2" client ce
                                                         (NMSetting8021x *setting,
                                                          const char *key_path,
                                                          const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);

Private keys are used to authenticate the connecting client to the network @@ -2343,8 +2462,8 @@ an error is returned. 

gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
                                                          const char *key_path,
                                                          const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
                                                          GError **error);

Private keys are used to authenticate the connecting client to the network @@ -2492,10 +2611,21 @@ user or login name.

+

The "pac-file" property

+
  "pac-file"                 gchar*                : Read / Write
+

+UTF-8 encoded file path containing PAC for EAP-FAST. +

+

Default value: NULL

+
+
+

The "password" property

  "password"                 gchar*                : Read / Write

-Password used for EAP authentication methods. +Password used for EAP authentication methods. If both +"password" and "password-raw" are +specified, "password" is preferred.

Default value: NULL

@@ -2511,6 +2641,27 @@ Flags indicating how to handle +

The "password-raw" property

+
  "password-raw"             GArray_guchar_*       : Read / Write
+

+Password used for EAP authentication methods delivered as a +UTF-8-encoded array of bytes. If both "password" +and "password-raw" are specified, +"password" is preferred. +

+ +
+
+

The "password-raw-flags" property

+
  "password-raw-flags"       guint                 : Read / Write
+

+Flags indicating how to handle "password-raw":. +

+

Allowed values: <= 7

+

Default value: 0

+
+
+

The "phase1-fast-provisioning" property

  "phase1-fast-provisioning" gchar*                : Read / Write

diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html index d6450cfc..e2f39011 100644 --- a/docs/libnm-util/html/NMSettingBluetooth.html +++ b/docs/libnm-util/html/NMSettingBluetooth.html @@ -48,6 +48,7 @@ NMSettingBluetoothClass; enum NMSettingBluetoothError; #define NM_SETTING_BLUETOOTH_BDADDR +#define NM_SETTING_BLUETOOTH_ERROR #define NM_SETTING_BLUETOOTH_SETTING_NAME #define NM_SETTING_BLUETOOTH_TYPE #define NM_SETTING_BLUETOOTH_TYPE_DUN @@ -115,10 +116,10 @@ Point (NAP) profiles.

enum NMSettingBluetoothError

typedef enum {
-	NM_SETTING_BLUETOOTH_ERROR_UNKNOWN = 0,
-	NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,
-	NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY,
-	NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND,
+	NM_SETTING_BLUETOOTH_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
+	NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,       /*< nick=InvalidProperty >*/
+	NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY,       /*< nick=MissingProperty >*/
+	NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND, /*< nick=TypeSettingNotFound >*/
 } NMSettingBluetoothError;
the NMSettingSecretFlags pertaining to the +the NMSettingSecretFlags pertaining to the "private-key-password"
@@ -160,6 +161,14 @@ must also contain an +

NM_SETTING_BLUETOOTH_ERROR

+
#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
+
+

+

+ +
+

NM_SETTING_BLUETOOTH_SETTING_NAME

#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html index d0d5634d..ffb2f45b 100644 --- a/docs/libnm-util/html/NMSettingCdma.html +++ b/docs/libnm-util/html/NMSettingCdma.html @@ -47,6 +47,7 @@ NMSettingCdma; NMSettingCdmaClass; enum NMSettingCdmaError; +#define NM_SETTING_CDMA_ERROR #define NM_SETTING_CDMA_NUMBER #define NM_SETTING_CDMA_PASSWORD #define NM_SETTING_CDMA_PASSWORD_FLAGS @@ -55,7 +56,7 @@ enum GQuark nm_setting_cdma_error_quark (void); const char * nm_setting_cdma_get_number (NMSettingCdma *setting); const char * nm_setting_cdma_get_password (NMSettingCdma *setting); -NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting); +NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting); const char * nm_setting_cdma_get_username (NMSettingCdma *setting); NMSetting * nm_setting_cdma_new (void); @@ -117,10 +118,10 @@ networks, including those using CDMA2000/EVDO technology.

enum NMSettingCdmaError

typedef enum {
-	NM_SETTING_CDMA_ERROR_UNKNOWN = 0,
-	NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,
-	NM_SETTING_CDMA_ERROR_MISSING_PROPERTY,
-	NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING
+	NM_SETTING_CDMA_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
+	NM_SETTING_CDMA_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
+	NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING /*< nick=MissingSerialSetting >*/
 } NMSettingCdmaError;
@@ -153,6 +154,14 @@ is missing in the connection
+

NM_SETTING_CDMA_ERROR

+
#define NM_SETTING_CDMA_ERROR nm_setting_cdma_error_quark ()
+
+

+

+
+
+

NM_SETTING_CDMA_NUMBER

#define NM_SETTING_CDMA_NUMBER         "number"
@@ -247,7 +256,7 @@ Registers an error quark for

nm_setting_cdma_get_password_flags ()

-
NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);
+
NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);
@@ -258,7 +267,7 @@ Registers an error quark for Returns :

- diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html index 0089fc41..360c9743 100644 --- a/docs/libnm-util/html/NMSettingConnection.html +++ b/docs/libnm-util/html/NMSettingConnection.html @@ -48,13 +48,22 @@ NMSettingConnectionClass; enum NMSettingConnectionError; #define NM_SETTING_CONNECTION_AUTOCONNECT +#define NM_SETTING_CONNECTION_ERROR #define NM_SETTING_CONNECTION_ID +#define NM_SETTING_CONNECTION_MASTER #define NM_SETTING_CONNECTION_PERMISSIONS #define NM_SETTING_CONNECTION_READ_ONLY #define NM_SETTING_CONNECTION_SETTING_NAME +#define NM_SETTING_CONNECTION_SLAVE_TYPE #define NM_SETTING_CONNECTION_TIMESTAMP #define NM_SETTING_CONNECTION_TYPE #define NM_SETTING_CONNECTION_UUID +#define NM_SETTING_CONNECTION_ZONE +#define NM_SETTING_CONNECTION_ZONE_BLOCK +#define NM_SETTING_CONNECTION_ZONE_HOME +#define NM_SETTING_CONNECTION_ZONE_PUBLIC +#define NM_SETTING_CONNECTION_ZONE_TRUSTED +#define NM_SETTING_CONNECTION_ZONE_WORKgbooleannm_setting_connection_add_permission (NMSettingConnection *setting, const char *ptype, @@ -66,6 +75,7 @@ enum char * nm_setting_connection_get_connection_type (NMSettingConnection *setting); const char * nm_setting_connection_get_id (NMSettingConnection *setting); +const char * nm_setting_connection_get_master (NMSettingConnection *setting); guint32nm_setting_connection_get_num_permissions (NMSettingConnection *setting); gbooleannm_setting_connection_get_permission @@ -75,8 +85,13 @@ const char * const char **out_pitem, const char **out_detail); gbooleannm_setting_connection_get_read_only (NMSettingConnection *setting); +const char * nm_setting_connection_get_slave_type + (NMSettingConnection *setting); guint64nm_setting_connection_get_timestamp (NMSettingConnection *setting); const char * nm_setting_connection_get_uuid (NMSettingConnection *setting); +const char * nm_setting_connection_get_zone (NMSettingConnection *setting); +gbooleannm_setting_connection_is_slave_type (NMSettingConnection *setting, + const char *type); NMSetting * nm_setting_connection_new (void); gbooleannm_setting_connection_permissions_user_allowed (NMSettingConnection *setting, @@ -103,11 +118,14 @@ const char * "autoconnect" gboolean : Read / Write / Construct "id" gchar* : Read / Write + "master" gchar* : Read / Write "permissions" GSList_gchararray_* : Read / Write "read-only" gboolean : Read / Write / Construct + "slave-type" gchar* : Read / Write "timestamp" guint64 : Read / Write / Construct "type" gchar* : Read / Write "uuid" gchar* : Read / Write + "zone" gchar* : Read / Write / Construct
@@ -149,10 +167,11 @@ It should only be accessed through the functions described below.

enum NMSettingConnectionError

typedef enum {
-	NM_SETTING_CONNECTION_ERROR_UNKNOWN = 0,
-	NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
-	NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
-	NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND
+	NM_SETTING_CONNECTION_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
+	NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,       /*< nick=InvalidProperty >*/
+	NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,       /*< nick=MissingProperty >*/
+	NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND, /*< nick=TypeSettingNotFound >*/
+	NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED,  /*< nick=IpConfigNotAllowed >*/
 } NMSettingConnectionError;

@@ -186,6 +205,12 @@ Describes errors that may result from operations involving a "type" property was not present in the NMConnection +

+ + +
the NMSettingSecretFlags pertaining to the "password" +the NMSettingSecretFlags pertaining to the "password"

NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED

ip configuration is not + allowed to be present. +
@@ -199,6 +224,14 @@ Describes errors that may result from operations involving a
+

NM_SETTING_CONNECTION_ERROR

+
#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
+
+

+

+
+
+

NM_SETTING_CONNECTION_ID

#define NM_SETTING_CONNECTION_ID          "id"
@@ -207,6 +240,14 @@ Describes errors that may result from operations involving a
+

NM_SETTING_CONNECTION_MASTER

+
#define NM_SETTING_CONNECTION_MASTER      "master"
+
+

+

+
+
+

NM_SETTING_CONNECTION_PERMISSIONS

#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
@@ -231,6 +272,14 @@ Describes errors that may result from operations involving a
+

NM_SETTING_CONNECTION_SLAVE_TYPE

+
#define NM_SETTING_CONNECTION_SLAVE_TYPE  "slave-type"
+
+

+

+
+
+

NM_SETTING_CONNECTION_TIMESTAMP

#define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
@@ -255,6 +304,54 @@ Describes errors that may result from operations involving a
+

NM_SETTING_CONNECTION_ZONE

+
#define NM_SETTING_CONNECTION_ZONE        "zone"
+
+

+

+
+
+
+

NM_SETTING_CONNECTION_ZONE_BLOCK

+
#define NM_SETTING_CONNECTION_ZONE_BLOCK     "block"
+
+

+

+
+
+
+

NM_SETTING_CONNECTION_ZONE_HOME

+
#define NM_SETTING_CONNECTION_ZONE_HOME      "home"
+
+

+

+
+
+
+

NM_SETTING_CONNECTION_ZONE_PUBLIC

+
#define NM_SETTING_CONNECTION_ZONE_PUBLIC    "public"
+
+

+

+
+
+
+

NM_SETTING_CONNECTION_ZONE_TRUSTED

+
#define NM_SETTING_CONNECTION_ZONE_TRUSTED   "trusted"
+
+

+

+
+
+
+

NM_SETTING_CONNECTION_ZONE_WORK

+
#define NM_SETTING_CONNECTION_ZONE_WORK      "work"
+
+

+

+
+
+

nm_setting_connection_add_permission ()

gboolean            nm_setting_connection_add_permission
                                                         (NMSettingConnection *setting,
@@ -382,6 +479,29 @@ Returns the 
+
nm_setting_connection_get_master ()

+
const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);

+

+Returns the "master" property of the connection.
+

+

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


setting :
the NMSettingConnection
+
Returns :
interface name of the master device or UUID of the master
+connection.

+
+
+

nm_setting_connection_get_num_permissions ()

guint32             nm_setting_connection_get_num_permissions
                                                         (NMSettingConnection *setting);
@@ -475,6 +595,29 @@ Returns the +

nm_setting_connection_get_slave_type ()

+
const char *        nm_setting_connection_get_slave_type
+                                                        (NMSettingConnection *setting);
+

+Returns the "slave-type" property of the connection. +

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

setting :

the NMSettingConnection +

Returns :

the type of slave this connection is, if any
+
+
+

nm_setting_connection_get_timestamp ()

guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);

@@ -519,6 +662,54 @@ Returns the +

nm_setting_connection_get_zone ()

+
const char *        nm_setting_connection_get_zone      (NMSettingConnection *setting);
+

+Returns the "zone" property of the connection. +

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

setting :

the NMSettingConnection +

Returns :

the trust level of a connection
+
+
+
+

nm_setting_connection_is_slave_type ()

+
gboolean            nm_setting_connection_is_slave_type (NMSettingConnection *setting,
+                                                         const char *type);
+
++ + + + + + + + + + + + + + +

setting :

the NMSettingConnection +

type :

the setting name (ie NM_SETTING_BOND_SETTING_NAME) to be matched +against setting's slave type

Returns :

TRUE if connection is of the given slave type +
+
+
+

nm_setting_connection_new ()

NMSetting *         nm_setting_connection_new           (void);

@@ -612,6 +803,15 @@ A human readable unique idenfier for the connection, like "Work WiFi" or

+

The "master" property

+
  "master"                   gchar*                : Read / Write
+

+Interface name of the master device or UUID of the master connection. +

+

Default value: NULL

+
+
+

The "permissions" property

  "permissions"              GSList_gchararray_*   : Read / Write

@@ -645,6 +845,16 @@ if the connection is read-only and cannot be modified.

+

The "slave-type" property

+
  "slave-type"               gchar*                : Read / Write
+

+Setting name describing the type of slave device (ie +NM_SETTING_BOND_SETTING_NAME) or NULL if this connection is not a slave. +

+

Default value: NULL

+
+
+

The "timestamp" property

  "timestamp"                guint64               : Read / Write / Construct

@@ -686,6 +896,18 @@ be generated by +

The "zone" property

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

+The trust level of a the connection. +Free form case-insensitive string (for example "Home", "Work", "Public"). +NULL or unspecified zone means the connection will be placed in the +default zone as defined by the firewall. +

+

Default value: NULL

+
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html index ce1012f4..f2522cdc 100644 --- a/docs/libnm-util/html/NMSettingGsm.html +++ b/docs/libnm-util/html/NMSettingGsm.html @@ -41,16 +41,17 @@

Synopsis

-
+
 #include <nm-setting-gsm.h>
 
                     NMSettingGsm;
                     NMSettingGsmClass;
 enum                NMSettingGsmError;
-enum                NMSettingGsmNetworkBand;
-enum                NMSettingGsmNetworkType;
+enum                NMSettingGsmNetworkBand;
+enum                NMSettingGsmNetworkType;
 #define             NM_SETTING_GSM_ALLOWED_BANDS
 #define             NM_SETTING_GSM_APN
+#define             NM_SETTING_GSM_ERROR
 #define             NM_SETTING_GSM_HOME_ONLY
 #define             NM_SETTING_GSM_NETWORK_ID
 #define             NM_SETTING_GSM_NETWORK_TYPE
@@ -69,9 +70,9 @@ const char *        int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);
-NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);
+NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);
-NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);
+NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);
 NMSetting *         nm_setting_gsm_new                  (void);
 

@@ -87,6 +88,14 @@ const char *        
+  GEnum
+   +----NMSettingGsmNetworkBand
+
+
+  GEnum
+   +----NMSettingGsmNetworkType
+

Properties

@@ -140,10 +149,10 @@ networks, including those using GPRS/EDGE and UMTS/HSPA technology.

enum NMSettingGsmError

typedef enum {
-	NM_SETTING_GSM_ERROR_UNKNOWN = 0,
-	NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
-	NM_SETTING_GSM_ERROR_MISSING_PROPERTY,
-	NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING
+	NM_SETTING_GSM_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_GSM_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
+	NM_SETTING_GSM_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
+	NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING /*< nick=MissingSerialSetting >*/
 } NMSettingGsmError;
@@ -176,7 +185,7 @@ is missing in the connection
-

enum NMSettingGsmNetworkBand

+

enum NMSettingGsmNetworkBand

typedef enum {
 	NM_SETTING_GSM_BAND_UNKNOWN      = 0x00000000,
 	NM_SETTING_GSM_BAND_ANY          = 0x00000001,
@@ -196,7 +205,7 @@ is missing in the connection
 } NMSettingGsmNetworkBand;

-NMSettingGsmNetworkBand values indicate the allowed frequency bands +NMSettingGsmNetworkBand values indicate the allowed frequency bands the device may use when connecting to this network.

@@ -282,7 +291,7 @@ the device may use when connecting to this network.
-

enum NMSettingGsmNetworkType

+

enum NMSettingGsmNetworkType

typedef enum {
 	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
 	NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
@@ -292,7 +301,7 @@ the device may use when connecting to this network.
 } NMSettingGsmNetworkType;

-NMSettingGsmNetworkType values indicate the allowed access technologies +NMSettingGsmNetworkType values indicate the allowed access technologies the device may use when connecting to this network.

@@ -348,6 +357,14 @@ preferred but 3G-type technologies may be used as a fallback
+

NM_SETTING_GSM_ERROR

+
#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
+
+

+

+
+
+

NM_SETTING_GSM_HOME_ONLY

#define NM_SETTING_GSM_HOME_ONLY      "home-only"
@@ -577,7 +594,7 @@ Registers an error quark for

nm_setting_gsm_get_password_flags ()

-
NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);
+
NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);
@@ -588,7 +605,7 @@ Registers an error quark for Returns :

- @@ -616,7 +633,7 @@ Registers an error quark for

nm_setting_gsm_get_pin_flags ()

-
NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);
+
NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);
the NMSettingSecretFlags pertaining to the "password" +the NMSettingSecretFlags pertaining to the "password"
@@ -627,7 +644,7 @@ Registers an error quark for Returns :

- @@ -676,7 +693,7 @@ Creates a new Bitfield of allowed frequency bands. Note that not all devices allow frequency band control. Permitted values are those specified by -NMSettingGsmNetworkBand. +NMSettingGsmNetworkBand.

Allowed values: <= 1

Default value: 1

@@ -726,7 +743,7 @@ roaming control of the device is not otherwise possible.

Network preference to force the device to only use specific network technologies. Permitted values are those specified by -NMSettingGsmNetworkType. Note that not all devices allow network +NMSettingGsmNetworkType. Note that not all devices allow network preference control.

Allowed values: [G_MAXULONG,3]

diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html index aee7ddc8..1f9e666b 100644 --- a/docs/libnm-util/html/NMSettingIP4Config.html +++ b/docs/libnm-util/html/NMSettingIP4Config.html @@ -55,6 +55,7 @@ enum NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME #define NM_SETTING_IP4_CONFIG_DNS #define NM_SETTING_IP4_CONFIG_DNS_SEARCH +#define NM_SETTING_IP4_CONFIG_ERROR #define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS #define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES #define NM_SETTING_IP4_CONFIG_MAY_FAIL @@ -247,10 +248,10 @@ properties related to IPv4 addressing, routing, and Domain Name Service

enum NMSettingIP4ConfigError

typedef enum {
-	NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN = 0,
-	NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
-	NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY,
-	NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD
+	NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
+	NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
+	NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD /*< nick=NotAllowedForMethod >*/
 } NMSettingIP4ConfigError;
the NMSettingSecretFlags pertaining to the "pin" +the NMSettingSecretFlags pertaining to the "pin"
@@ -331,6 +332,14 @@ not valid with the given IP4 method
+

NM_SETTING_IP4_CONFIG_ERROR

+
#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
+
+

+

+
+
+

NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
@@ -1753,7 +1762,7 @@ example, in IPv6-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.

-

Default value: FALSE

+

Default value: TRUE

diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html index e0d39277..b053bd27 100644 --- a/docs/libnm-util/html/NMSettingIP6Config.html +++ b/docs/libnm-util/html/NMSettingIP6Config.html @@ -41,7 +41,7 @@

Synopsis

-
+
 #include <nm-setting-ip6-config.h>
 
 typedef             NMIP6Address;
@@ -49,11 +49,14 @@ typedef             NM
                     NMSettingIP6Config;
                     NMSettingIP6ConfigClass;
 enum                NMSettingIP6ConfigError;
+enum                NMSettingIP6ConfigPrivacy;
 #define             NM_SETTING_IP6_CONFIG_ADDRESSES
 #define             NM_SETTING_IP6_CONFIG_DNS
 #define             NM_SETTING_IP6_CONFIG_DNS_SEARCH
+#define             NM_SETTING_IP6_CONFIG_ERROR
 #define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
 #define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
+#define             NM_SETTING_IP6_CONFIG_IP6_PRIVACY
 #define             NM_SETTING_IP6_CONFIG_MAY_FAIL
 #define             NM_SETTING_IP6_CONFIG_METHOD
 #define             NM_SETTING_IP6_CONFIG_METHOD_AUTO
@@ -125,6 +128,8 @@ const char *        NMSettingIP6Config *setting);
 gboolean            nm_setting_ip6_config_get_ignore_auto_routes
                                                         (NMSettingIP6Config *setting);
+NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
+                                                        (NMSettingIP6Config *setting);
 gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);
 const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);
 gboolean            nm_setting_ip6_config_get_never_default
@@ -170,6 +175,10 @@ const char *        
+  GEnum
+   +----NMSettingIP6ConfigPrivacy
+

Properties

@@ -179,6 +188,7 @@ const char * dns-search" GSList_gchararray_* : Read / Write "ignore-auto-dns" gboolean : Read / Write / Construct "ignore-auto-routes" gboolean : Read / Write / Construct + "ip6-privacy" gint : Read / Write / Construct "may-fail" gboolean : Read / Write / Construct "method" gchar* : Read / Write "never-default" gboolean : Read / Write / Construct @@ -236,10 +246,10 @@ properties related to IPv6 addressing, routing, and Domain Name Service

enum NMSettingIP6ConfigError

typedef enum {
-	NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN = 0,
-	NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,
-	NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY,
-	NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD
+	NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
+	NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
+	NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD /*< nick=NotAllowedForMethod >*/
 } NMSettingIP6ConfigError;
@@ -272,6 +282,48 @@ not valid with the given IPv6 method
+

enum NMSettingIP6ConfigPrivacy

+
typedef enum {
+	NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN = -1,
+	NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED = 0,
+	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR = 1,
+	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR = 2
+} NMSettingIP6ConfigPrivacy;
+
+

+NMSettingIP6ConfigPrivacy values indicate if and how IPv6 Privacy +Extensions are used (RFC4941). +

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

NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN

unknown or no value specified +

NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED

IPv6 Privacy Extensions are disabled +

NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR

IPv6 Privacy Extensions +are enabled, but public addresses are preferred over temporary addresses +

NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR

IPv6 Privacy Extensions +are enabled and temporary addresses are preferred over public addresses +
+
+
+

NM_SETTING_IP6_CONFIG_ADDRESSES

#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
@@ -296,6 +348,14 @@ not valid with the given IPv6 method
+

NM_SETTING_IP6_CONFIG_ERROR

+
#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
+
+

+

+
+
+

NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS

#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
@@ -312,6 +372,14 @@ not valid with the given IPv6 method
+

NM_SETTING_IP6_CONFIG_IP6_PRIVACY

+
#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY        "ip6-privacy"
+
+

+

+
+
+

NM_SETTING_IP6_CONFIG_MAY_FAIL

#define NM_SETTING_IP6_CONFIG_MAY_FAIL           "may-fail"
@@ -1262,6 +1330,30 @@ ignored.
+

nm_setting_ip6_config_get_ip6_privacy ()

+
NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
+                                                        (NMSettingIP6Config *setting);
+

+Returns the value contained in the "ip6-privacy" +property. +

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

setting :

the NMSettingIP6Config +

Returns :

IPv6 Privacy Extensions configuration value (NMSettingIP6ConfigPrivacy).
+
+
+

nm_setting_ip6_config_get_may_fail ()

gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);

@@ -1615,6 +1707,22 @@ specified in +

The "ip6-privacy" property

+
  "ip6-privacy"              gint                  : Read / Write / Construct
+

+Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. +If enabled, it makes the kernel generate a temporary IPv6 address +in addition to the public one generated from MAC address via +modified EUI-64. This enhances privacy, but could cause problems +in some applications, on the other hand. The permitted values +are: 0: disabled, 1: enabled (prefer public address), +2: enabled (prefer temporary addresses). +

+

Allowed values: [G_MAXULONG,2]

+

Default value: -1

+
+
+

The "may-fail" property

  "may-fail"                 gboolean              : Read / Write / Construct

diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html index 1f24e2a5..15992600 100644 --- a/docs/libnm-util/html/NMSettingOlpcMesh.html +++ b/docs/libnm-util/html/NMSettingOlpcMesh.html @@ -46,6 +46,7 @@ enum NMSettingOlpcMeshError; #define NM_SETTING_OLPC_MESH_CHANNEL #define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS +#define NM_SETTING_OLPC_MESH_ERROR #define NM_SETTING_OLPC_MESH_SETTING_NAME #define NM_SETTING_OLPC_MESH_SSID GQuark nm_setting_olpc_mesh_error_quark (void); @@ -109,9 +110,9 @@ const

enum NMSettingOlpcMeshError

typedef enum {
-	NM_SETTING_OLPC_MESH_ERROR_UNKNOWN = 0,
-	NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY,
-	NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY
+	NM_SETTING_OLPC_MESH_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingOlpcMeshError;

@@ -135,6 +136,14 @@ const +

NM_SETTING_OLPC_MESH_ERROR

+
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
+
+

+

+
+
+

NM_SETTING_OLPC_MESH_SETTING_NAME

#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html index c1d73ead..0f95d8f6 100644 --- a/docs/libnm-util/html/NMSettingPPP.html +++ b/docs/libnm-util/html/NMSettingPPP.html @@ -50,6 +50,7 @@ that require PPP to deliver IP capability

enum NMSettingPPPError; #define NM_SETTING_PPP_BAUD #define NM_SETTING_PPP_CRTSCTS +#define NM_SETTING_PPP_ERROR #define NM_SETTING_PPP_LCP_ECHO_FAILURE #define NM_SETTING_PPP_LCP_ECHO_INTERVAL #define NM_SETTING_PPP_MPPE_STATEFUL @@ -161,10 +162,10 @@ cable and DSL modems and some mobile broadband devices.

enum NMSettingPPPError

typedef enum {
-	NM_SETTING_PPP_ERROR_UNKNOWN = 0,
-	NM_SETTING_PPP_ERROR_INVALID_PROPERTY,
-	NM_SETTING_PPP_ERROR_MISSING_PROPERTY,
-	NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED
+	NM_SETTING_PPP_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
+	NM_SETTING_PPP_ERROR_INVALID_PROPERTY,        /*< nick=InvalidProperty >*/
+	NM_SETTING_PPP_ERROR_MISSING_PROPERTY,        /*< nick=MissingProperty >*/
+	NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED /*< nick=RequireMPPENotAllowed >*/
 } NMSettingPPPError;
@@ -213,6 +214,14 @@ with other setting configuration parameters
+

NM_SETTING_PPP_ERROR

+
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
+
+

+

+
+
+

NM_SETTING_PPP_LCP_ECHO_FAILURE

#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html index 43c795db..bdbeeead 100644 --- a/docs/libnm-util/html/NMSettingPPPOE.html +++ b/docs/libnm-util/html/NMSettingPPPOE.html @@ -47,6 +47,7 @@ NMSettingPPPOE; NMSettingPPPOEClass; enum NMSettingPPPOEError; +#define NM_SETTING_PPPOE_ERROR #define NM_SETTING_PPPOE_PASSWORD #define NM_SETTING_PPPOE_PASSWORD_FLAGS #define NM_SETTING_PPPOE_SERVICE @@ -54,7 +55,7 @@ enum NM_SETTING_PPPOE_USERNAME GQuark nm_setting_pppoe_error_quark (void); const char * nm_setting_pppoe_get_password (NMSettingPPPOE *setting); -NMSettingSecretFlags nm_setting_pppoe_get_password_flags +NMSettingSecretFlags nm_setting_pppoe_get_password_flags (NMSettingPPPOE *setting); const char * nm_setting_pppoe_get_service (NMSettingPPPOE *setting); const char * nm_setting_pppoe_get_username (NMSettingPPPOE *setting); @@ -118,10 +119,10 @@ to provide IP transport, for example cable or DSL modems.

enum NMSettingPPPOEError

typedef enum {
-	NM_SETTING_PPPOE_ERROR_UNKNOWN = 0,
-	NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,
-	NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY,
-	NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING
+	NM_SETTING_PPPOE_ERROR_UNKNOWN = 0,        /*< nick=UnknownError >*/
+	NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,   /*< nick=InvalidProperty >*/
+	NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY,   /*< nick=MissingProperty >*/
+	NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
 } NMSettingPPPOEError;
@@ -154,6 +155,14 @@ did not contain a required PPP setting for PPP related options
+

NM_SETTING_PPPOE_ERROR

+
#define NM_SETTING_PPPOE_ERROR nm_setting_pppoe_error_quark ()
+
+

+

+
+
+

NM_SETTING_PPPOE_PASSWORD

#define NM_SETTING_PPPOE_PASSWORD       "password"
@@ -217,7 +226,7 @@ Registers an error quark for

nm_setting_pppoe_get_password_flags ()

-
NMSettingSecretFlags nm_setting_pppoe_get_password_flags
+
NMSettingSecretFlags nm_setting_pppoe_get_password_flags
                                                         (NMSettingPPPOE *setting);
@@ -229,7 +238,7 @@ Registers an error quark for Returns :

- diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html index e3d2b43d..e68a2609 100644 --- a/docs/libnm-util/html/NMSettingSerial.html +++ b/docs/libnm-util/html/NMSettingSerial.html @@ -50,6 +50,7 @@ serial communications

enum NMSettingSerialError; #define NM_SETTING_SERIAL_BAUD #define NM_SETTING_SERIAL_BITS +#define NM_SETTING_SERIAL_ERROR #define NM_SETTING_SERIAL_PARITY #define NM_SETTING_SERIAL_SEND_DELAY #define NM_SETTING_SERIAL_SETTING_NAME @@ -121,10 +122,10 @@ such as mobile broadband or analog telephone connections.

enum NMSettingSerialError

typedef enum {
-	NM_SETTING_SERIAL_ERROR_UNKNOWN = 0,
-	NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY,
-	NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY,
-	NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING
+	NM_SETTING_SERIAL_ERROR_UNKNOWN = 0,        /*< nick=UnknownError >*/
+	NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY,   /*< nick=InvalidProperty >*/
+	NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY,   /*< nick=MissingProperty >*/
+	NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
 } NMSettingSerialError;
the NMSettingSecretFlags pertaining to the "password" +the NMSettingSecretFlags pertaining to the "password"
@@ -173,6 +174,14 @@ setting requires the connection to contain an +

NM_SETTING_SERIAL_ERROR

+
#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
+
+

+

+ +
+

NM_SETTING_SERIAL_PARITY

#define NM_SETTING_SERIAL_PARITY "parity"
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html index 4f397cc3..d686803b 100644 --- a/docs/libnm-util/html/NMSettingVPN.html +++ b/docs/libnm-util/html/NMSettingVPN.html @@ -51,6 +51,7 @@ enum const char *value, gpointer user_data); #define NM_SETTING_VPN_DATA +#define NM_SETTING_VPN_ERROR #define NM_SETTING_VPN_SECRETS #define NM_SETTING_VPN_SERVICE_TYPE #define NM_SETTING_VPN_SETTING_NAME @@ -70,6 +71,8 @@ enum gpointer user_data); const char * nm_setting_vpn_get_data_item (NMSettingVPN *setting, const char *key); +guint32 nm_setting_vpn_get_num_data_items (NMSettingVPN *setting); +guint32 nm_setting_vpn_get_num_secrets (NMSettingVPN *setting); const char * nm_setting_vpn_get_secret (NMSettingVPN *setting, const char *key); const char * nm_setting_vpn_get_service_type (NMSettingVPN *setting); @@ -142,9 +145,9 @@ properties.

enum NMSettingVpnError

typedef enum {
-	NM_SETTING_VPN_ERROR_UNKNOWN = 0,
-	NM_SETTING_VPN_ERROR_INVALID_PROPERTY,
-	NM_SETTING_VPN_ERROR_MISSING_PROPERTY,
+	NM_SETTING_VPN_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_VPN_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_VPN_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
 } NMSettingVpnError;
@@ -205,6 +208,14 @@ required
+

NM_SETTING_VPN_ERROR

+
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
+
+

+

+
+
+

NM_SETTING_VPN_SECRETS

#define NM_SETTING_VPN_SECRETS      "secrets"
@@ -407,6 +418,50 @@ by +

nm_setting_vpn_get_num_data_items ()

+
guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);
+

+Gets number of key/value pairs of VPN configuration data. +

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

setting :

the NMSettingVPN +

Returns :

the number of VPN plugin specific configuration data items
+
+
+
+

nm_setting_vpn_get_num_secrets ()

+
guint32             nm_setting_vpn_get_num_secrets      (NMSettingVPN *setting);
+

+Gets number of VPN plugin specific secrets in the setting. +

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

setting :

the NMSettingVPN +

Returns :

the number of VPN plugin specific secrets
+
+
+

nm_setting_vpn_get_secret ()

const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
                                                          const char *key);
@@ -574,7 +629,14 @@ plugin.

The "user-name" property

  "user-name"                gchar*                : Read / Write
-

If the VPN connection requires a user name for authentication, that name should be provided here. If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty. If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.

+

+If the VPN connection requires a user name for authentication, that name +should be provided here. If the connection is available to more than +one user, and the VPN requires each user to supply a different name, then +leave this property empty. If this property is empty, NetworkManager +will automatically supply the username of the user which requested the +VPN connection. +

Default value: NULL

diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html index abaa48d8..66f68ba9 100644 --- a/docs/libnm-util/html/NMSettingWimax.html +++ b/docs/libnm-util/html/NMSettingWimax.html @@ -47,6 +47,7 @@ NMSettingWimax; NMSettingWimaxClass; enum NMSettingWimaxError; +#define NM_SETTING_WIMAX_ERROR #define NM_SETTING_WIMAX_MAC_ADDRESS #define NM_SETTING_WIMAX_NETWORK_NAME #define NM_SETTING_WIMAX_SETTING_NAME @@ -104,9 +105,9 @@ necessary for connection to 802.16e Mobile WiMAX networks.

enum NMSettingWimaxError

typedef enum {
-	NM_SETTING_WIMAX_ERROR_UNKNOWN = 0,
-	NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY,
-	NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY
+	NM_SETTING_WIMAX_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingWimaxError;
@@ -133,6 +134,14 @@ required
+

NM_SETTING_WIMAX_ERROR

+
#define NM_SETTING_WIMAX_ERROR nm_setting_wimax_error_quark ()
+
+

+

+
+
+

NM_SETTING_WIMAX_MAC_ADDRESS

#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html index f2b70999..d56f053f 100644 --- a/docs/libnm-util/html/NMSettingWired.html +++ b/docs/libnm-util/html/NMSettingWired.html @@ -50,6 +50,7 @@ enum NM_SETTING_WIRED_AUTO_NEGOTIATE #define NM_SETTING_WIRED_CLONED_MAC_ADDRESS #define NM_SETTING_WIRED_DUPLEX +#define NM_SETTING_WIRED_ERROR #define NM_SETTING_WIRED_MAC_ADDRESS #define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST #define NM_SETTING_WIRED_MTU @@ -153,9 +154,9 @@ necessary for connection to Ethernet networks.

enum NMSettingWiredError

typedef enum {
-	NM_SETTING_WIRED_ERROR_UNKNOWN = 0,
-	NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
-	NM_SETTING_WIRED_ERROR_MISSING_PROPERTY
+	NM_SETTING_WIRED_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_WIRED_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingWiredError;
@@ -206,6 +207,14 @@ required
+

NM_SETTING_WIRED_ERROR

+
#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
+
+

+

+
+
+

NM_SETTING_WIRED_MAC_ADDRESS

#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html index a860f226..ab05340e 100644 --- a/docs/libnm-util/html/NMSettingWireless.html +++ b/docs/libnm-util/html/NMSettingWireless.html @@ -51,6 +51,7 @@ enum NM_SETTING_WIRELESS_BSSID #define NM_SETTING_WIRELESS_CHANNEL #define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS +#define NM_SETTING_WIRELESS_ERROR #define NM_SETTING_WIRELESS_MAC_ADDRESS #define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST #define NM_SETTING_WIRELESS_MODE @@ -159,11 +160,11 @@ necessary for connection to 802.11 WiFi networks.

enum NMSettingWirelessError

typedef enum {
-	NM_SETTING_WIRELESS_ERROR_UNKNOWN = 0,
-	NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
-	NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY,
-	NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING,
-	NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND
+	NM_SETTING_WIRELESS_ERROR_UNKNOWN = 0,              /*< nick=UnknownError >*/
+	NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,         /*< nick=InvalidProperty >*/
+	NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY,         /*< nick=MissingProperty >*/
+	NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING, /*< nick=MissingSecuritySetting >*/
+	NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND     /*< nick=ChannelRequiresBand >*/
 } NMSettingWirelessError;
@@ -234,6 +235,14 @@ set to a value that requires the +

NM_SETTING_WIRELESS_ERROR

+
#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
+
+

+

+ +
+

NM_SETTING_WIRELESS_MAC_ADDRESS

#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html index c9b8d399..b9022091 100644 --- a/docs/libnm-util/html/NMSettingWirelessSecurity.html +++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html @@ -42,14 +42,15 @@ use WEP, LEAP, WPA or WPA2/RSN security

Synopsis

-
+
 #include <nm-setting-wireless-security.h>
 
                     NMSettingWirelessSecurity;
                     NMSettingWirelessSecurityClass;
 enum                NMSettingWirelessSecurityError;
-enum                NMWepKeyType;
+enum                NMWepKeyType;
 #define             NM_SETTING_WIRELESS_SECURITY_AUTH_ALG
+#define             NM_SETTING_WIRELESS_SECURITY_ERROR
 #define             NM_SETTING_WIRELESS_SECURITY_GROUP
 #define             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
 #define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
@@ -93,7 +94,7 @@ const char *        NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_leap_password
                                                         (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
+NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
                                                         (NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_leap_username
                                                         (NMSettingWirelessSecurity *setting);
@@ -111,14 +112,14 @@ const char *        guint32 i);
 const char *        nm_setting_wireless_security_get_psk
                                                         (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
+NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
                                                         (NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_wep_key
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 idx);
-NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
+NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
                                                         (NMSettingWirelessSecurity *setting);
-NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
+NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
                                                         (NMSettingWirelessSecurity *setting);
 guint32             nm_setting_wireless_security_get_wep_tx_keyidx
                                                         (NMSettingWirelessSecurity *setting);
@@ -149,6 +150,10 @@ const char *        
+  GEnum
+   +----NMWepKeyType
+

Properties

@@ -223,13 +228,13 @@ of how WiFi security works, you may want to get copies of the following books.

enum NMSettingWirelessSecurityError

typedef enum {
-	NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN = 0,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP
+	NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,       /*< nick=InvalidProperty >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY,       /*< nick=MissingProperty >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING, /*< nick=Missing8021xSetting >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X,   /*< nick=LEAPRequires8021x >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME, /*< nick=LEAPRequiresUsername >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP /*< nick=SharedKeyRequiresWEP >*/
 } NMSettingWirelessSecurityError;
@@ -281,7 +286,7 @@ encryption protocol
-

enum NMWepKeyType

+

enum NMWepKeyType

typedef enum {
 	NM_WEP_KEY_TYPE_UNKNOWN = 0,
 	NM_WEP_KEY_TYPE_KEY = 1,          /* Hex or ASCII */
@@ -291,7 +296,7 @@ encryption protocol
 } NMWepKeyType;

-The NMWepKeyType values specify how any WEP keys present in the setting +The NMWepKeyType values specify how any WEP keys present in the setting are intepreted. There are no standards governing how to hash the various WEP key/passphrase formats into the actual WEP key. Unfortunately some WEP keys can be interpreted in multiple ways, requring the setting to specify how to @@ -343,6 +348,14 @@ the actual WEP key using the MD5 hash algorithm.

+

NM_SETTING_WIRELESS_SECURITY_ERROR

+
#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
+
+

+

+
+
+

NM_SETTING_WIRELESS_SECURITY_GROUP

#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
@@ -735,7 +748,7 @@ list.

nm_setting_wireless_security_get_leap_password_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
+
NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
                                                         (NMSettingWirelessSecurity *setting);
@@ -747,7 +760,7 @@ list. - @@ -914,7 +927,7 @@ list.

nm_setting_wireless_security_get_psk_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
+
NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
                                                         (NMSettingWirelessSecurity *setting);

Returns :

the NMSettingSecretFlags pertaining to the +the NMSettingSecretFlags pertaining to the "leap-password"
@@ -926,7 +939,7 @@ list. - @@ -961,7 +974,7 @@ list.

nm_setting_wireless_security_get_wep_key_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
+
NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
                                                         (NMSettingWirelessSecurity *setting);

Returns :

the NMSettingSecretFlags pertaining to the +the NMSettingSecretFlags pertaining to the "psk"
@@ -973,7 +986,7 @@ list. - +

Returns :

the NMSettingSecretFlags pertaining to the all WEP keysthe NMSettingSecretFlags pertaining to the all WEP keys
@@ -981,7 +994,7 @@ list.

nm_setting_wireless_security_get_wep_key_type ()

-
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
+
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
                                                         (NMSettingWirelessSecurity *setting);

 
@@ -1266,7 +1279,7 @@ Flags indicating how to handle   "wep-key-type"             guint                 : Read / Write / Construct

 Controls the interpretation of WEP keys.  Allowed values are those given
-by NMWepKeyType.  If set to 1 and the keys are hexadecimal, they must be
+by NMWepKeyType.  If set to 1 and the keys are hexadecimal, they must be
 either 10 or 26 characters in length.  If set to 1 and the keys are
 ASCII keys, they must be either 5 or 13 characters in length.  If set to
 2, the passphrase is hashed using the de-facto MD5 method to derive the
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 728129f1..9f287353 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -95,6 +95,10 @@
 
 

+NM_CONNECTION_ERROR, macro in NMConnection
+

+

+

 nm_connection_error_quark, function in NMConnection
 

@@ -123,6 +127,10 @@
 

+nm_connection_get_setting_bond, function in NMConnection
+

+

+

 nm_connection_get_setting_by_name, function in NMConnection
 

@@ -139,6 +147,10 @@
 

+nm_connection_get_setting_infiniband, function in NMConnection
+

+

+

 nm_connection_get_setting_ip4_config, function in NMConnection
 

@@ -159,6 +171,14 @@
 

+nm_connection_get_setting_serial, function in NMConnection
+

+

+

+nm_connection_get_setting_vlan, function in NMConnection
+

+

+

 nm_connection_get_setting_vpn, function in NMConnection
 

@@ -183,6 +203,10 @@
 

+nm_connection_get_virtual_iface_name, function in NMConnection
+

+

+

 nm_connection_is_type, function in NMConnection
 

@@ -481,6 +505,10 @@
 

+NMSetting8021x:pac-file, object property in NMSetting8021x
+

+

+

 NMSetting8021x:password, object property in NMSetting8021x
 

@@ -489,6 +517,14 @@
 

+NMSetting8021x:password-raw, object property in NMSetting8021x
+

+

+

+NMSetting8021x:password-raw-flags, object property in NMSetting8021x
+

+

+

 NMSetting8021x:phase1-fast-provisioning, object property in NMSetting8021x
 

@@ -561,11 +597,11 @@
 

-NMSetting8021xCKFormat, enum in NMSetting8021x
+NMSetting8021xCKFormat, enum in NMSetting8021x
 

-NMSetting8021xCKScheme, enum in NMSetting8021x
+NMSetting8021xCKScheme, enum in NMSetting8021x
 

@@ -601,6 +637,26 @@
 

+NMSettingBond, struct in NMSettingBond
+

+

+

+NMSettingBond:interface-name, object property in NMSettingBond
+

+

+

+NMSettingBond:options, object property in NMSettingBond
+

+

+

+NMSettingBondClass, struct in NMSettingBond
+

+

+

+NMSettingBondError, enum in NMSettingBond
+

+

+

 NMSettingCdma, struct in NMSettingCdma
 

@@ -637,7 +693,7 @@
 

-NMSettingCompareFlags, enum in NMSetting
+NMSettingCompareFlags, enum in NMSetting
 

@@ -653,6 +709,10 @@
 

+NMSettingConnection:master, object property in NMSettingConnection
+

+

+

 NMSettingConnection:permissions, object property in NMSettingConnection
 

@@ -661,6 +721,10 @@
 

+NMSettingConnection:slave-type, object property in NMSettingConnection
+

+

+

 NMSettingConnection:timestamp, object property in NMSettingConnection
 

@@ -673,6 +737,10 @@
 

+NMSettingConnection:zone, object property in NMSettingConnection
+

+

+

 NMSettingConnectionClass, struct in NMSettingConnection
 

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

-NMSettingDiffResult, enum in NMSetting
+NMSettingDiffResult, enum in NMSetting
 

@@ -745,15 +813,39 @@
 

-NMSettingGsmNetworkBand, enum in NMSettingGsm
+NMSettingGsmNetworkBand, enum in NMSettingGsm
+

+

+

+NMSettingGsmNetworkType, enum in NMSettingGsm
+

+

+

+NMSettingHashFlags, enum in NMSetting
+

+

+

+NMSettingInfiniband, struct in NMSettingInfiniband
+

+

+

+NMSettingInfiniband:mac-address, object property in NMSettingInfiniband
 

-NMSettingGsmNetworkType, enum in NMSettingGsm
+NMSettingInfiniband:mtu, object property in NMSettingInfiniband
 

-NMSettingHashFlags, enum in NMSetting
+NMSettingInfiniband:transport-mode, object property in NMSettingInfiniband
+

+

+

+NMSettingInfinibandClass, struct in NMSettingInfiniband
+

+

+

+NMSettingInfinibandError, enum in NMSettingInfiniband
 

@@ -841,6 +933,10 @@
 

+NMSettingIP6Config:ip6-privacy, object property in NMSettingIP6Config
+

+

+

 NMSettingIP6Config:may-fail, object property in NMSettingIP6Config
 

@@ -865,6 +961,10 @@
 

+NMSettingIP6ConfigPrivacy, enum in NMSettingIP6Config
+

+

+

 NMSettingOlpcMesh, struct in NMSettingOlpcMesh
 

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

-NMSettingSecretFlags, enum in NMSetting
+NMSettingSecretFlags, enum in NMSetting
 

@@ -1041,6 +1141,42 @@
 

+NMSettingVlan, struct in NMSettingVlan
+

+

+

+NMSettingVlan:egress-priority-map, object property in NMSettingVlan
+

+

+

+NMSettingVlan:flags, object property in NMSettingVlan
+

+

+

+NMSettingVlan:id, object property in NMSettingVlan
+

+

+

+NMSettingVlan:ingress-priority-map, object property in NMSettingVlan
+

+

+

+NMSettingVlan:interface-name, object property in NMSettingVlan
+

+

+

+NMSettingVlan:parent, object property in NMSettingVlan
+

+

+

+NMSettingVlanClass, struct in NMSettingVlan
+

+

+

+NMSettingVlanError, enum in NMSettingVlan
+

+

+

 NMSettingVPN, struct in NMSettingVPN
 

@@ -1337,6 +1473,10 @@
 

+NM_SETTING_802_1X_ERROR, macro in NMSetting8021x
+

+

+

 nm_setting_802_1x_error_quark, function in NMSetting8021x
 

@@ -1397,6 +1537,10 @@
 

+nm_setting_802_1x_get_pac_file, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_get_password, function in NMSetting8021x
 

@@ -1405,6 +1549,14 @@
 

+nm_setting_802_1x_get_password_raw, function in NMSetting8021x
+

+

+

+nm_setting_802_1x_get_password_raw_flags, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_get_phase1_fast_provisioning, function in NMSetting8021x
 

@@ -1533,6 +1685,10 @@
 

+NM_SETTING_802_1X_PAC_FILE, macro in NMSetting8021x
+

+

+

 NM_SETTING_802_1X_PASSWORD, macro in NMSetting8021x
 

@@ -1541,6 +1697,14 @@
 

+NM_SETTING_802_1X_PASSWORD_RAW, macro in NMSetting8021x
+

+

+

+NM_SETTING_802_1X_PASSWORD_RAW_FLAGS, macro in NMSetting8021x
+

+

+

 NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, macro in NMSetting8021x
 

@@ -1665,6 +1829,10 @@
 

+NM_SETTING_BLUETOOTH_ERROR, macro in NMSettingBluetooth
+

+

+

 nm_setting_bluetooth_error_quark, function in NMSettingBluetooth
 

@@ -1697,6 +1865,90 @@
 

+nm_setting_bond_add_option, function in NMSettingBond
+

+

+

+NM_SETTING_BOND_ERROR, macro in NMSettingBond
+

+

+

+nm_setting_bond_error_quark, function in NMSettingBond
+

+

+

+nm_setting_bond_get_interface_name, function in NMSettingBond
+

+

+

+nm_setting_bond_get_num_options, function in NMSettingBond
+

+

+

+nm_setting_bond_get_option, function in NMSettingBond
+

+

+

+nm_setting_bond_get_option_by_name, function in NMSettingBond
+

+

+

+nm_setting_bond_get_option_default, function in NMSettingBond
+

+

+

+nm_setting_bond_get_valid_options, function in NMSettingBond
+

+

+

+NM_SETTING_BOND_INTERFACE_NAME, macro in NMSettingBond
+

+

+

+nm_setting_bond_new, function in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTIONS, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_ARP_INTERVAL, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_ARP_IP_TARGET, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_DOWNDELAY, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_MIIMON, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_MODE, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_UPDELAY, macro in NMSettingBond
+

+

+

+nm_setting_bond_remove_option, function in NMSettingBond
+

+

+

+NM_SETTING_BOND_SETTING_NAME, macro in NMSettingBond
+

+

+

+NM_SETTING_CDMA_ERROR, macro in NMSettingCdma
+

+

+

 nm_setting_cdma_error_quark, function in NMSettingCdma
 

@@ -1761,6 +2013,10 @@
 

+NM_SETTING_CONNECTION_ERROR, macro in NMSettingConnection
+

+

+

 nm_setting_connection_error_quark, function in NMSettingConnection
 

@@ -1777,6 +2033,10 @@
 

+nm_setting_connection_get_master, function in NMSettingConnection
+

+

+

 nm_setting_connection_get_num_permissions, function in NMSettingConnection
 

@@ -1789,6 +2049,10 @@
 

+nm_setting_connection_get_slave_type, function in NMSettingConnection
+

+

+

 nm_setting_connection_get_timestamp, function in NMSettingConnection
 

@@ -1797,10 +2061,22 @@
 

+nm_setting_connection_get_zone, function in NMSettingConnection
+

+

+

 NM_SETTING_CONNECTION_ID, macro in NMSettingConnection
 

+nm_setting_connection_is_slave_type, function in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_MASTER, macro in NMSettingConnection
+

+

+

 nm_setting_connection_new, function in NMSettingConnection
 

@@ -1825,6 +2101,10 @@
 

+NM_SETTING_CONNECTION_SLAVE_TYPE, macro in NMSettingConnection
+

+

+

 NM_SETTING_CONNECTION_TIMESTAMP, macro in NMSettingConnection
 

@@ -1837,6 +2117,30 @@
 

+NM_SETTING_CONNECTION_ZONE, macro in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_ZONE_BLOCK, macro in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_ZONE_HOME, macro in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_ZONE_PUBLIC, macro in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_ZONE_TRUSTED, macro in NMSettingConnection
+

+

+

+NM_SETTING_CONNECTION_ZONE_WORK, macro in NMSettingConnection
+

+

+

 nm_setting_diff, function in NMSetting
 

@@ -1849,6 +2153,10 @@
 

+NM_SETTING_ERROR, macro in NMSetting
+

+

+

 nm_setting_error_quark, function in NMSetting
 

@@ -1861,6 +2169,10 @@
 

+nm_setting_get_virtual_iface_name, function in NMSetting
+

+

+

 NM_SETTING_GSM_ALLOWED_BANDS, macro in NMSettingGsm
 

@@ -1869,6 +2181,10 @@
 

+NM_SETTING_GSM_ERROR, macro in NMSettingGsm
+

+

+

 nm_setting_gsm_error_quark, function in NMSettingGsm
 

@@ -1961,6 +2277,46 @@
 

+NM_SETTING_INFINIBAND_ERROR, macro in NMSettingInfiniband
+

+

+

+nm_setting_infiniband_error_quark, function in NMSettingInfiniband
+

+

+

+nm_setting_infiniband_get_mac_address, function in NMSettingInfiniband
+

+

+

+nm_setting_infiniband_get_mtu, function in NMSettingInfiniband
+

+

+

+nm_setting_infiniband_get_transport_mode, function in NMSettingInfiniband
+

+

+

+NM_SETTING_INFINIBAND_MAC_ADDRESS, macro in NMSettingInfiniband
+

+

+

+NM_SETTING_INFINIBAND_MTU, macro in NMSettingInfiniband
+

+

+

+nm_setting_infiniband_new, function in NMSettingInfiniband
+

+

+

+NM_SETTING_INFINIBAND_SETTING_NAME, macro in NMSettingInfiniband
+

+

+

+NM_SETTING_INFINIBAND_TRANSPORT_MODE, macro in NMSettingInfiniband
+

+

+

 NM_SETTING_IP4_CONFIG_ADDRESSES, macro in NMSettingIP4Config
 

@@ -2017,6 +2373,10 @@
 

+NM_SETTING_IP4_CONFIG_ERROR, macro in NMSettingIP4Config
+

+

+

 nm_setting_ip4_config_error_quark, function in NMSettingIP4Config
 

@@ -2197,6 +2557,10 @@
 

+NM_SETTING_IP6_CONFIG_ERROR, macro in NMSettingIP6Config
+

+

+

 nm_setting_ip6_config_error_quark, function in NMSettingIP6Config
 

@@ -2221,6 +2585,10 @@
 

+nm_setting_ip6_config_get_ip6_privacy, function in NMSettingIP6Config
+

+

+

 nm_setting_ip6_config_get_may_fail, function in NMSettingIP6Config
 

@@ -2261,6 +2629,10 @@
 

+NM_SETTING_IP6_CONFIG_IP6_PRIVACY, macro in NMSettingIP6Config
+

+

+

 NM_SETTING_IP6_CONFIG_MAY_FAIL, macro in NMSettingIP6Config
 

@@ -2345,6 +2717,10 @@
 

+NM_SETTING_OLPC_MESH_ERROR, macro in NMSettingOlpcMesh
+

+

+

 nm_setting_olpc_mesh_error_quark, function in NMSettingOlpcMesh
 

@@ -2389,6 +2765,10 @@
 

+NM_SETTING_PPPOE_ERROR, macro in NMSettingPPPOE
+

+

+

 nm_setting_pppoe_error_quark, function in NMSettingPPPOE
 

@@ -2441,6 +2821,10 @@
 

+NM_SETTING_PPP_ERROR, macro in NMSettingPPP
+

+

+

 nm_setting_ppp_error_quark, function in NMSettingPPP
 

@@ -2601,6 +2985,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_SERIAL_ERROR, macro in NMSettingSerial
+

+

+

 nm_setting_serial_error_quark, function in NMSettingSerial
 

@@ -2665,6 +3053,86 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+nm_setting_vlan_add_priority, function in NMSettingVlan
+

+

+

+nm_setting_vlan_add_priority_str, function in NMSettingVlan
+

+

+

+nm_setting_vlan_clear_priorities, function in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, macro in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_ERROR, macro in NMSettingVlan
+

+

+

+nm_setting_vlan_error_quark, function in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_FLAGS, macro in NMSettingVlan
+

+

+

+nm_setting_vlan_get_flags, function in NMSettingVlan
+

+

+

+nm_setting_vlan_get_id, function in NMSettingVlan
+

+

+

+nm_setting_vlan_get_interface_name, function in NMSettingVlan
+

+

+

+nm_setting_vlan_get_num_priorities, function in NMSettingVlan
+

+

+

+nm_setting_vlan_get_parent, function in NMSettingVlan
+

+

+

+nm_setting_vlan_get_priority, function in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_ID, macro in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, macro in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_INTERFACE_NAME, macro in NMSettingVlan
+

+

+

+nm_setting_vlan_new, function in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_PARENT, macro in NMSettingVlan
+

+

+

+nm_setting_vlan_remove_priority, function in NMSettingVlan
+

+

+

+NM_SETTING_VLAN_SETTING_NAME, macro in NMSettingVlan
+

+

+

 nm_setting_vpn_add_data_item, function in NMSettingVPN
 

@@ -2677,6 +3145,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_VPN_ERROR, macro in NMSettingVPN
+

+

+

 nm_setting_vpn_error_quark, function in NMSettingVPN
 

@@ -2693,6 +3165,14 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+nm_setting_vpn_get_num_data_items, function in NMSettingVPN
+

+

+

+nm_setting_vpn_get_num_secrets, function in NMSettingVPN
+

+

+

 nm_setting_vpn_get_secret, function in NMSettingVPN
 

@@ -2733,6 +3213,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_WIMAX_ERROR, macro in NMSettingWimax
+

+

+

 nm_setting_wimax_error_quark, function in NMSettingWimax
 

@@ -2777,6 +3261,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_WIRED_ERROR, macro in NMSettingWired
+

+

+

 nm_setting_wired_error_quark, function in NMSettingWired
 

@@ -2901,6 +3389,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_WIRELESS_ERROR, macro in NMSettingWireless
+

+

+

 nm_setting_wireless_error_quark, function in NMSettingWireless
 

@@ -3025,6 +3517,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+NM_SETTING_WIRELESS_SECURITY_ERROR, macro in NMSettingWirelessSecurity
+

+

+

 nm_setting_wireless_security_error_quark, function in NMSettingWirelessSecurity
 

@@ -3202,7 +3698,7 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
U

-NMUtilsSecurityType, enum in nm-utils
+NMUtilsSecurityType, enum in nm-utils
 

@@ -3218,6 +3714,30 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

+nm_utils_hwaddr_atoba, function in nm-utils
+

+

+

+nm_utils_hwaddr_aton, function in nm-utils
+

+

+

+nm_utils_hwaddr_len, function in nm-utils
+

+

+

+NM_UTILS_HWADDR_LEN_MAX, macro in nm-utils
+

+

+

+nm_utils_hwaddr_ntoa, function in nm-utils
+

+

+

+nm_utils_hwaddr_type, function in nm-utils
+

+

+

 nm_utils_init, function in nm-utils
 

@@ -3323,12 +3843,20 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
V

+NMVlanFlags, enum in NMSettingVlan
+

+

+

+NMVlanPriorityMap, enum in NMSettingVlan
+

+

+

 NMVPNIterFunc, user_function in NMSettingVPN
 
W

-NMWepKeyType, enum in NMSettingWirelessSecurity
+NMWepKeyType, enum in NMSettingWirelessSecurity
 

diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index f16de7b0..c23e7223 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -21,7 +21,7 @@
 

 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 

 

-libnm-util API Reference

+libnm-util API Reference
NMConnection — Describes a connection to specific network or provider diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml index d8ff5d80..18260e91 100644 --- a/docs/libnm-util/html/index.sgml +++ b/docs/libnm-util/html/index.sgml @@ -14,6 +14,7 @@ + @@ -30,21 +31,26 @@ + + + + + @@ -64,7 +70,11 @@ + + + + @@ -72,14 +82,14 @@ - + - + @@ -88,16 +98,17 @@ - + - + + @@ -112,6 +123,7 @@ + @@ -135,35 +147,52 @@ + + + + + + + + + + + + + + + + + @@ -180,6 +209,7 @@ + @@ -237,6 +267,7 @@ + @@ -284,6 +315,7 @@ + @@ -298,12 +330,13 @@ - + + @@ -383,6 +416,7 @@ + @@ -410,6 +444,7 @@ + @@ -441,6 +476,7 @@ + @@ -460,6 +496,8 @@ + + @@ -471,7 +509,7 @@ - + @@ -487,7 +525,7 @@ - + @@ -495,6 +533,7 @@ + @@ -543,6 +582,7 @@ + @@ -565,6 +605,7 @@ + @@ -578,18 +619,20 @@ + + - + - + @@ -604,9 +647,13 @@ + + + + @@ -649,8 +696,11 @@ + + + @@ -699,8 +749,11 @@ + + + @@ -743,6 +796,7 @@ + @@ -827,6 +881,7 @@ + @@ -840,11 +895,18 @@ + + + + + + + @@ -894,6 +956,7 @@ + @@ -913,6 +976,7 @@ + @@ -933,6 +997,7 @@ + @@ -1003,6 +1068,7 @@ + @@ -1034,6 +1100,7 @@ + @@ -1044,6 +1111,8 @@ + + @@ -1057,9 +1126,11 @@ + + - + @@ -1069,9 +1140,15 @@ + + + + + + diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html index c9aa3d53..a17c1ece 100644 --- a/docs/libnm-util/html/libnm-util-nm-utils.html +++ b/docs/libnm-util/html/libnm-util-nm-utils.html @@ -24,6 +24,8 @@ Top  |  Description +  |  + Object Hierarchy
@@ -37,14 +39,24 @@

Synopsis

-
+
 #include <nm-utils.h>
 
-enum                NMUtilsSecurityType;
+enum                NMUtilsSecurityType;
+#define             NM_UTILS_HWADDR_LEN_MAX
 void                nm_utils_deinit                     (void);
 const char *        nm_utils_escape_ssid                (const guint8 *ssid,
                                                          guint32 len);
 GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);
+GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
+                                                         int type);
+guint8 *            nm_utils_hwaddr_aton                (const char *asc,
+                                                         int type,
+                                                         gpointer buffer);
+int                 nm_utils_hwaddr_len                 (int type);
+char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
+                                                         int type);
+int                 nm_utils_hwaddr_type                (int len);
 gboolean            nm_utils_init                       (GError **error);
 GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);
 void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
@@ -73,7 +85,7 @@ const char *        gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
                                                          const GByteArray *ssid2,
                                                          gboolean ignore_trailing_null);
-gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
+gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
                                                          NMDeviceWifiCapabilities wifi_caps,
                                                          gboolean have_ap,
                                                          gboolean adhoc,
@@ -96,6 +108,13 @@ const char *        
+
Object Hierarchy

+
+  GEnum
+   +----NMUtilsSecurityType
+

+
+

Description

A collection of utility functions for working SSIDs, IP addresses, WiFi @@ -105,7 +124,7 @@ access points and devices, among other things.

Details

-

enum NMUtilsSecurityType

+

enum NMUtilsSecurityType

typedef enum {
 	NMU_SEC_INVALID = 0,
 	NMU_SEC_NONE,
@@ -178,6 +197,17 @@ generating the dynamic WEP keys automatically
+

NM_UTILS_HWADDR_LEN_MAX

+
#define NM_UTILS_HWADDR_LEN_MAX 20 /* INFINIBAND_ALEN */
+
+

+The maximum length of a hardware address of a type known by +nm_utils_hwaddr_len() or nm_utils_hwaddr_aton(). This can be used +as the size of the buffer passed to nm_utils_hwaddr_aton(). +

+
+
+

nm_utils_deinit ()

void                nm_utils_deinit                     (void);

@@ -243,6 +273,144 @@ returned hash with +

nm_utils_hwaddr_atoba ()

+
GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
+                                                         int type);
+

+Parses asc and converts it to binary form in a GByteArray. See +nm_utils_hwaddr_aton() if you don't want a GByteArray. +

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

asc :

the ASCII representation of a hardware address

type :

the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND +

Returns :

a new GByteArray, or NULL if asc couldn't +be parsed. [transfer full] +
+
+
+
+

nm_utils_hwaddr_aton ()

+
guint8 *            nm_utils_hwaddr_aton                (const char *asc,
+                                                         int type,
+                                                         gpointer buffer);
+

+Parses asc and converts it to binary form in buffer. See +nm_utils_hwaddr_atoba() if you'd rather have the result in a +GByteArray. +

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

asc :

the ASCII representation of a hardware address

type :

the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND +

buffer :

buffer to store the result into

Returns :

 +buffer, or NULL if asc couldn't be parsed
+
+
+
+

nm_utils_hwaddr_len ()

+
int                 nm_utils_hwaddr_len                 (int type);
+

+Returns the length in octets of a hardware address of type type. +

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

type :

the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND +

Returns :

the length
+
+
+
+

nm_utils_hwaddr_ntoa ()

+
char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
+                                                         int type);
+

+Converts addr to textual form. +

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

addr :

a binary hardware address

type :

the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND +

Returns :

the textual form of addr. [transfer full] +
+
+
+
+

nm_utils_hwaddr_type ()

+
int                 nm_utils_hwaddr_type                (int len);
+

+Returns the type (either ARPHRD_ETHER or ARPHRD_INFINIBAND) of the raw +address given its length. +

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

len :

the length of hardware address in bytes

Returns :

the type, either ARPHRD_ETHER or ARPHRD_INFINIBAND, or -1 if +the address length was not recognized
+
+
+

nm_utils_init ()

gboolean            nm_utils_init                       (GError **error);

@@ -673,7 +841,7 @@ NULLs, even though that is functionally pointless.

nm_utils_security_valid ()

-
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
+
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
                                                          NMDeviceWifiCapabilities wifi_caps,
                                                          gboolean have_ap,
                                                          gboolean adhoc,
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 021b34e1..993a29d7 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -31,6 +31,7 @@
     
     
     
+    
     
     
     
@@ -47,21 +48,26 @@
     
     
     
+    
     
     
     
     
+    
     
     
     
     
     
+    
+    
     
     
     
     
     
     
+    
     
     
     
@@ -80,12 +86,13 @@
     
     
     
-    
-    
+    
+    
     
-    
-    
+    
+    
     
+    
     
     
     
@@ -100,6 +107,7 @@
     
     
     
+    
     
     
     
@@ -112,39 +120,56 @@
     
     
     
+    
     
+    
     
     
     
+    
     
     
     
+    
+    
+    
+    
+    
+    
     
     
     
     
     
+    
     
     
     
+    
     
     
+    
+    
     
     
     
     
     
+    
     
     
+    
     
     
     
+    
     
     
     
     
     
     
+    
     
     
     
@@ -189,6 +214,7 @@
     
     
     
+    
     
     
     
@@ -235,8 +261,9 @@
     
     
     
-    
+    
     
+    
     
     
     
@@ -304,6 +331,7 @@
     
     
     
+    
     
     
     
@@ -319,6 +347,7 @@
     
     
     
+    
     
     
     
@@ -338,6 +367,7 @@
     
     
     
+    
     
     
     
@@ -356,10 +386,11 @@
     
     
     
-    
-    
+    
+    
     
     
+    
     
     
     
@@ -397,6 +428,7 @@
     
     
     
+    
     
     
     
@@ -411,6 +443,7 @@
     
     
     
+    
     
     
     
@@ -422,8 +455,8 @@
     
     
     
-    
-    
+    
+    
     
     
     
@@ -432,9 +465,13 @@
     
     
     
+    
     
+    
     
     
+    
+    
     
     
     
@@ -477,8 +514,11 @@
     
     
     
+    
     
     
+    
+    
     
     
     
@@ -526,8 +566,11 @@
     
     
     
+    
     
     
+    
+    
     
     
     
@@ -557,6 +600,7 @@
     
     
     
+    
     
     
     
@@ -640,11 +684,14 @@
     
     
     
+    
     
     
     
+    
     
     
+    
     
     
     
@@ -694,6 +741,7 @@
     
     
     
+    
     
     
     
@@ -712,6 +760,7 @@
     
     
     
+    
     
     
     
@@ -721,6 +770,7 @@
     
     
     
+    
     
     
     
@@ -779,6 +829,7 @@
     
     
     
+    
     
     
     
@@ -799,6 +850,7 @@
     
     
     
+    
     
     
     
@@ -809,6 +861,8 @@
     
     
     
+    
+    
     
     
     
@@ -819,10 +873,16 @@
     
     
     
-    
+    
+    
     
     
     
+    
+    
+    
+    
+    
     
     
     
@@ -877,6 +937,7 @@
     
     
     
+    
     
     
     
@@ -953,6 +1014,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index e0e26418..8670ba6c 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -28,15 +28,18 @@
         NMSetting
             NMSetting8021x
             NMSettingBluetooth
+            NMSettingBond
             NMSettingCdma
             NMSettingConnection
             NMSettingGsm
+            NMSettingInfiniband
             NMSettingIP4Config
             NMSettingIP6Config
             NMSettingOlpcMesh
             NMSettingPPP
             NMSettingPPPOE
             NMSettingSerial
+            NMSettingVlan
             NMSettingVPN
             NMSettingWimax
             NMSettingWired
@@ -44,23 +47,39 @@
             NMSettingWirelessSecurity
     GEnum
         NMConnectionError
+        NMSetting8021xCKFormat
+        NMSetting8021xCKScheme
         NMSetting8021xError
         NMSettingBluetoothError
+        NMSettingBondError
         NMSettingCdmaError
+        NMSettingCompareFlags
         NMSettingConnectionError
+        NMSettingDiffResult
         NMSettingError
         NMSettingGsmError
+        NMSettingGsmNetworkBand
+        NMSettingGsmNetworkType
+        NMSettingHashFlags
+        NMSettingInfinibandError
         NMSettingIP4ConfigError
         NMSettingIP6ConfigError
+        NMSettingIP6ConfigPrivacy
         NMSettingOlpcMeshError
         NMSettingPPPError
         NMSettingPPPOEError
+        NMSettingSecretFlags
         NMSettingSerialError
+        NMSettingVlanError
         NMSettingVpnError
         NMSettingWimaxError
         NMSettingWiredError
         NMSettingWirelessError
         NMSettingWirelessSecurityError
+        NMUtilsSecurityType
+        NMVlanFlags
+        NMVlanPriorityMap
+        NMWepKeyType
     GBoxed
         NMIP4Address
         NMIP4Route
-- 
cgit 1.3.0-6-gf8a5