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

cloud-setup: add a sync wrapper around AddAndActivate

Browse Source 
These will be used to create the software devices.
This commit is contained in:
Lubomir Rintel
2024-11-29 18:02:57 +01:00
parent 87b23669fa
commit c3861bc50a
2 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/nm-cloud-setup/nm-cloud-setup-utils.c
View File

@@ -615,3 +615,46 @@ again:
NM_SET_OUT(out_version_id_changed, FALSE);
return TRUE;
}
/*****************************************************************************/
typedef struct {
GMainLoop *main_loop;
GError **error;
NMActiveConnection *active_connection;
} AddAndActivateData;
static void
_nmcs_add_and_activate_cb(GObject *source, GAsyncResult *result, gpointer user_data)
{
AddAndActivateData *data = user_data;
data->active_connection =
nm_client_add_and_activate_connection_finish(NM_CLIENT(source), result, data->error);
g_main_loop_quit(data->main_loop);
}
NMActiveConnection *
nmcs_add_and_activate(NMClient *client,
GCancellable *sigterm_cancellable,
NMConnection *connection,
GError **error)
{
nm_auto_unref_gmainloop GMainLoop *main_loop = g_main_loop_new(NULL, FALSE);
AddAndActivateData data = {
.main_loop = main_loop,
.error = error,
};
nm_client_add_and_activate_connection_async(client,
connection,
NULL,
NULL,
sigterm_cancellable,
_nmcs_add_and_activate_cb,
&data);
g_main_loop_run(main_loop);
return data.active_connection;
}

5
src/nm-cloud-setup/nm-cloud-setup-utils.h
View File

@@ -153,6 +153,11 @@ NMConnection *nmcs_device_get_applied_connection(NMDevice *device,
guint64 *version_id,
GError **error);
NMActiveConnection *nmcs_add_and_activate(NMClient *client,
GCancellable *sigterm_cancellable,
NMConnection *connection,
GError **error);
gboolean nmcs_device_reapply(NMDevice *device,
GCancellable *sigterm_cancellable,
NMConnection *connection,