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

libnm/vpn-service-plugin: flush D-Bus connection before signalling quit

Browse Source 
The plugins tend to exit right away after receiving the "quit" signal,
which may come before the ConnectInteractive() response went out.
This may make NM miss the response, and the error details it contains.

Let's make sure we flush the pending traffic out.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2045
This commit is contained in:
Lubomir Rintel
2024-10-03 13:47:00 +02:00
parent bb6881f88c
commit 6747b1c0b8
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/libnm-client-impl/nm-vpn-service-plugin.c
View File

@@ -232,11 +232,30 @@ nm_vpn_service_plugin_disconnect(NMVpnServicePlugin *plugin, GError **err)
} }
static void static void
nm_vpn_service_plugin_emit_quit(NMVpnServicePlugin *plugin) flushed_cb(GObject *object, GAsyncResult *res, gpointer data)
{ {
NMVpnServicePlugin *plugin = NM_VPN_SERVICE_PLUGIN(data);
GError *error = NULL;
if (!g_dbus_connection_flush_finish(G_DBUS_CONNECTION(object), res, &error)) {
g_warning("Error flushing D-Bus connection: %s", error->message);
g_error_free(error);
}
g_signal_emit(plugin, signals[QUIT], 0); g_signal_emit(plugin, signals[QUIT], 0);
} }
static void
flush_and_quit(NMVpnServicePlugin *plugin)
{
NMVpnServicePluginPrivate *priv = NM_VPN_SERVICE_PLUGIN_GET_PRIVATE(plugin);
if (priv->connection != NULL)
g_dbus_connection_flush(priv->connection, NULL, flushed_cb, plugin);
else
g_signal_emit(plugin, signals[QUIT], 0);
}
/** /**
* nm_vpn_service_plugin_shutdown: * nm_vpn_service_plugin_shutdown:
* @plugin: the #NMVpnServicePlugin instance * @plugin: the #NMVpnServicePlugin instance
@@ -305,7 +324,8 @@ quit_timer_expired(gpointer data)
NMVpnServicePlugin *self = NM_VPN_SERVICE_PLUGIN(data); NMVpnServicePlugin *self = NM_VPN_SERVICE_PLUGIN(data);
NM_VPN_SERVICE_PLUGIN_GET_PRIVATE(self)->quit_timer = 0; NM_VPN_SERVICE_PLUGIN_GET_PRIVATE(self)->quit_timer = 0;
nm_vpn_service_plugin_emit_quit(self); flush_and_quit(self);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@@ -997,17 +1017,17 @@ impl_vpn_service_plugin_set_failure(NMVpnServicePlugin *plugin,
/*****************************************************************************/ /*****************************************************************************/
static void static void
_emit_quit(gpointer data, gpointer user_data) _flush_and_quit_plugin(gpointer data, gpointer user_data)
{ {
NMVpnServicePlugin *plugin = data; NMVpnServicePlugin *plugin = data;
nm_vpn_service_plugin_emit_quit(plugin); flush_and_quit(plugin);
} }
static void static void
sigterm_handler(int signum) sigterm_handler(int signum)
{ {
g_slist_foreach(active_plugins, _emit_quit, NULL); g_slist_foreach(active_plugins, _flush_and_quit_plugin, NULL);
} }
static void static void
@@ -1204,7 +1224,7 @@ state_changed(NMVpnServicePlugin *plugin, NMVpnServiceState state)
break; break;
case NM_VPN_SERVICE_STATE_STOPPED: case NM_VPN_SERVICE_STATE_STOPPED:
if (priv->dbus_watch_peer) if (priv->dbus_watch_peer)
nm_vpn_service_plugin_emit_quit(plugin); flush_and_quit(plugin);
else else
schedule_quit_timer(plugin); schedule_quit_timer(plugin);
nm_clear_g_dbus_connection_signal(nm_vpn_service_plugin_get_connection(plugin), nm_clear_g_dbus_connection_signal(nm_vpn_service_plugin_get_connection(plugin),