mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-24 11:20:07 +01:00
Rework VPN connection handling for a more consistent D-Bus API. The VPNManager object has been removed, and active VPN connections are now the same as any other active connection. The Manager object's ActivateConnection and DeactivateConnection methods are used to start and stop a VPN connection, and the VPNConnection objects are subclasses of the ActiveConnection objects. When activating a VPN connection, pass the path of the active connection to which the VPN connection is tied in the 'specific_object' argument. Consequently, the libnm-glib API has been reworked to match this arrangement, with the VPNManager object removed, and the NMVPNConnection objects now being subclasses of NMActiveConnection. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3504 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
195 lines
5.8 KiB
C
195 lines
5.8 KiB
C
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
|
|
/* NetworkManager Wireless Applet -- Display wireless access points and allow user control
|
|
*
|
|
* Dan Williams <dcbw@redhat.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* (C) Copyright 2008 Red Hat, Inc.
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include "nm-vpn-connection.h"
|
|
#include "NetworkManager.h"
|
|
#include "nm-utils.h"
|
|
#include "nm-vpn-connection-bindings.h"
|
|
#include "nm-marshal.h"
|
|
#include "nm-object-private.h"
|
|
#include "nm-active-connection.h"
|
|
|
|
G_DEFINE_TYPE (NMVPNConnection, nm_vpn_connection, NM_TYPE_ACTIVE_CONNECTION)
|
|
|
|
#define NM_VPN_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_CONNECTION, NMVPNConnectionPrivate))
|
|
|
|
typedef struct {
|
|
DBusGProxy *proxy;
|
|
char *banner;
|
|
NMVPNConnectionState state;
|
|
} NMVPNConnectionPrivate;
|
|
|
|
enum {
|
|
STATE_CHANGED,
|
|
|
|
LAST_SIGNAL
|
|
};
|
|
|
|
static guint signals[LAST_SIGNAL] = { 0 };
|
|
|
|
|
|
GObject *
|
|
nm_vpn_connection_new (DBusGConnection *dbus_connection, const char *path)
|
|
{
|
|
g_return_val_if_fail (dbus_connection != NULL, NULL);
|
|
g_return_val_if_fail (path != NULL, NULL);
|
|
|
|
return g_object_new (NM_TYPE_VPN_CONNECTION,
|
|
NM_OBJECT_DBUS_CONNECTION, dbus_connection,
|
|
NM_OBJECT_DBUS_PATH, path,
|
|
NULL);
|
|
}
|
|
|
|
const char *
|
|
nm_vpn_connection_get_banner (NMVPNConnection *vpn)
|
|
{
|
|
NMVPNConnectionPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_VPN_CONNECTION (vpn), NULL);
|
|
|
|
priv = NM_VPN_CONNECTION_GET_PRIVATE (vpn);
|
|
if (priv->state != NM_VPN_CONNECTION_STATE_ACTIVATED)
|
|
return NULL;
|
|
|
|
if (!priv->banner) {
|
|
priv->banner = nm_object_get_string_property (NM_OBJECT (vpn),
|
|
NM_DBUS_INTERFACE_VPN_CONNECTION,
|
|
"Banner");
|
|
if (priv->banner && !strlen (priv->banner)) {
|
|
g_free (priv->banner);
|
|
priv->banner = NULL;
|
|
}
|
|
}
|
|
return priv->banner;
|
|
}
|
|
|
|
NMVPNConnectionState
|
|
nm_vpn_connection_get_state (NMVPNConnection *vpn)
|
|
{
|
|
NMVPNConnectionPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_VPN_CONNECTION (vpn), NM_VPN_CONNECTION_STATE_UNKNOWN);
|
|
|
|
priv = NM_VPN_CONNECTION_GET_PRIVATE (vpn);
|
|
if (priv->state == NM_VPN_CONNECTION_STATE_UNKNOWN) {
|
|
priv->state = nm_object_get_uint_property (NM_OBJECT (vpn),
|
|
NM_DBUS_INTERFACE_VPN_CONNECTION,
|
|
"State");
|
|
}
|
|
return priv->state;
|
|
}
|
|
|
|
static void
|
|
state_changed_proxy (DBusGProxy *proxy,
|
|
NMVPNConnectionState state,
|
|
NMVPNConnectionStateReason reason,
|
|
gpointer user_data)
|
|
{
|
|
NMVPNConnection *connection = NM_VPN_CONNECTION (user_data);
|
|
NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection);
|
|
|
|
if (priv->state != state) {
|
|
priv->state = state;
|
|
g_signal_emit (connection, signals[STATE_CHANGED], 0, state, reason);
|
|
}
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
|
|
static void
|
|
nm_vpn_connection_init (NMVPNConnection *connection)
|
|
{
|
|
NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection);
|
|
|
|
priv->state = NM_VPN_CONNECTION_STATE_UNKNOWN;
|
|
}
|
|
|
|
static GObject*
|
|
constructor (GType type,
|
|
guint n_construct_params,
|
|
GObjectConstructParam *construct_params)
|
|
{
|
|
NMObject *object;
|
|
NMVPNConnectionPrivate *priv;
|
|
|
|
object = (NMObject *) G_OBJECT_CLASS (nm_vpn_connection_parent_class)->constructor (type,
|
|
n_construct_params,
|
|
construct_params);
|
|
if (!object)
|
|
return NULL;
|
|
|
|
priv = NM_VPN_CONNECTION_GET_PRIVATE (object);
|
|
|
|
priv->proxy = dbus_g_proxy_new_for_name (nm_object_get_connection (object),
|
|
NM_DBUS_SERVICE,
|
|
nm_object_get_path (object),
|
|
NM_DBUS_INTERFACE_VPN_CONNECTION);
|
|
|
|
dbus_g_object_register_marshaller (nm_marshal_VOID__UINT_UINT,
|
|
G_TYPE_NONE,
|
|
G_TYPE_UINT, G_TYPE_UINT,
|
|
G_TYPE_INVALID);
|
|
dbus_g_proxy_add_signal (priv->proxy, "StateChanged", G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID);
|
|
dbus_g_proxy_connect_signal (priv->proxy,
|
|
"StateChanged",
|
|
G_CALLBACK (state_changed_proxy),
|
|
object,
|
|
NULL);
|
|
return G_OBJECT (object);
|
|
}
|
|
|
|
static void
|
|
finalize (GObject *object)
|
|
{
|
|
NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object);
|
|
|
|
if (priv->banner)
|
|
g_free (priv->banner);
|
|
|
|
g_object_unref (priv->proxy);
|
|
|
|
G_OBJECT_CLASS (nm_vpn_connection_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (connection_class);
|
|
|
|
g_type_class_add_private (connection_class, sizeof (NMVPNConnectionPrivate));
|
|
|
|
/* virtual methods */
|
|
object_class->constructor = constructor;
|
|
object_class->finalize = finalize;
|
|
|
|
/* signals */
|
|
signals[STATE_CHANGED] =
|
|
g_signal_new ("state-changed",
|
|
G_OBJECT_CLASS_TYPE (object_class),
|
|
G_SIGNAL_RUN_FIRST,
|
|
G_STRUCT_OFFSET (NMVPNConnectionClass, state_changed),
|
|
NULL, NULL,
|
|
nm_marshal_VOID__UINT_UINT,
|
|
G_TYPE_NONE, 2,
|
|
G_TYPE_UINT, G_TYPE_UINT);
|
|
}
|