mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 02:35:25 +00:00
2008-07-31 Dan Williams <dcbw@redhat.com>
* src/nm-activation-request.c src/vpn-manager/nm-vpn-connection.c - Correct GetSecrets D-Bus pending call usage; the GetSecrets call itself should be attached to the activation request or the VPN connection, not the NMConnection object, since the call is not expected to live as long as the NMConnection itself git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3880 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
parent
501c7d0947
commit
9599502e38
|
|
@ -1,3 +1,12 @@
|
|||
2008-07-31 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/nm-activation-request.c
|
||||
src/vpn-manager/nm-vpn-connection.c
|
||||
- Correct GetSecrets D-Bus pending call usage; the GetSecrets call
|
||||
itself should be attached to the activation request or the VPN
|
||||
connection, not the NMConnection object, since the call is not
|
||||
expected to live as long as the NMConnection itself
|
||||
|
||||
2008-07-31 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/nm-device-wifi.c
|
||||
|
|
|
|||
|
|
@ -35,8 +35,6 @@
|
|||
|
||||
#include "nm-manager.h" /* FIXME! */
|
||||
|
||||
#define CONNECTION_GET_SECRETS_CALL_TAG "get-secrets-call"
|
||||
|
||||
G_DEFINE_TYPE (NMActRequest, nm_act_request, G_TYPE_OBJECT)
|
||||
|
||||
#define NM_ACT_REQUEST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_ACT_REQUEST, NMActRequestPrivate))
|
||||
|
|
@ -53,7 +51,11 @@ static guint signals[LAST_SIGNAL] = { 0 };
|
|||
|
||||
|
||||
typedef struct {
|
||||
gboolean disposed;
|
||||
|
||||
NMConnection *connection;
|
||||
DBusGProxyCall *secrets_call;
|
||||
|
||||
char *specific_object;
|
||||
NMDevice *device;
|
||||
gboolean user_requested;
|
||||
|
|
@ -167,33 +169,45 @@ nm_act_request_init (NMActRequest *req)
|
|||
g_object_unref (dbus_mgr);
|
||||
}
|
||||
|
||||
static void
|
||||
cleanup_secrets_dbus_call (NMActRequest *self)
|
||||
{
|
||||
NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (self);
|
||||
DBusGProxy *proxy;
|
||||
|
||||
g_return_if_fail (priv->connection != NULL);
|
||||
g_return_if_fail (NM_IS_CONNECTION (priv->connection));
|
||||
|
||||
proxy = g_object_get_data (G_OBJECT (priv->connection), NM_MANAGER_CONNECTION_SECRETS_PROXY_TAG);
|
||||
g_assert (proxy);
|
||||
|
||||
if (priv->secrets_call) {
|
||||
dbus_g_proxy_cancel_call (proxy, priv->secrets_call);
|
||||
priv->secrets_call = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
dispose (GObject *object)
|
||||
{
|
||||
NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (object);
|
||||
DBusGProxy *proxy;
|
||||
DBusGProxyCall *call;
|
||||
|
||||
if (!priv->connection)
|
||||
goto out;
|
||||
if (priv->disposed) {
|
||||
G_OBJECT_CLASS (nm_act_request_parent_class)->dispose (object);
|
||||
return;
|
||||
}
|
||||
priv->disposed = TRUE;
|
||||
|
||||
g_assert (priv->connection);
|
||||
|
||||
g_signal_handlers_disconnect_by_func (G_OBJECT (priv->device),
|
||||
G_CALLBACK (device_state_changed),
|
||||
NM_ACT_REQUEST (object));
|
||||
|
||||
proxy = g_object_get_data (G_OBJECT (priv->connection),
|
||||
NM_MANAGER_CONNECTION_SECRETS_PROXY_TAG);
|
||||
call = g_object_get_data (G_OBJECT (priv->connection),
|
||||
CONNECTION_GET_SECRETS_CALL_TAG);
|
||||
cleanup_secrets_dbus_call (NM_ACT_REQUEST (object));
|
||||
|
||||
if (proxy && call)
|
||||
dbus_g_proxy_cancel_call (proxy, call);
|
||||
|
||||
g_object_set_data (G_OBJECT (priv->connection),
|
||||
CONNECTION_GET_SECRETS_CALL_TAG, NULL);
|
||||
g_object_unref (priv->connection);
|
||||
|
||||
out:
|
||||
G_OBJECT_CLASS (nm_act_request_parent_class)->dispose (object);
|
||||
}
|
||||
|
||||
|
|
@ -443,7 +457,9 @@ get_secrets_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
|
|||
g_return_if_fail (info->setting_name);
|
||||
|
||||
priv = NM_ACT_REQUEST_GET_PRIVATE (info->req);
|
||||
g_object_set_data (G_OBJECT (priv->connection), CONNECTION_GET_SECRETS_CALL_TAG, NULL);
|
||||
|
||||
g_return_if_fail (call == priv->secrets_call);
|
||||
priv->secrets_call = NULL;
|
||||
|
||||
if (!dbus_g_proxy_end_call (proxy, call, &err,
|
||||
DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, &settings,
|
||||
|
|
@ -498,40 +514,31 @@ out:
|
|||
}
|
||||
|
||||
gboolean
|
||||
nm_act_request_request_connection_secrets (NMActRequest *req,
|
||||
nm_act_request_request_connection_secrets (NMActRequest *self,
|
||||
const char *setting_name,
|
||||
gboolean request_new,
|
||||
RequestSecretsCaller caller,
|
||||
const char *hint1,
|
||||
const char *hint2)
|
||||
{
|
||||
DBusGProxy *proxy;
|
||||
DBusGProxyCall *call;
|
||||
DBusGProxy *secrets_proxy;
|
||||
GetSecretsInfo *info = NULL;
|
||||
NMActRequestPrivate *priv = NULL;
|
||||
GPtrArray *hints = NULL;
|
||||
|
||||
g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE);
|
||||
g_return_val_if_fail (NM_IS_ACT_REQUEST (self), FALSE);
|
||||
g_return_val_if_fail (setting_name != NULL, FALSE);
|
||||
|
||||
priv = NM_ACT_REQUEST_GET_PRIVATE (req);
|
||||
proxy = g_object_get_data (G_OBJECT (priv->connection), NM_MANAGER_CONNECTION_SECRETS_PROXY_TAG);
|
||||
if (!DBUS_IS_G_PROXY (proxy)) {
|
||||
nm_warning ("Couldn't get dbus proxy for connection.");
|
||||
goto error;
|
||||
}
|
||||
priv = NM_ACT_REQUEST_GET_PRIVATE (self);
|
||||
|
||||
cleanup_secrets_dbus_call (self);
|
||||
|
||||
info = g_malloc0 (sizeof (GetSecretsInfo));
|
||||
if (!info) {
|
||||
nm_warning ("Not enough memory to get secrets");
|
||||
goto error;
|
||||
}
|
||||
g_return_val_if_fail (info != NULL, FALSE);
|
||||
|
||||
info->req = self;
|
||||
info->caller = caller;
|
||||
info->setting_name = g_strdup (setting_name);
|
||||
if (!info->setting_name) {
|
||||
nm_warning ("Not enough memory to get secrets");
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* Empty for now */
|
||||
hints = g_ptr_array_sized_new (2);
|
||||
|
|
@ -541,29 +548,30 @@ nm_act_request_request_connection_secrets (NMActRequest *req,
|
|||
if (hint2)
|
||||
g_ptr_array_add (hints, g_strdup (hint2));
|
||||
|
||||
info->req = req;
|
||||
info->caller = caller;
|
||||
call = dbus_g_proxy_begin_call_with_timeout (proxy, "GetSecrets",
|
||||
get_secrets_cb,
|
||||
info,
|
||||
free_get_secrets_info,
|
||||
G_MAXINT32,
|
||||
G_TYPE_STRING, setting_name,
|
||||
DBUS_TYPE_G_ARRAY_OF_STRING, hints,
|
||||
G_TYPE_BOOLEAN, request_new,
|
||||
G_TYPE_INVALID);
|
||||
secrets_proxy = g_object_get_data (G_OBJECT (priv->connection), NM_MANAGER_CONNECTION_SECRETS_PROXY_TAG);
|
||||
g_assert (secrets_proxy);
|
||||
|
||||
priv->secrets_call = dbus_g_proxy_begin_call_with_timeout (secrets_proxy, "GetSecrets",
|
||||
get_secrets_cb,
|
||||
info,
|
||||
free_get_secrets_info,
|
||||
G_MAXINT32,
|
||||
G_TYPE_STRING, setting_name,
|
||||
DBUS_TYPE_G_ARRAY_OF_STRING, hints,
|
||||
G_TYPE_BOOLEAN, request_new,
|
||||
G_TYPE_INVALID);
|
||||
g_ptr_array_free (hints, TRUE);
|
||||
if (!call) {
|
||||
nm_warning ("Could not call GetSecrets");
|
||||
if (!priv->secrets_call) {
|
||||
nm_warning ("Could not call get secrets");
|
||||
goto error;
|
||||
}
|
||||
|
||||
g_object_set_data (G_OBJECT (priv->connection), CONNECTION_GET_SECRETS_CALL_TAG, call);
|
||||
return TRUE;
|
||||
|
||||
error:
|
||||
if (info)
|
||||
free_get_secrets_info (info);
|
||||
cleanup_secrets_dbus_call (self);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -48,8 +48,6 @@
|
|||
#include "nm-dbus-glib-types.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
||||
#define CONNECTION_GET_SECRETS_CALL_TAG "get-secrets-call"
|
||||
|
||||
#include "nm-vpn-connection-glue.h"
|
||||
|
||||
G_DEFINE_TYPE (NMVPNConnection, nm_vpn_connection, G_TYPE_OBJECT)
|
||||
|
|
@ -58,6 +56,8 @@ typedef struct {
|
|||
gboolean disposed;
|
||||
|
||||
NMConnection *connection;
|
||||
DBusGProxyCall *secrets_call;
|
||||
|
||||
NMActRequest *act_request;
|
||||
NMDevice *parent_dev;
|
||||
char *ac_path;
|
||||
|
|
@ -672,27 +672,21 @@ nm_vpn_connection_disconnect (NMVPNConnection *connection,
|
|||
/******************************************************************************/
|
||||
|
||||
static void
|
||||
clear_need_auth (NMVPNConnection *vpn_connection)
|
||||
cleanup_secrets_dbus_call (NMVPNConnection *self)
|
||||
{
|
||||
NMVPNConnectionPrivate *priv;
|
||||
NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self);
|
||||
DBusGProxy *proxy;
|
||||
DBusGProxyCall *call;
|
||||
|
||||
g_return_if_fail (vpn_connection != NULL);
|
||||
|
||||
priv = NM_VPN_CONNECTION_GET_PRIVATE (vpn_connection);
|
||||
g_assert (priv->connection);
|
||||
g_return_if_fail (priv->connection != NULL);
|
||||
g_return_if_fail (NM_IS_CONNECTION (priv->connection));
|
||||
|
||||
proxy = g_object_get_data (G_OBJECT (priv->connection), NM_MANAGER_CONNECTION_SECRETS_PROXY_TAG);
|
||||
if (!proxy || !DBUS_IS_G_PROXY (proxy))
|
||||
return;
|
||||
g_assert (proxy);
|
||||
|
||||
call = g_object_get_data (G_OBJECT (vpn_connection), CONNECTION_GET_SECRETS_CALL_TAG);
|
||||
if (!call)
|
||||
return;
|
||||
|
||||
dbus_g_proxy_cancel_call (proxy, call);
|
||||
g_object_set_data (G_OBJECT (vpn_connection), CONNECTION_GET_SECRETS_CALL_TAG, NULL);
|
||||
if (priv->secrets_call) {
|
||||
dbus_g_proxy_cancel_call (proxy, priv->secrets_call);
|
||||
priv->secrets_call = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
typedef struct GetSecretsInfo {
|
||||
|
|
@ -737,7 +731,7 @@ get_secrets_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
|
|||
|
||||
priv = NM_VPN_CONNECTION_GET_PRIVATE (info->vpn_connection);
|
||||
|
||||
g_object_set_data (G_OBJECT (info->vpn_connection), CONNECTION_GET_SECRETS_CALL_TAG, NULL);
|
||||
priv->secrets_call = NULL;
|
||||
|
||||
if (!dbus_g_proxy_end_call (proxy, call, &err,
|
||||
DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, &settings,
|
||||
|
|
@ -770,7 +764,6 @@ get_connection_secrets (NMVPNConnection *vpn_connection,
|
|||
NMVPNConnectionPrivate *priv;
|
||||
DBusGProxy *secrets_proxy;
|
||||
GetSecretsInfo *info = NULL;
|
||||
DBusGProxyCall *call;
|
||||
GPtrArray *hints;
|
||||
|
||||
g_return_val_if_fail (vpn_connection != NULL, FALSE);
|
||||
|
|
@ -780,48 +773,39 @@ get_connection_secrets (NMVPNConnection *vpn_connection,
|
|||
priv = NM_VPN_CONNECTION_GET_PRIVATE (vpn_connection);
|
||||
g_assert (priv->connection);
|
||||
|
||||
secrets_proxy = g_object_get_data (G_OBJECT (priv->connection),
|
||||
NM_MANAGER_CONNECTION_SECRETS_PROXY_TAG);
|
||||
g_return_val_if_fail (secrets_proxy && DBUS_IS_G_PROXY (secrets_proxy), FALSE);
|
||||
secrets_proxy = g_object_get_data (G_OBJECT (priv->connection), NM_MANAGER_CONNECTION_SECRETS_PROXY_TAG);
|
||||
g_assert (secrets_proxy);
|
||||
|
||||
info = g_slice_new0 (GetSecretsInfo);
|
||||
g_return_val_if_fail (info != NULL, FALSE);
|
||||
|
||||
info->setting_name = g_strdup (setting_name);
|
||||
if (!info->setting_name) {
|
||||
nm_warning ("Not enough memory to get secrets");
|
||||
goto error;
|
||||
}
|
||||
|
||||
info->vpn_connection = g_object_ref (vpn_connection);
|
||||
|
||||
/* Empty for now... */
|
||||
hints = g_ptr_array_new ();
|
||||
|
||||
/* use ..._with_timeout to give the user time to enter secrets */
|
||||
call = dbus_g_proxy_begin_call_with_timeout (secrets_proxy, "GetSecrets",
|
||||
get_secrets_cb,
|
||||
info,
|
||||
free_get_secrets_info,
|
||||
G_MAXINT32,
|
||||
G_TYPE_STRING, setting_name,
|
||||
DBUS_TYPE_G_ARRAY_OF_STRING, hints,
|
||||
G_TYPE_BOOLEAN, request_new,
|
||||
G_TYPE_INVALID);
|
||||
priv->secrets_call = dbus_g_proxy_begin_call_with_timeout (secrets_proxy, "GetSecrets",
|
||||
get_secrets_cb,
|
||||
info,
|
||||
free_get_secrets_info,
|
||||
G_MAXINT32,
|
||||
G_TYPE_STRING, setting_name,
|
||||
DBUS_TYPE_G_ARRAY_OF_STRING, hints,
|
||||
G_TYPE_BOOLEAN, request_new,
|
||||
G_TYPE_INVALID);
|
||||
g_ptr_array_free (hints, TRUE);
|
||||
if (!call) {
|
||||
if (!priv->secrets_call) {
|
||||
nm_warning ("Could not call GetSecrets");
|
||||
goto error;
|
||||
}
|
||||
|
||||
g_object_set_data (G_OBJECT (vpn_connection),
|
||||
CONNECTION_GET_SECRETS_CALL_TAG,
|
||||
call);
|
||||
return TRUE;
|
||||
|
||||
error:
|
||||
if (info)
|
||||
free_get_secrets_info (info);
|
||||
cleanup_secrets_dbus_call (vpn_connection);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
|
@ -833,9 +817,7 @@ connection_need_secrets_cb (DBusGProxy *proxy,
|
|||
{
|
||||
NMVPNConnection *vpn_connection = NM_VPN_CONNECTION (user_data);
|
||||
|
||||
g_object_set_data (G_OBJECT (vpn_connection),
|
||||
CONNECTION_GET_SECRETS_CALL_TAG,
|
||||
NULL);
|
||||
cleanup_secrets_dbus_call (vpn_connection);
|
||||
|
||||
if (error) {
|
||||
g_warning ("%s.%d: NeedSecrets failed: %s %s",
|
||||
|
|
@ -876,7 +858,7 @@ connection_vpn_state_changed (NMVPNConnection *connection,
|
|||
{
|
||||
NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection);
|
||||
|
||||
clear_need_auth (connection);
|
||||
cleanup_secrets_dbus_call (connection);
|
||||
|
||||
switch (state) {
|
||||
case NM_VPN_CONNECTION_STATE_NEED_AUTH:
|
||||
|
|
@ -962,6 +944,8 @@ dispose (GObject *object)
|
|||
}
|
||||
priv->disposed = TRUE;
|
||||
|
||||
cleanup_secrets_dbus_call (NM_VPN_CONNECTION (object));
|
||||
|
||||
if (priv->parent_dev) {
|
||||
if (priv->device_monitor)
|
||||
g_signal_handler_disconnect (priv->parent_dev, priv->device_monitor);
|
||||
|
|
|
|||
Loading…
Reference in a new issue