From 2c032d8f1c6292c1338a615e6ec40252889ba85c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 22 Jan 2015 00:29:39 +0100 Subject: Imported Upstream version 1.0.0 --- docs/libnm-util/html/NMConnection.html | 116 +- docs/libnm-util/html/NMSetting.html | 42 +- docs/libnm-util/html/NMSetting8021x.html | 32 +- docs/libnm-util/html/NMSettingBluetooth.html | 3 +- docs/libnm-util/html/NMSettingBond.html | 9 + docs/libnm-util/html/NMSettingConnection.html | 3 + docs/libnm-util/html/NMSettingIP4Config.html | 68 +- docs/libnm-util/html/NMSettingIP6Config.html | 59 + docs/libnm-util/html/NMSettingVPN.html | 44 + docs/libnm-util/html/NMSettingWireless.html | 22 +- docs/libnm-util/html/annotation-glossary.html | 5 + docs/libnm-util/html/api-index-full.html | 544 ++++++- docs/libnm-util/html/ch01.html | 6 + docs/libnm-util/html/index.html | 8 +- docs/libnm-util/html/index.sgml | 322 +++- .../libnm-util/html/libnm-util-NetworkManager.html | 1635 ++++++++++++++++++++ .../html/libnm-util-NetworkManagerVPN.html | 861 +++++++++++ docs/libnm-util/html/libnm-util-nm-utils.html | 205 ++- docs/libnm-util/html/libnm-util.devhelp2 | 315 +++- docs/libnm-util/html/object-tree.html | 4 +- 20 files changed, 4192 insertions(+), 111 deletions(-) create mode 100644 docs/libnm-util/html/libnm-util-NetworkManager.html create mode 100644 docs/libnm-util/html/libnm-util-NetworkManagerVPN.html (limited to 'docs/libnm-util/html') diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html index ef0d76b9..5b41012d 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -51,6 +51,7 @@ #define NM_CONNECTION_CHANGED #define NM_CONNECTION_PATH enum NMConnectionError; +#define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD #define NM_CONNECTION_ERROR GQuark nm_connection_error_quark (void); NMConnection; @@ -84,6 +85,10 @@ enum GHashTable **out_settings); gboolean nm_connection_verify (NMConnection *connection, GError **error); +gboolean nm_connection_normalize (NMConnection *connection, + GHashTable *parameters, + gboolean *modified, + GError **error); const char * nm_connection_need_secrets (NMConnection *connection, GPtrArray **hints); void nm_connection_clear_secrets (NMConnection *connection); @@ -100,6 +105,7 @@ const char * char * nm_connection_get_path (NMConnection *connection); const char * nm_connection_get_virtual_iface_name (NMConnection *connection); +const char * nm_connection_get_interface_name (NMConnection *connection); gboolean nm_connection_is_type (NMConnection *connection, const char *type); void nm_connection_for_each_setting_value @@ -235,7 +241,8 @@ parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters 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 >*/ + NM_CONNECTION_ERROR_SETTING_NOT_FOUND, /*< nick=SettingNotFound >*/ + NM_CONNECTION_ERROR_INVALID_SETTING, /*< nick=InvalidSetting >*/ } NMConnectionError;

@@ -273,11 +280,25 @@ Describes errors that may result from operations involving a NMSetting object + +

NM_CONNECTION_ERROR_INVALID_SETTING

+the NMConnection object contains + a conflicting setting object + +
+

NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD

+
#define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD "ip6-config-method"
+
+

+

+
+
+

NM_CONNECTION_ERROR

#define NM_CONNECTION_ERROR nm_connection_error_quark ()
 
@@ -727,7 +748,7 @@ Validates the connection and all its settings. Each setting's properties have allowed values, and some values are dependent on other values. For example, if a Wi-Fi connection is security enabled, the NMSettingWireless setting object's 'security' property must contain the setting name of the -NMSettingWirelessSecurity object, which must also be present in the +NMSettingWirelessSecurity object, which must also be present in the connection for the connection to be valid. As another example, the NMSettingWired object's 'mac-address' property must be a validly formatted MAC address. The returned GError contains information about which @@ -758,6 +779,62 @@ setting and which property failed validation, and how it failed validation.

+

nm_connection_normalize ()

+
gboolean            nm_connection_normalize             (NMConnection *connection,
+                                                         GHashTable *parameters,
+                                                         gboolean *modified,
+                                                         GError **error);
+

+Does some basic normalization and fixup of well known inconsistencies +and deprecated fields. If the connection was modified in any way, +the output parameter modified is set TRUE. +

+

+Finally the connection will be verified and TRUE returns if the connection +is valid. As this function only performs some specific normalization steps +it cannot repair all connections. If the connection has errors that +cannot be normalized, the connection will not be modified. +

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

connection :

the NMConnection to normalize

parameters :

a GHashTable with +normalization parameters to allow customization of the normalization by providing +specific arguments. Unknown arguments will be ignored and the default will be +used. The keys must be strings, hashed by g_str_hash() and g_str_equal() functions. +The values are opaque and depend on the parameter name. [allow-none][element-type utf8 gpointer] +

modified :

outputs whether any settings were modified. [out][allow-none] +

error :

location to store error, or NULL. Contains the reason, +why the connection is invalid, if the function returns an error.

Returns :

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

Since 1.0

+
+
+

nm_connection_need_secrets ()

const char *        nm_connection_need_secrets          (NMConnection *connection,
                                                          GPtrArray **hints);
@@ -988,6 +1065,39 @@ connection types, this function will return +

nm_connection_get_interface_name ()

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

+Returns the interface name as stored in NMSettingConnection:interface_name. +If the connection contains no NMSettingConnection, it will return NULL. +

+

+For hardware devices and software devices created outside of NetworkManager, +this name is used to match the device. for software devices created by +NetworkManager, this is the name of the created interface. +

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

connection :

The NMConnection +

Returns :

Name of the kernel interface or NULL +
+

Since 1.0

+
+
+

nm_connection_is_type ()

gboolean            nm_connection_is_type               (NMConnection *connection,
                                                          const char *type);
@@ -1247,7 +1357,7 @@ A shortcut to return the type from the connection's char * nm_connection_get_virtual_device_description (NMConnection *connection);

-Returns the name that nm_device_disambiguate_names() would +Returns the name that nm_device_disambiguate_names() would return for the virtual device that would be created for connection. Eg, "VLAN (eth1.1)".

diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html index d6e1af38..259433e6 100644 --- a/docs/libnm-util/html/NMSetting.html +++ b/docs/libnm-util/html/NMSetting.html @@ -352,7 +352,9 @@ secret is not required NM_SETTING_COMPARE_FLAG_IGNORE_ID = 0x00000002, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS = 0x00000004, NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS = 0x00000008, - NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS = 0x00000010 + NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS = 0x00000010, + NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT = 0x00000020, + NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT = 0x00000040, /* 0x80000000 is used for a private flag */ } NMSettingCompareFlags; @@ -403,6 +405,28 @@ the secret's flags indicate the secret should not be saved to persistent storage (ie, the secret's flag includes NM_SETTING_SECRET_FLAG_NOT_SAVED) + +

NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT

+if this flag is set, +nm_setting_diff() and nm_connection_diff() will also include properties that +are set to their default value. See also NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT. + + + +

NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT

+if this flag is set, +nm_setting_diff() and nm_connection_diff() will not include properties that +are set to their default value. This is the opposite of +NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT. If both flags are set together, +NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT wins. If both flags are unset, +this means to exclude default properties if there is a setting to compare, +but include all properties, if the setting 'b' is missing. This is the legacy +behaviour of libnm-util, where nm_setting_diff() behaved differently depending +on whether the setting 'b' was available. If NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT +is set, nm_setting_diff() will also set the flags NM_SETTING_DIFF_RESULT_IN_A_DEFAULT +and NM_SETTING_DIFF_RESULT_IN_B_DEFAULT, if the values are default values. + +
@@ -461,7 +485,7 @@ It should only be accessed through the functions described below. GObjectClass parent; /* Virtual functions */ - gboolean (*verify) (NMSetting *setting, + gint (*verify) (NMSetting *setting, GSList *all_settings, GError **error); @@ -793,6 +817,8 @@ for a description of each flag's behavior. NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000, NM_SETTING_DIFF_RESULT_IN_A = 0x00000001, NM_SETTING_DIFF_RESULT_IN_B = 0x00000002, + NM_SETTING_DIFF_RESULT_IN_A_DEFAULT = 0x00000004, + NM_SETTING_DIFF_RESULT_IN_B_DEFAULT = 0x00000004, } NMSettingDiffResult;

@@ -819,6 +845,18 @@ These values indicate the result of a setting difference operation. the property is present in setting B + +

NM_SETTING_DIFF_RESULT_IN_A_DEFAULT

+the property is present in +setting A but is set to the default value. This flag is only set, +if you specify NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT. + + + +

NM_SETTING_DIFF_RESULT_IN_B_DEFAULT

+analog to NM_SETTING_DIFF_RESULT_IN_A_DEFAULT. + + diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html index a0bd18de..10ee02e0 100644 --- a/docs/libnm-util/html/NMSetting8021x.html +++ b/docs/libnm-util/html/NMSetting8021x.html @@ -369,7 +369,7 @@ or DER private key

NM_SETTING_802_1X_CK_FORMAT_PKCS12

-file contains a PKCS12 certificate +file contains a PKCS#12 certificate and private key @@ -1587,7 +1587,7 @@ authentication method.

cert_path :

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

cert_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client -certificate file (PEM, DER, or PKCS12 format). The path must be UTF-8 +certificate file (PEM, DER, or PKCS#12 format). The path must be UTF-8 encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with any scheme clears the "phase2" client certificate. @@ -2511,7 +2511,7 @@ key password to prevent unauthorized access to unencrypted private key data.

key_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file -(PEM, DER, or PKCS12 format). The path must be UTF-8 encoded; use +(PEM, DER, or PKCS#12 format). The path must be UTF-8 encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with any scheme clears the private key. @@ -2757,7 +2757,7 @@ key password to prevent unauthorized access to unencrypted private key data.

key_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private -key file (PEM, DER, or PKCS12 format). The path must be UTF-8 encoded; +key file (PEM, DER, or PKCS#12 format). The path must be UTF-8 encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with any scheme clears the private key. @@ -3165,15 +3165,15 @@ and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending -with a terminating NUL byte. When using PKCS12 format private keys and -the blob scheme, this property should be set to the PKCS12 data and the +with a terminating NUL byte. When using PKCS#12 format private keys and +the blob scheme, this property should be set to the PKCS#12 data and the "phase2-private-key-password" property must be set to -password used to decrypt the PKCS12 certificate and key. When using -PKCS12 files and the path scheme, this property should be set to the +password used to decrypt the PKCS#12 certificate and key. When using +PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "phase2-private-key-password" property must be set to -the password used to decode the PKCS12 private key and certificate. +the password used to decode the PKCS#12 private key and certificate.

Setting this property directly is discouraged; use the @@ -3187,7 +3187,7 @@ Setting this property directly is discouraged; use the

The password used to decrypt the "phase 2" private key specified in the "phase2-private-key" property when the private key either -uses the path scheme, or is a PKCS12 format key. Setting this property +uses the path scheme, or is a PKCS#12 format key. Setting this property directly is not generally necessary except when returning secrets to NetworkManager; it is generally set automatically when setting the private key by the nm_setting_802_1x_set_phase2_private_key() function. @@ -3250,15 +3250,15 @@ and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and ending -with a terminating NUL byte. When using PKCS12 format private keys and -the blob scheme, this property should be set to the PKCS12 data and the +with a terminating NUL byte. When using PKCS#12 format private keys and +the blob scheme, this property should be set to the PKCS#12 data and the "private-key-password" property must be set to password -used to decrypt the PKCS12 certificate and key. When using PKCS12 files +used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string "file://" and and ending with a terminating NUL byte, and as with the blob scheme the "private-key-password" property must be set to the password used to -decode the PKCS12 private key and certificate. +decode the PKCS#12 private key and certificate.

Setting this property directly is discouraged; use the @@ -3279,7 +3279,7 @@ private key data.

The password used to decrypt the private key specified in the "private-key" property when the private key either uses the -path scheme, or if the private key is a PKCS12 format key. Setting this +path scheme, or if the private key is a PKCS#12 format key. Setting this property directly is not generally necessary except when returning secrets to NetworkManager; it is generally set automatically when setting the private key by the nm_setting_802_1x_set_private_key() function. diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html index d627ed93..622a3c2c 100644 --- a/docs/libnm-util/html/NMSettingBluetooth.html +++ b/docs/libnm-util/html/NMSettingBluetooth.html @@ -291,7 +291,8 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).

Returns :

-the type, either NM_SETTING_BLUETOOTH_PANU or NM_SETTING_BLUETOOTH_DUN +the type, either NM_SETTING_BLUETOOTH_TYPE_PANU or +NM_SETTING_BLUETOOTH_TYPE_DUN diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html index ac130dde..efe99e63 100644 --- a/docs/libnm-util/html/NMSettingBond.html +++ b/docs/libnm-util/html/NMSettingBond.html @@ -64,6 +64,7 @@ enum NM_SETTING_BOND_OPTION_AD_SELECT #define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY #define NM_SETTING_BOND_OPTION_RESEND_IGMP +#define NM_SETTING_BOND_OPTION_LACP_RATE NMSettingBond; NMSettingBondClass; NMSetting * nm_setting_bond_new (void); @@ -324,6 +325,14 @@ Registers an error quark for +

NM_SETTING_BOND_OPTION_LACP_RATE

+
#define NM_SETTING_BOND_OPTION_LACP_RATE        "lacp_rate"
+
+

+

+ +
+

NMSettingBond

typedef struct _NMSettingBond NMSettingBond;

diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html index 7bf190c2..508a3b8f 100644 --- a/docs/libnm-util/html/NMSettingConnection.html +++ b/docs/libnm-util/html/NMSettingConnection.html @@ -1131,6 +1131,9 @@ set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings).

+For software devices this specifies the name of the created device. +

+

For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html index e44b6d49..20a04ac1 100644 --- a/docs/libnm-util/html/NMSettingIP4Config.html +++ b/docs/libnm-util/html/NMSettingIP4Config.html @@ -53,6 +53,7 @@ enum NM_SETTING_IP4_CONFIG_DNS_SEARCH #define NM_SETTING_IP4_CONFIG_ADDRESSES #define NM_SETTING_IP4_CONFIG_ROUTES +#define NM_SETTING_IP4_CONFIG_ROUTE_METRIC #define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES #define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS #define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID @@ -157,6 +158,8 @@ const char * NMSettingIP4Config *setting, NMIP4Route *route); void nm_setting_ip4_config_clear_routes (NMSettingIP4Config *setting); +gint64 nm_setting_ip4_config_get_route_metric + (NMSettingIP4Config *setting); gboolean nm_setting_ip4_config_get_ignore_auto_routes (NMSettingIP4Config *setting); gboolean nm_setting_ip4_config_get_ignore_auto_dns @@ -195,7 +198,6 @@ const char *

Properties

-  "address-labels"           GSList_gchararray_*   : Read / Write
   "addresses"                GPtrArray_GArray_guint__*  : Read / Write
   "dhcp-client-id"           gchar*                : Read / Write
   "dhcp-hostname"            gchar*                : Read / Write
@@ -207,6 +209,7 @@ const char *        may-fail"                 gboolean              : Read / Write / Construct
   "method"                   gchar*                : Read / Write
   "never-default"            gboolean              : Read / Write / Construct
+  "route-metric"             gint64                : Read / Write / Construct
   "routes"                   GPtrArray_GArray_guint__*  : Read / Write
 
@@ -335,6 +338,14 @@ Registers an error quark for
+

NM_SETTING_IP4_CONFIG_ROUTE_METRIC

+
#define NM_SETTING_IP4_CONFIG_ROUTE_METRIC       "route-metric"
+
+

+

+
+
+

NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES

#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 
@@ -1765,6 +1776,35 @@ Removes all configured routes.

+

nm_setting_ip4_config_get_route_metric ()

+
gint64              nm_setting_ip4_config_get_route_metric
+                                                        (NMSettingIP4Config *setting);
+

+Returns the value contained in the "route-metric" +property. +

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

setting :

the NMSettingIP4Config +

Returns :

the route metric that is used for IPv4 routes that don't explicitly +specify a metric. See "route-metric" for more details.
+

Since 1.0

+
+
+

nm_setting_ip4_config_get_ignore_auto_routes ()

gboolean            nm_setting_ip4_config_get_ignore_auto_routes
                                                         (NMSettingIP4Config *setting);
@@ -1967,14 +2007,6 @@ for the connection to succeed.

Property Details

-

The "address-labels" property

-
  "address-labels"           GSList_gchararray_*   : Read / Write
-

-Internal use only. -

-
-
-

The "addresses" property

  "addresses"                GPtrArray_GArray_guint__*  : Read / Write

@@ -2116,6 +2148,24 @@ meaning it will never be assigned the default route by NetworkManager.


+

The "route-metric" property

+
  "route-metric"             gint64                : Read / Write / Construct
+

+The default metric for routes that don't explicitly specify a metric. +The default value -1 means that the metric is choosen automatically +based on the device type. +The metric applies to dynamic routes, manual (static) routes that +don't have an explicit metric setting, address prefix routes, and +the default route. +As the linux kernel accepts zero (0) as a valid metric, zero is +a valid value. +

+

Allowed values: [-1,4294967295]

+

Default value: -1

+

Since 1.0

+
+
+

The "routes" property

  "routes"                   GPtrArray_GArray_guint__*  : Read / Write

diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html index 71ac6e05..b785114d 100644 --- a/docs/libnm-util/html/NMSettingIP6Config.html +++ b/docs/libnm-util/html/NMSettingIP6Config.html @@ -53,6 +53,7 @@ enum NM_SETTING_IP6_CONFIG_DNS_SEARCH #define NM_SETTING_IP6_CONFIG_ADDRESSES #define NM_SETTING_IP6_CONFIG_ROUTES +#define NM_SETTING_IP6_CONFIG_ROUTE_METRIC #define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES #define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS #define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT @@ -160,6 +161,8 @@ const char * void nm_setting_ip6_config_clear_routes (NMSettingIP6Config *setting); gboolean nm_setting_ip6_config_get_ignore_auto_routes (NMSettingIP6Config *setting); +gint64 nm_setting_ip6_config_get_route_metric + (NMSettingIP6Config *setting); gboolean nm_setting_ip6_config_get_ignore_auto_dns (NMSettingIP6Config *setting); const char * nm_setting_ip6_config_get_dhcp_hostname @@ -208,6 +211,7 @@ const char * may-fail" gboolean : Read / Write / Construct "method" gchar* : Read / Write "never-default" gboolean : Read / Write / Construct + "route-metric" gint64 : Read / Write / Construct "routes" GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__* : Read / Write

@@ -336,6 +340,14 @@ Registers an error quark for
+

NM_SETTING_IP6_CONFIG_ROUTE_METRIC

+
#define NM_SETTING_IP6_CONFIG_ROUTE_METRIC       "route-metric"
+
+

+

+
+
+

NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES

#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 
@@ -1845,6 +1857,35 @@ ignored.

+

nm_setting_ip6_config_get_route_metric ()

+
gint64              nm_setting_ip6_config_get_route_metric
+                                                        (NMSettingIP6Config *setting);
+

+Returns the value contained in the "route-metric" +property. +

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

setting :

the NMSettingIP6Config +

Returns :

the route metric that is used for IPv6 routes that don't explicitly +specify a metric. See "route-metric" for more details.
+

Since 1.0

+
+
+

nm_setting_ip6_config_get_ignore_auto_dns ()

gboolean            nm_setting_ip6_config_get_ignore_auto_dns
                                                         (NMSettingIP6Config *setting);
@@ -2125,6 +2166,24 @@ NetworkManager.

+

The "route-metric" property

+
  "route-metric"             gint64                : Read / Write / Construct
+

+The default metric for routes that don't explicitly specify a metric. +The default value -1 means that the metric is choosen automatically +based on the device type. +The metric applies to dynamic routes, manual (static) routes that +don't have an explicit metric setting, address prefix routes, and +the default route. +As the linux kernel replaces zero (0) by 1024 (user-default), setting +this property to 0 means effectively setting it to 1024. +

+

Allowed values: [-1,4294967295]

+

Default value: -1

+

Since 1.0

+
+
+

The "routes" property

  "routes"                   GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*  : Read / Write

diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html index 646871a0..97cc809f 100644 --- a/docs/libnm-util/html/NMSettingVPN.html +++ b/docs/libnm-util/html/NMSettingVPN.html @@ -50,6 +50,7 @@ enum GQuark nm_setting_vpn_error_quark (void); #define NM_SETTING_VPN_SERVICE_TYPE #define NM_SETTING_VPN_USER_NAME +#define NM_SETTING_VPN_PERSISTENT #define NM_SETTING_VPN_DATA #define NM_SETTING_VPN_SECRETS NMSettingVPN; @@ -60,6 +61,7 @@ enum NMSetting * nm_setting_vpn_new (void); const char * nm_setting_vpn_get_service_type (NMSettingVPN *setting); const char * nm_setting_vpn_get_user_name (NMSettingVPN *setting); +gboolean nm_setting_vpn_get_persistent (NMSettingVPN *setting); guint32 nm_setting_vpn_get_num_data_items (NMSettingVPN *setting); void nm_setting_vpn_add_data_item (NMSettingVPN *setting, const char *key, @@ -100,6 +102,7 @@ const char *

Properties

   "data"                     GHashTable_gchararray+gchararray_*  : Read / Write
+  "persistent"               gboolean              : Read / Write
   "secrets"                  GHashTable_gchararray+gchararray_*  : Read / Write
   "service-type"             gchar*                : Read / Write
   "user-name"                gchar*                : Read / Write
@@ -204,6 +207,14 @@ Registers an error quark for 
+

NM_SETTING_VPN_PERSISTENT

+
#define NM_SETTING_VPN_PERSISTENT   "persistent"
+
+

+

+
+
+

NM_SETTING_VPN_DATA

#define NM_SETTING_VPN_DATA         "data"
 
@@ -339,6 +350,28 @@ plugin that should be used to connect to this VPN.

+

nm_setting_vpn_get_persistent ()

+
gboolean            nm_setting_vpn_get_persistent       (NMSettingVPN *setting);
+
++++ + + + + + + + + + + +

setting :

the NMSettingVPN +

Returns :

the "persistent" property of the setting
+
+
+

nm_setting_vpn_get_num_data_items ()

guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);

@@ -667,6 +700,17 @@ values must be strings.


+

The "persistent" property

+
  "persistent"               gboolean              : Read / Write
+

+If the VPN service supports persistence, and this property is TRUE, +the VPN will attempt to stay connected across link changes and outages, +until explicitly disconnected. +

+

Default value: FALSE

+
+
+

The "secrets" property

  "secrets"                  GHashTable_gchararray+gchararray_*  : Read / Write

diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html index 803beb00..4d97a075 100644 --- a/docs/libnm-util/html/NMSettingWireless.html +++ b/docs/libnm-util/html/NMSettingWireless.html @@ -107,10 +107,10 @@ const char * gboolean nm_setting_wireless_ap_security_compatible (NMSettingWireless *s_wireless, NMSettingWirelessSecurity *s_wireless_sec, - NM80211ApFlags ap_flags, - NM80211ApSecurityFlags ap_wpa, - NM80211ApSecurityFlags ap_rsn, - NM80211Mode ap_mode); + NM80211ApFlags ap_flags, + NM80211ApSecurityFlags ap_wpa, + NM80211ApSecurityFlags ap_rsn, + NM80211Mode ap_mode); const char * nm_setting_wireless_get_security (NMSettingWireless *setting);

@@ -950,10 +950,10 @@ not be preserved.
gboolean            nm_setting_wireless_ap_security_compatible
                                                         (NMSettingWireless *s_wireless,
                                                          NMSettingWirelessSecurity *s_wireless_sec,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn,
-                                                         NM80211Mode ap_mode);
+ NM80211ApFlags ap_flags, + NM80211ApSecurityFlags ap_wpa, + NM80211ApSecurityFlags ap_rsn, + NM80211Mode ap_mode);

Given a NMSettingWireless and an optional NMSettingWirelessSecurity, determine if the configuration given by the settings is compatible with @@ -980,16 +980,16 @@ compatible with which access points.

ap_flags :

-the NM80211ApFlags of the given access point +the NM80211ApFlags of the given access point

ap_wpa :

-the NM80211ApSecurityFlags of the given access point's WPA +the NM80211ApSecurityFlags of the given access point's WPA capabilities

ap_rsn :

-the NM80211ApSecurityFlags of the given access point's WPA2/RSN +the NM80211ApSecurityFlags of the given access point's WPA2/RSN capabilities diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html index 3fd30723..1c488594 100644 --- a/docs/libnm-util/html/annotation-glossary.html +++ b/docs/libnm-util/html/annotation-glossary.html @@ -22,6 +22,8 @@ A  |  + C +  |  E  |  I @@ -41,6 +43,9 @@

NULL is ok, both for passing and for returning.

array

Parameter points to an array of items.

+

C

+
closure
+

This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.

E

element-type

Generics and defining elements of containers and arrays.

diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html index 87f9e302..c9819416 100644 --- a/docs/libnm-util/html/api-index-full.html +++ b/docs/libnm-util/html/api-index-full.html @@ -21,7 +21,15 @@ Next -C +8 +  |  + A +  |  + B +  |  + C +  |  + D  |  I  |  @@ -37,7 +45,30 @@

API Index

-

C

+

8

+
+NM80211ApFlags, enum in NetworkManager +
+
+
+NM80211ApSecurityFlags, enum in NetworkManager +
+
+
+NM80211Mode, enum in NetworkManager +
+
+

A

+
+NMActiveConnectionState, enum in NetworkManager +
+
+

B

+
+NMBluetoothCapabilities, enum in NetworkManager +
+
+

C

NMConnection, struct in NMConnection
@@ -123,6 +154,10 @@
+nm_connection_get_interface_name, function in NMConnection +
+
+
nm_connection_get_path, function in NMConnection
@@ -275,6 +310,14 @@
+nm_connection_normalize, function in NMConnection +
+
+
+NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD, macro in NMConnection +
+
+
NM_CONNECTION_PATH, macro in NMConnection
@@ -314,6 +357,287 @@ nm_connection_verify, function in NMConnection
+
+NMConnectivityState, enum in NetworkManager +
+
+

D

+
+NM_DBUS_IFACE_SETTINGS, macro in NetworkManager +
+
+
+NM_DBUS_IFACE_SETTINGS_CONNECTION, macro in NetworkManager +
+
+
+NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_ACCESS_POINT, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_ACTIVE_CONNECTION, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_AGENT_MANAGER, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_ADSL, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_BLUETOOTH, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_BOND, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_BRIDGE, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_GENERIC, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_GRE, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_INFINIBAND, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_MACVLAN, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_MODEM, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_OLPC_MESH, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_TEAM, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_TUN, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_VETH, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_VLAN, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_VXLAN, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_WIMAX, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_WIRED, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DEVICE_WIRELESS, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DHCP4_CONFIG, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_DHCP6_CONFIG, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_IP4_CONFIG, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_IP6_CONFIG, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_SECRET_AGENT, macro in NetworkManager +
+
+
+NM_DBUS_INTERFACE_VPN, macro in NetworkManagerVPN +
+
+
+NM_DBUS_INTERFACE_VPN_CONNECTION, macro in NetworkManagerVPN +
+
+
+NM_DBUS_INTERFACE_WIMAX_NSP, macro in NetworkManager +
+
+
+NM_DBUS_INVALID_VPN_CONNECTION, macro in NetworkManagerVPN +
+
+
+NM_DBUS_NO_ACTIVE_VPN_CONNECTION, macro in NetworkManagerVPN +
+
+
+NM_DBUS_NO_VPN_CONNECTIONS, macro in NetworkManagerVPN +
+
+
+NM_DBUS_PATH, macro in NetworkManager +
+
+
+NM_DBUS_PATH_ACCESS_POINT, macro in NetworkManager +
+
+
+NM_DBUS_PATH_AGENT_MANAGER, macro in NetworkManager +
+
+
+NM_DBUS_PATH_SECRET_AGENT, macro in NetworkManager +
+
+
+NM_DBUS_PATH_SETTINGS, macro in NetworkManager +
+
+
+NM_DBUS_PATH_SETTINGS_CONNECTION, macro in NetworkManager +
+
+
+NM_DBUS_PATH_VPN, macro in NetworkManagerVPN +
+
+
+NM_DBUS_PATH_VPN_CONNECTION, macro in NetworkManagerVPN +
+
+
+NM_DBUS_PATH_WIMAX_NSP, macro in NetworkManager +
+
+
+NM_DBUS_SERVICE, macro in NetworkManager +
+
+
+NM_DBUS_VPN_ALREADY_STARTED, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_ALREADY_STOPPED, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_BAD_ARGUMENTS, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_ERROR_PREFIX, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_SIGNAL_CONNECT_FAILED, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_SIGNAL_IP4_CONFIG, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_SIGNAL_LOGIN_BANNER, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_SIGNAL_LOGIN_FAILED, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_SIGNAL_STATE_CHANGE, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_STARTING_IN_PROGRESS, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_STOPPING_IN_PROGRESS, macro in NetworkManagerVPN +
+
+
+NM_DBUS_VPN_WRONG_STATE, macro in NetworkManagerVPN +
+
+
+NMDeviceCapabilities, enum in NetworkManager +
+
+
+NMDeviceModemCapabilities, enum in NetworkManager +
+
+
+NMDeviceState, enum in NetworkManager +
+
+
+NMDeviceStateReason, enum in NetworkManager +
+
+
+NMDeviceType, enum in NetworkManager +
+
+
+NMDeviceWifiCapabilities, enum in NetworkManager +
+

I

NMIP4Address, typedef in NMSettingIP4Config @@ -1133,10 +1457,6 @@
-NMSettingIP4Config:address-labels, object property in NMSettingIP4Config -
-
-
NMSettingIP4Config:addresses, object property in NMSettingIP4Config
@@ -1181,6 +1501,10 @@
+NMSettingIP4Config:route-metric, object property in NMSettingIP4Config +
+
+
NMSettingIP4Config:routes, object property in NMSettingIP4Config
@@ -1237,6 +1561,10 @@
+NMSettingIP6Config:route-metric, object property in NMSettingIP6Config +
+
+
NMSettingIP6Config:routes, object property in NMSettingIP6Config
@@ -1509,6 +1837,10 @@
+NMSettingVPN:persistent, object property in NMSettingVPN +
+
+
NMSettingVPN:secrets, object property in NMSettingVPN
@@ -2369,6 +2701,10 @@
+NM_SETTING_BOND_OPTION_LACP_RATE, macro in NMSettingBond +
+
+
NM_SETTING_BOND_OPTION_MIIMON, macro in NMSettingBond
@@ -3261,6 +3597,10 @@
+nm_setting_ip4_config_get_route_metric, function in NMSettingIP4Config +
+
+
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, macro in NMSettingIP4Config
@@ -3341,6 +3681,10 @@
+NM_SETTING_IP4_CONFIG_ROUTE_METRIC, macro in NMSettingIP4Config +
+
+
NM_SETTING_IP4_CONFIG_SETTING_NAME, macro in NMSettingIP4Config
@@ -3461,6 +3805,10 @@
+nm_setting_ip6_config_get_route_metric, function in NMSettingIP6Config +
+
+
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS, macro in NMSettingIP6Config
@@ -3549,6 +3897,10 @@
+NM_SETTING_IP6_CONFIG_ROUTE_METRIC, macro in NMSettingIP6Config +
+
+
NM_SETTING_IP6_CONFIG_SETTING_NAME, macro in NMSettingIP6Config
@@ -4089,6 +4441,10 @@
+nm_setting_vpn_get_persistent, function in NMSettingVPN +
+
+
nm_setting_vpn_get_secret, function in NMSettingVPN
@@ -4105,6 +4461,10 @@
+NM_SETTING_VPN_PERSISTENT, macro in NMSettingVPN +
+
+
nm_setting_vpn_remove_data_item, function in NMSettingVPN
@@ -4688,8 +5048,20 @@ NM_SETTING_WIRELESS_TX_POWER, macro in NMSettingWireless
+
+NMState, enum in NetworkManager +
+
+
+NM_STATE_CONNECTED, macro in NetworkManager +
+

U

+NMUtilsFileSearchInPathsPredicate, user_function in nm-utils +
+
+
NMUtilsSecurityType, enum in nm-utils
@@ -4718,6 +5090,10 @@
+nm_utils_file_search_in_paths, function in nm-utils +
+
+
nm_utils_gvalue_hash_dup, function in nm-utils
@@ -4911,9 +5287,165 @@
+NMVPNConnectionState, enum in NetworkManagerVPN +
+
+
+NMVPNConnectionStateReason, enum in NetworkManagerVPN +
+
+
NMVPNIterFunc, user_function in NMSettingVPN
+
+NMVPNPluginFailure, enum in NetworkManagerVPN +
+
+
+NMVPNServiceState, enum in NetworkManagerVPN +
+
+
+NM_VPN_DBUS_PLUGIN_INTERFACE, macro in NetworkManagerVPN +
+
+
+NM_VPN_DBUS_PLUGIN_PATH, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_CAN_PERSIST, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_CONFIG_BANNER, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_CONFIG_HAS_IP4, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_CONFIG_HAS_IP6, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_CONFIG_MTU, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_CONFIG_TUNDEV, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_BANNER, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_DNS, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_MSS, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_MTU, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_NBNS, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_PTP, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP6_CONFIG_DNS, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP6_CONFIG_MSS, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP6_CONFIG_PREFIX, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP6_CONFIG_PTP, macro in NetworkManagerVPN +
+
+
+NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in NetworkManagerVPN +
+

W

NMWepKeyType, enum in NMSettingWirelessSecurity diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html index 88a43401..10afeae9 100644 --- a/docs/libnm-util/html/ch01.html +++ b/docs/libnm-util/html/ch01.html @@ -113,6 +113,12 @@ that require PPP to deliver IP capability
nm-utils — Utility functions
+
+NetworkManager +
+
+NetworkManagerVPN +

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

@@ -1372,8 +1455,9 @@ the raw address given its length. - +

Returns :

the type, either ARPHRD_ETHER or ARPHRD_INFINIBAND. -If the length is unexpected, return -1 (unsupported type/length).the type, either ARPHRD_ETHER or +ARPHRD_INFINIBAND. If the length is unexpected, return -1 +(unsupported type/length).
@@ -1402,7 +1486,8 @@ a type.

type :

-the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND +the type of address; either ARPHRD_ETHER or +ARPHRD_INFINIBAND @@ -1434,7 +1519,8 @@ Parses asc and converts it to binary for

type :

-the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND +the type of address; either ARPHRD_ETHER or +ARPHRD_INFINIBAND @@ -1473,7 +1559,8 @@ instead of a type.

type :

-the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND +the type of address; either ARPHRD_ETHER or +ARPHRD_INFINIBAND @@ -1764,13 +1851,14 @@ Wrapper for inet_ntop.

dst :

-the destination buffer, it must contain at least INET_ADDRSTRLEN -or NM_UTILS_INET_ADDRSTRLEN characters. If set to NULL, it will return -a pointer to an internal, static buffer (shared with nm_utils_inet6_ntop()). -Beware, that the internal buffer will be overwritten with ever new call -of nm_utils_inet4_ntop() or nm_utils_inet6_ntop() that does not provied it's -own dst buffer. Also, using the internal buffer is not thread safe. When -in doubt, pass your own dst buffer to avoid these issues. +the destination buffer, it must contain at least +INET_ADDRSTRLEN or NM_UTILS_INET_ADDRSTRLEN +characters. If set to NULL, it will return a pointer to an internal, static +buffer (shared with nm_utils_inet6_ntop()). Beware, that the internal +buffer will be overwritten with ever new call of nm_utils_inet4_ntop() or +nm_utils_inet6_ntop() that does not provied it's own dst buffer. Also, +using the internal buffer is not thread safe. When in doubt, pass your own +dst buffer to avoid these issues.

Returns :

@@ -1801,13 +1889,14 @@ Wrapper for inet_ntop.

dst :

-the destination buffer, it must contain at least INET6_ADDRSTRLEN -or NM_UTILS_INET_ADDRSTRLEN characters. If set to NULL, it will return -a pointer to an internal, static buffer (shared with nm_utils_inet4_ntop()). -Beware, that the internal buffer will be overwritten with ever new call -of nm_utils_inet4_ntop() or nm_utils_inet6_ntop() that does not provied it's -own dst buffer. Also, using the internal buffer is not thread safe. When -in doubt, pass your own dst buffer to avoid these issues. +the destination buffer, it must contain at least +INET6_ADDRSTRLEN or NM_UTILS_INET_ADDRSTRLEN +characters. If set to NULL, it will return a pointer to an internal, static +buffer (shared with nm_utils_inet4_ntop()). Beware, that the internal +buffer will be overwritten with ever new call of nm_utils_inet4_ntop() or +nm_utils_inet6_ntop() that does not provied it's own dst buffer. Also, +using the internal buffer is not thread safe. When in doubt, pass your own +dst buffer to avoid these issues.

Returns :

diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2 index 571aa04f..573c7c53 100644 --- a/docs/libnm-util/html/libnm-util.devhelp2 +++ b/docs/libnm-util/html/libnm-util.devhelp2 @@ -32,6 +32,8 @@ + + @@ -43,6 +45,7 @@ + @@ -60,6 +63,7 @@ + @@ -67,6 +71,7 @@ + @@ -512,6 +517,7 @@ + @@ -917,6 +923,7 @@ + @@ -983,6 +990,7 @@ + @@ -990,7 +998,6 @@ - @@ -1002,6 +1009,7 @@ + @@ -1012,6 +1020,7 @@ + @@ -1080,6 +1089,7 @@ + @@ -1095,6 +1105,7 @@ + @@ -1182,6 +1193,7 @@ + @@ -1190,6 +1202,7 @@ + @@ -1201,6 +1214,7 @@ + @@ -1235,6 +1249,8 @@ + + @@ -1257,10 +1273,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1275,12 +1408,16 @@ + + + + @@ -1433,5 +1570,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html index 6cd0dcde..c073e707 100644 --- a/docs/libnm-util/html/object-tree.html +++ b/docs/libnm-util/html/object-tree.html @@ -6,14 +6,14 @@ - + - + -- cgit 1.3.0-6-gf8a5