fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 11:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

vpn: simplify service cleanup

Browse source
This commit is contained in:
Dan Williams 2014-05-14 16:12:28 -05:00
parent 26a65f4fe4
commit 8b7eaeb07e
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/vpn-manager/nm-vpn-service.c
View file

@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* Copyright (C) 2005 - 2012 Red Hat, Inc. * Copyright (C) 2005 - 2014 Red Hat, Inc.
* Copyright (C) 2005 - 2008 Novell, Inc. * Copyright (C) 2005 - 2008 Novell, Inc.
*/ */
@ -38,9 +38,6 @@
G_DEFINE_TYPE (NMVPNService, nm_vpn_service, G_TYPE_OBJECT) G_DEFINE_TYPE (NMVPNService, nm_vpn_service, G_TYPE_OBJECT)
typedef struct { typedef struct {
gboolean disposed;
NMDBusManager *dbus_mgr;
char *name; char *name;
char *dbus_service; char *dbus_service;
char *program; char *program;
@ -345,7 +342,7 @@ nm_vpn_service_activate (NMVPNService *service,
priv->connections = g_slist_prepend (priv->connections, g_object_ref (vpn)); priv->connections = g_slist_prepend (priv->connections, g_object_ref (vpn));
if (nm_dbus_manager_name_has_owner (priv->dbus_mgr, priv->dbus_service)) if (nm_dbus_manager_name_has_owner (nm_dbus_manager_get (), priv->dbus_service))
nm_vpn_connection_activate (vpn); nm_vpn_connection_activate (vpn);
else if (priv->start_timeout == 0) { else if (priv->start_timeout == 0) {
nm_log_info (LOGD_VPN, "Starting VPN service '%s'...", priv->name); nm_log_info (LOGD_VPN, "Starting VPN service '%s'...", priv->name);
@ -410,8 +407,7 @@ nm_vpn_service_init (NMVPNService *self)
{ {
NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self);
priv->dbus_mgr = nm_dbus_manager_get (); priv->name_owner_id = g_signal_connect (nm_dbus_manager_get (),
priv->name_owner_id = g_signal_connect (priv->dbus_mgr,
NM_DBUS_MANAGER_NAME_OWNER_CHANGED, NM_DBUS_MANAGER_NAME_OWNER_CHANGED,
G_CALLBACK (nm_vpn_service_name_owner_changed), G_CALLBACK (nm_vpn_service_name_owner_changed),
self); self);
@ -423,34 +419,42 @@ dispose (GObject *object)
NMVPNService *self = NM_VPN_SERVICE (object); NMVPNService *self = NM_VPN_SERVICE (object);
NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self);
if (priv->disposed) if (priv->start_timeout) {
goto out;
priv->disposed = TRUE;
if (priv->start_timeout)
g_source_remove (priv->start_timeout); g_source_remove (priv->start_timeout);
priv->start_timeout = 0;
}
nm_vpn_service_connections_stop (NM_VPN_SERVICE (object), nm_vpn_service_connections_stop (NM_VPN_SERVICE (object),
FALSE, FALSE,
NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED); NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED);
g_signal_handler_disconnect (priv->dbus_mgr, priv->name_owner_id); if (priv->name_owner_id) {
g_signal_handler_disconnect (nm_dbus_manager_get (), priv->name_owner_id);
priv->name_owner_id = 0;
}
if (priv->child_watch) if (priv->child_watch) {
g_source_remove (priv->child_watch); g_source_remove (priv->child_watch);
priv->child_watch = 0;
}
clear_quit_timeout (self); clear_quit_timeout (self);
service_quit (self); service_quit (self);
priv->dbus_mgr = NULL; G_OBJECT_CLASS (nm_vpn_service_parent_class)->dispose (object);
}
static void
finalize (GObject *object)
{
NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (object);
g_free (priv->name); g_free (priv->name);
g_free (priv->dbus_service); g_free (priv->dbus_service);
g_free (priv->program); g_free (priv->program);
g_free (priv->namefile); g_free (priv->namefile);
out: G_OBJECT_CLASS (nm_vpn_service_parent_class)->finalize (object);
G_OBJECT_CLASS (nm_vpn_service_parent_class)->dispose (object);
} }
static void static void
@ -462,4 +466,5 @@ nm_vpn_service_class_init (NMVPNServiceClass *service_class)
/* virtual methods */ /* virtual methods */
object_class->dispose = dispose; object_class->dispose = dispose;
object_class->finalize = finalize;
} }