colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: implement nm_remote_connection_update2() by using GDBusConnection directly

Browse Source 
Also, implement nm_remote_connection_commit_changes_async() by calling
nm_remote_connection_update2(). It already was also calling the
Update2() D-Bus method.
This commit is contained in:
Thomas Haller
2019-10-06 16:34:23 +02:00
parent 79fbe7a578
commit eff5e730ef
1 changed files with 46 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
libnm/nm-remote-connection.c
View File

@@ -62,28 +62,6 @@ typedef struct {
/*****************************************************************************/ /*****************************************************************************/
static void
update2_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
{
GSimpleAsyncResult *simple = user_data;
GError *error = NULL;
GVariant *v;
if (nmdbus_settings_connection_call_update2_finish (NMDBUS_SETTINGS_CONNECTION (proxy),
&v,
result,
&error)) {
g_simple_async_result_set_op_res_gpointer (simple,
v,
(GDestroyNotify) g_variant_unref);
} else {
g_dbus_error_strip_remote_error (error);
g_simple_async_result_take_error (simple, error);
}
g_simple_async_result_complete (simple);
g_object_unref (simple);
}
/** /**
* nm_remote_connection_update2: * nm_remote_connection_update2:
* @connection: the #NMRemoteConnection * @connection: the #NMRemoteConnection
@@ -107,37 +85,32 @@ nm_remote_connection_update2 (NMRemoteConnection *connection,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
NMRemoteConnectionPrivate *priv;
GSimpleAsyncResult *simple;
GVariantBuilder builder;
g_return_if_fail (NM_IS_REMOTE_CONNECTION (connection)); g_return_if_fail (NM_IS_REMOTE_CONNECTION (connection));
g_return_if_fail (!settings || g_variant_is_of_type (settings, NM_VARIANT_TYPE_CONNECTION)); g_return_if_fail (!settings || g_variant_is_of_type (settings, NM_VARIANT_TYPE_CONNECTION));
g_return_if_fail (!args || g_variant_is_of_type (args, G_VARIANT_TYPE ("a{sv}"))); g_return_if_fail (!args || g_variant_is_of_type (args, G_VARIANT_TYPE ("a{sv}")));
g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable)); g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
priv = NM_REMOTE_CONNECTION_GET_PRIVATE (connection); if (!settings)
settings = g_variant_new_array (G_VARIANT_TYPE ("{sa{sv}}"), NULL, 0);
if (!args)
args = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0);
simple = g_simple_async_result_new (G_OBJECT (connection), callback, user_data, _nm_object_dbus_call (connection,
nm_remote_connection_update2); nm_remote_connection_update2,
if (cancellable) cancellable,
g_simple_async_result_set_check_cancellable (simple, cancellable); callback,
user_data,
if (!settings) { g_dbus_proxy_get_object_path (G_DBUS_PROXY (NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->proxy)),
g_variant_builder_init (&builder, NM_VARIANT_TYPE_CONNECTION); NM_DBUS_INTERFACE_SETTINGS_CONNECTION,
settings = g_variant_builder_end (&builder); "Update2",
} g_variant_new ("(@a{sa{sv}}u@a{sv})",
if (!args) { settings,
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); (guint32) flags,
args = g_variant_builder_end (&builder); args),
} G_VARIANT_TYPE ("(a{sv})"),
nmdbus_settings_connection_call_update2 (priv->proxy, G_DBUS_CALL_FLAGS_NONE,
settings, NM_DBUS_DEFAULT_TIMEOUT_MSEC,
flags, nm_dbus_connection_call_finish_variant_strip_dbus_error_cb);
args,
cancellable,
update2_cb,
simple);
} }
/** /**
@@ -156,15 +129,21 @@ nm_remote_connection_update2_finish (NMRemoteConnection *connection,
GAsyncResult *result, GAsyncResult *result,
GError **error) GError **error)
{ {
GSimpleAsyncResult *simple; gs_unref_variant GVariant *ret = NULL;
GVariant *v_result;
g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (connection), nm_remote_connection_update2), FALSE); g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), NULL);
g_return_val_if_fail (nm_g_task_is_valid (result, connection, nm_remote_connection_update2), NULL);
simple = G_SIMPLE_ASYNC_RESULT (result); ret = g_task_propagate_pointer (G_TASK (result), error);
if (g_simple_async_result_propagate_error (simple, error)) if (!ret)
return NULL; return NULL;
else
return g_variant_ref (g_simple_async_result_get_op_res_gpointer (simple)); g_variant_get (ret,
"(@a{sv})",
&v_result);
return v_result;
} }
/*****************************************************************************/ /*****************************************************************************/
@@ -218,26 +197,6 @@ nm_remote_connection_commit_changes (NMRemoteConnection *connection,
return TRUE; return TRUE;
} }
static void
update_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
{
GSimpleAsyncResult *simple = user_data;
GError *error = NULL;
gs_unref_variant GVariant *v = NULL;
if (nmdbus_settings_connection_call_update2_finish (NMDBUS_SETTINGS_CONNECTION (proxy),
&v,
result,
&error))
g_simple_async_result_set_op_res_gboolean (simple, TRUE);
else {
g_dbus_error_strip_remote_error (error);
g_simple_async_result_take_error (simple, error);
}
g_simple_async_result_complete (simple);
g_object_unref (simple);
}
/** /**
* nm_remote_connection_commit_changes_async: * nm_remote_connection_commit_changes_async:
* @connection: the #NMRemoteConnection * @connection: the #NMRemoteConnection
@@ -258,30 +217,19 @@ nm_remote_connection_commit_changes_async (NMRemoteConnection *connection,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
NMRemoteConnectionPrivate *priv;
GSimpleAsyncResult *simple;
GVariantBuilder args;
g_return_if_fail (NM_IS_REMOTE_CONNECTION (connection)); g_return_if_fail (NM_IS_REMOTE_CONNECTION (connection));
g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
priv = NM_REMOTE_CONNECTION_GET_PRIVATE (connection); nm_remote_connection_update2 (connection,
nm_connection_to_dbus (NM_CONNECTION (connection),
simple = g_simple_async_result_new (G_OBJECT (connection), callback, user_data, NM_CONNECTION_SERIALIZE_ALL),
nm_remote_connection_commit_changes_async); save_to_disk
if (cancellable) ? NM_SETTINGS_UPDATE2_FLAG_TO_DISK
g_simple_async_result_set_check_cancellable (simple, cancellable); : NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY,
NULL,
g_variant_builder_init (&args, G_VARIANT_TYPE ("a{sv}")); cancellable,
nmdbus_settings_connection_call_update2 (priv->proxy, callback,
nm_connection_to_dbus (NM_CONNECTION (connection), user_data);
NM_CONNECTION_SERIALIZE_ALL),
save_to_disk
? NM_SETTINGS_UPDATE2_FLAG_TO_DISK
: NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY,
g_variant_builder_end (&args),
cancellable,
update_cb,
simple);
} }
/** /**
@@ -299,15 +247,10 @@ nm_remote_connection_commit_changes_finish (NMRemoteConnection *connection,
GAsyncResult *result, GAsyncResult *result,
GError **error) GError **error)
{ {
GSimpleAsyncResult *simple; gs_unref_variant GVariant *v_result = NULL;
g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (connection), nm_remote_connection_commit_changes_async), FALSE); v_result = nm_remote_connection_update2_finish (connection, result, error);
return !!v_result;
simple = G_SIMPLE_ASYNC_RESULT (result);
if (g_simple_async_result_propagate_error (simple, error))
return FALSE;
else
return g_simple_async_result_get_op_res_gboolean (simple);
} }
/*****************************************************************************/ /*****************************************************************************/