From afcd268ea7b1149fbfb66bce4eca659b675da0a2 Mon Sep 17 00:00:00 2001
From: Michael Biebl setting the NMSetting to add to the connection object. the NMSetting to add to the connection object.
-GVariant *
+GVariant *
nm_connection_to_dbus ()
@@ -82,7 +82,7 @@
-gboolean
+gboolean
nm_connection_replace_settings ()
@@ -106,7 +106,7 @@
-gboolean
+gboolean
nm_connection_compare ()
@@ -114,7 +114,7 @@
-gboolean
+gboolean
nm_connection_diff ()
@@ -122,7 +122,7 @@
-gboolean
+gboolean
nm_connection_verify ()
@@ -130,7 +130,7 @@
-gboolean
+gboolean
nm_connection_verify_secrets ()
@@ -138,7 +138,7 @@
-gboolean
+gboolean
nm_connection_normalize ()
@@ -169,7 +169,7 @@
-gboolean
+gboolean
nm_connection_update_secrets ()
@@ -199,7 +199,7 @@
-gboolean
+gboolean
nm_connection_is_type ()
@@ -252,7 +252,7 @@
-gboolean
+gboolean
nm_connection_is_virtual ()
@@ -492,6 +492,14 @@
+
+NMSettingTCConfig *
+
+
+nm_connection_get_setting_tc_config ()
+
+
+
NMSettingTun *
@@ -606,7 +614,7 @@
@@ -651,7 +659,7 @@ the setting object's reference count.
@@ -663,8 +671,8 @@ the setting object's reference count.
-
+[transfer full]
void nm_connection_remove_setting (-NMConnection *connection, -GType setting_type);
Removes the NMSetting with the given GType from the NMConnection. This
+ GType setting_type);
+
Removes the NMSetting with the given GType from the NMConnection. This operation dereferences the NMSetting object.
setting_type
-the GType of the setting object to remove
the GType of the setting object to remove
NMSetting * nm_connection_get_setting (-NMConnection *connection, -GType setting_type);
Gets the NMSetting with the given GType, if one has been previously added
+ GType setting_type);
+
Gets the NMSetting with the given GType, if one has been previously added to the NMConnection.
setting_type
the GType of the setting object to return
the GType of the setting object to return
the NMSetting, or NULL if no setting of that type was previously
+
the NMSetting, or NULL if no setting of that type was previously
added to the NMConnection.
[transfer none]
the NMSetting, or NULL if no setting with that name was previously
+
the NMSetting, or NULL if no setting with that name was previously
added to the NMConnection.
[transfer none]
GVariant * +GVariant * nm_connection_to_dbus (-NMConnection *connection,NMConnectionSerializationFlags flags);Converts the NMConnection into a GVariant of type +
Converts the NMConnection into a GVariant of type
NM_VARIANT_TYPE_CONNECTIONdescribing the connection, suitable for marshalling over D-Bus or otherwise serializing.@@ -796,7 +804,7 @@ marshalling over D-Bus or otherwise serializing.@@ -804,10 +812,10 @@ its settings, and each setting's properties.Returns
-a new floating GVariant describing the connection, +
a new floating GVariant describing the connection, its settings, and each setting's properties.
[transfer none]
nm_connection_replace_settings ()
-gboolean +gboolean nm_connection_replace_settings (+NMConnection *connection, -GVariant *new_settings, -GError **error);GVariant *new_settings, +GError **error);Replaces
connection's settings withnew_settings(which must be @@ -829,12 +837,12 @@ need to result in a connection that passesnew_settings
-+ a GVariant of type
NM_VARIANT_TYPE_CONNECTION, with the new settingsa GVariant of type
NM_VARIANT_TYPE_CONNECTION, with the new settings@@ -842,7 +850,7 @@ need to result in a connection that passes - error
+ location to store error, or
NULLlocation to store error, or
NULLReturns
-
TRUEif connection was updated,FALSEifnew_settings+@@ -909,7 +917,7 @@ nm_connection_clear_settings (
TRUEif connection was updated,FALSEifnew_settingscould not be deserialized (in which caseconnectionwill be unchanged).nm_connection_compare ()
-gboolean +gboolean nm_connection_compare (@@ -945,17 +953,17 @@ each flag's behavior.NMConnection *a,NMConnection *b,NMSettingCompareFlags flags);
gboolean +gboolean nm_connection_diff (+NMConnection *a,NMConnection *b,NMSettingCompareFlags flags, -GHashTable **out_settings);GHashTable **out_settings);
Compares two NMConnection objects for similarity, with comparison behavior
modified by a set of flags. See nm_setting_compare() for a description of
each flag's behavior. If the connections differ, settings and keys within
@@ -988,7 +996,7 @@ No values are returned, only key names.
out_settings
if the +
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.
TRUE if the connections contain the same values, FALSE if they do
+
TRUE if the connections contain the same values, FALSE if they do
not
gboolean +gboolean nm_connection_verify (+NMConnection *connection, -GError **error);GError **error);
Validates the connection and all its settings. Each setting's properties have allowed values, and some values are dependent on other values. For example, if a Wi-Fi connection is security enabled, the NMSettingWireless @@ -1016,7 +1024,7 @@ setting object's 'security' property must contain the setting name of the NMSettingWirelessSecurity object, which must also be present in the connection for the connection to be valid. As another example, the NMSettingWired object's 'mac-address' property must be a validly formatted -MAC address. The returned GError contains information about which +MAC address. The returned GError contains information about which setting and which property failed validation, and how it failed validation.
error
location to store error, or NULL
location to store error, or NULL
gboolean +gboolean nm_connection_verify_secrets (+NMConnection *connection, -GError **error);GError **error);
Verifies the secrets in the connection.
error
-location to store error, or NULL
+location to store error, or NULL
@@ -1076,23 +1084,23 @@ nm_connection_verify_secrets (
Returns
-
+
Since: 1.2
gboolean +gboolean nm_connection_normalize (+NMConnection *connection, -GHashTable *parameters, -gboolean *modified, -GError **error);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 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.
parameters
a GHashTable with +
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.
+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.
modified
outputs whether any settings were modified.
outputs whether any settings were modified.
error
location to store error, or NULL. Contains the reason,
+
location to store error, or NULL. Contains the reason,
why the connection is invalid, if the function returns an error.
const char * nm_connection_need_secrets (+NMConnection *connection, -GPtrArray **hints);
GPtrArray **hints);
Returns the name of the first setting object in the connection which would need secrets to make a successful connection. The returned hints are only intended as a guide to what secrets may be required, because in some @@ -1165,10 +1173,10 @@ secrets are needed.
hints
the address of a pointer to a GPtrArray, initialized to NULL, which on
-return points to an allocated GPtrArray containing the property names of
+
the address of a pointer to a GPtrArray, initialized to NULL, which on
+return points to an allocated GPtrArray containing the property names of
secrets of the NMSetting which may be required; the caller owns the array
-and must free the array itself with g_ptr_array_free(), but not free its
+and must free the array itself with g_ptr_array_free(), but not free its
elements.
NMConnection *connection,
NMSettingClearSecretsWithFlagsFn func,
- gpointer user_data);
+ gpointer user_data);
Clears and frees secrets determined by func
.
func
function to be called to determine whether a +
function to be called to determine whether a specific secret should be cleared or not.
gboolean +gboolean nm_connection_update_secrets (+NMConnection *connection,const char *setting_name, -GVariant *secrets, -GError **error);GVariant *secrets, +GError **error);
Update the specified setting's secrets, given a dictionary of secrets
intended for that setting (deserialized from D-Bus for example). Will also
extract the given setting's secrets hash if given a connection dictionary.
If setting_name
- is NULL, expects a fully serialized NMConnection as
+ is NULL, expects a fully serialized NMConnection as
returned by nm_connection_to_dbus() and will update all secrets from all
settings contained in secrets
.
secrets
secrets
a GVariant of secrets, of type NM_VARIANT_TYPE_CONNECTION
+
a GVariant of secrets, of type NM_VARIANT_TYPE_CONNECTION
or NM_VARIANT_TYPE_SETTING
error
location to store error, or NULL
location to store error, or NULL
TRUE if the secrets were successfully updated, FALSE if the update
+
TRUE if the secrets were successfully updated, FALSE if the update
failed (tried to update secrets for a setting that doesn't exist, etc)
NMConnection *connection,
const char *path);
Sets the D-Bus path of the connection. This property is not serialized, and -is only for the reference of the caller. Sets the “path” +is only for the reference of the caller. Sets the “path” property.
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.
+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.
@@ -1386,13 +1394,13 @@ NetworkManager, this is the name of the created interface.
gboolean +gboolean nm_connection_is_type (NMConnection *connection,const char *type);A convenience function to check if the given
connection@@ -1425,8 +1433,8 @@ property of the connection and matches that against
void
nm_connection_for_each_setting_value (NMConnection *connection,
NMSettingValueIterFn func,
- gpointer user_data);
+ gpointer user_data);
Iterates over the properties of each NMSetting object in the NMConnection,
calling the supplied user function for each property.
@@ -1454,7 +1462,7 @@ calling the supplied user function for each property.
func
- user-supplied function called for each setting's property.
+user-supplied function called for each setting's property.
[scope call]
@@ -1472,10 +1480,10 @@ at each invocation
nm_connection_get_settings ()
NMSetting **
nm_connection_get_settings (NMConnection *connection,
- guint *out_length);
+ guint *out_length);
Retrieves the settings in connection
.
-The returned array is NULL-terminated.
+The returned array is NULL-terminated.
Parameters