#include <config.h>
#include <telepathy-glib/connection.h>
+#include <telepathy-glib/proxy.h>
#include <telepathy-glib/util.h>
#include <extensions/extensions.h>
-#include "empathy-contact-factory.h"
#include "empathy-enum-types.h"
#include "empathy-tp-tube.h"
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_TP
#include "empathy-debug.h"
+typedef struct {
+ TpSocketAddressType type;
+ EmpatyTpTubeAcceptStreamTubeCb *callback;
+ gpointer user_data;
+} EmpathyTpTubeAcceptData;
+
+static EmpathyTpTubeAcceptData *
+new_empathy_tp_tube_accept_data (TpSocketAddressType type,
+ EmpatyTpTubeAcceptStreamTubeCb *callback, gpointer user_data)
+{
+ EmpathyTpTubeAcceptData *r;
+
+ r = g_slice_new0 (EmpathyTpTubeAcceptData);
+ r->type = type;
+ r->callback = callback;
+ r->user_data = user_data;
+
+ return r;
+}
+
+static void
+free_empathy_tp_tube_accept_data (gpointer data)
+{
+ g_slice_free (EmpathyTpTubeAcceptData, data);
+}
+
+
+typedef struct {
+ EmpathyTpTubeReadyCb *callback;
+ gpointer user_data;
+ GDestroyNotify destroy;
+ GObject *weak_object;
+} ReadyCbData;
+
+
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTpTube)
typedef struct
{
TpChannel *channel;
- guint initiator;
- guint type;
- gchar *service;
- GHashTable *parameters;
- guint state;
- EmpathyContact *initiator_contact;
- EmpathyContactFactory *factory;
+ EmpTubeChannelState state;
+ gboolean ready;
+ GSList *ready_callbacks;
} EmpathyTpTubePriv;
enum
static void
tp_tube_state_changed_cb (TpProxy *proxy,
- guint state,
+ EmpTubeChannelState state,
gpointer user_data,
GObject *tube)
{
EmpathyTpTubePriv *priv = GET_PRIV (tube);
+ if (!priv->ready)
+ /* We didn't get the state yet */
+ return;
+
DEBUG ("Tube state changed");
priv->state = state;
}
}
+static void weak_object_notify (gpointer data,
+ GObject *old_object);
+
+static ReadyCbData *
+ready_cb_data_new (EmpathyTpTube *self,
+ EmpathyTpTubeReadyCb *callback,
+ gpointer user_data,
+ GDestroyNotify destroy,
+ GObject *weak_object)
+{
+ ReadyCbData *d = g_slice_new0 (ReadyCbData);
+ d->callback = callback;
+ d->user_data = user_data;
+ d->destroy = destroy;
+ d->weak_object = weak_object;
+
+ if (weak_object != NULL)
+ g_object_weak_ref (weak_object, weak_object_notify, self);
+
+ return d;
+}
+
+static void
+ready_cb_data_free (ReadyCbData *data,
+ EmpathyTpTube *self)
+{
+ if (data->destroy != NULL)
+ data->destroy (data->user_data);
+
+ if (data->weak_object != NULL)
+ g_object_weak_unref (data->weak_object,
+ weak_object_notify, self);
+
+ g_slice_free (ReadyCbData, data);
+}
+
+static void
+weak_object_notify (gpointer data,
+ GObject *old_object)
+{
+ EmpathyTpTube *self = EMPATHY_TP_TUBE (data);
+ EmpathyTpTubePriv *priv = GET_PRIV (self);
+ GSList *l, *ln;
+
+ for (l = priv->ready_callbacks ; l != NULL ; l = ln )
+ {
+ ReadyCbData *d = (ReadyCbData *) l->data;
+ ln = g_slist_next (l);
+
+ if (d->weak_object == old_object)
+ {
+ ready_cb_data_free (d, self);
+ priv->ready_callbacks = g_slist_delete_link (priv->ready_callbacks,
+ l);
+ }
+ }
+}
+
+
+static void
+tube_is_ready (EmpathyTpTube *self,
+ const GError *error)
+{
+ EmpathyTpTubePriv *priv = GET_PRIV (self);
+ GSList *l;
+
+ priv->ready = TRUE;
+
+ for (l = priv->ready_callbacks ; l != NULL ; l = g_slist_next (l))
+ {
+ ReadyCbData *data = (ReadyCbData *) l->data;
+
+ data->callback (self, error, data->user_data, data->weak_object);
+ ready_cb_data_free (data, self);
+ }
+
+ g_slist_free (priv->ready_callbacks);
+ priv->ready_callbacks = NULL;
+}
+
+static void
+got_tube_state_cb (TpProxy *proxy,
+ const GValue *out_value,
+ const GError *error,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ EmpathyTpTube *self = EMPATHY_TP_TUBE (user_data);
+ EmpathyTpTubePriv *priv = GET_PRIV (self);
+
+ if (error != NULL)
+ {
+ DEBUG ("Error getting State property: %s", error->message);
+ }
+ else
+ {
+ priv->state = g_value_get_uint (out_value);
+ g_object_notify (G_OBJECT (self), "state");
+ }
+
+ tube_is_ready (self, error);
+}
+
static GObject *
tp_tube_constructor (GType type,
guint n_props,
g_signal_connect (priv->channel, "invalidated",
G_CALLBACK (tp_tube_invalidated_cb), self);
+ priv->ready = FALSE;
+
emp_cli_channel_interface_tube_connect_to_tube_channel_state_changed (
TP_PROXY (priv->channel), tp_tube_state_changed_cb, NULL, NULL,
self, NULL);
+ tp_cli_dbus_properties_call_get (priv->channel, -1,
+ EMP_IFACE_CHANNEL_INTERFACE_TUBE, "State", got_tube_state_cb,
+ self, NULL, G_OBJECT (self));
+
return self;
}
static void
tp_tube_finalize (GObject *object)
{
+ EmpathyTpTube *self = EMPATHY_TP_TUBE (object);
EmpathyTpTubePriv *priv = GET_PRIV (object);
+ GSList *l;
DEBUG ("Finalizing: %p", object);
"closing tube", NULL, NULL);
g_object_unref (priv->channel);
}
- if (priv->initiator_contact)
- g_object_unref (priv->initiator_contact);
- if (priv->factory)
- g_object_unref (priv->factory);
- g_free (priv->service);
- g_hash_table_destroy (priv->parameters);
+ for (l = priv->ready_callbacks; l != NULL; l = g_slist_next (l))
+ {
+ ReadyCbData *d = (ReadyCbData *) l->data;
+
+ ready_cb_data_free (d, self);
+ }
+
+ g_slist_free (priv->ready_callbacks);
+ priv->ready_callbacks = NULL;
G_OBJECT_CLASS (empathy_tp_tube_parent_class)->finalize (object);
}
g_object_class_install_property (object_class, PROP_CHANNEL,
g_param_spec_object ("channel", "channel", "channel", TP_TYPE_CHANNEL,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class, PROP_STATE,
- g_param_spec_uint ("state", "state", "state", 0, G_MAXUINT, 0,
- G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB));
+ g_param_spec_uint ("state", "state", "state",
+ 0, NUM_EMP_TUBE_CHANNEL_STATES, 0,
+ G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_STRINGS));
signals[DESTROY] = g_signal_new ("destroy",
G_TYPE_FROM_CLASS (klass),
EMPATHY_TYPE_TP_TUBE, EmpathyTpTubePriv);
tube->priv = priv;
-
- priv->factory = empathy_contact_factory_dup_singleton ();
}
EmpathyTpTube *
TpSocketAddressType type,
const gchar *hostname,
guint port,
- const gchar *service)
+ const gchar *service,
+ GHashTable *parameters)
{
- MissionControl *mc;
- McAccount *account;
TpConnection *connection;
TpChannel *channel;
gchar *object_path;
g_return_val_if_fail (hostname != NULL, NULL);
g_return_val_if_fail (service != NULL, NULL);
- mc = empathy_mission_control_new ();
- account = empathy_contact_get_account (contact);
- connection = mission_control_get_tpconnection (mc, account, NULL);
- g_object_unref (mc);
-
- tp_connection_run_until_ready (connection, FALSE, NULL, NULL);
+ connection = empathy_contact_get_connection (contact);
request = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
(GDestroyNotify) tp_g_value_slice_free);
dbus_g_type_struct_set (address, 0, hostname, 1, port, G_MAXUINT);
control_param = tp_g_value_slice_new (G_TYPE_STRING);
+ if (parameters == NULL)
+ /* Pass an empty dict as parameters */
+ parameters = g_hash_table_new (g_str_hash, g_str_equal);
+ else
+ g_hash_table_ref (parameters);
+
if (!emp_cli_channel_type_stream_tube_run_offer_stream_tube (
TP_PROXY(channel), -1, type, address,
- TP_SOCKET_ACCESS_CONTROL_LOCALHOST, control_param, &error, NULL))
+ TP_SOCKET_ACCESS_CONTROL_LOCALHOST, control_param, parameters,
+ &error, NULL))
{
DEBUG ("Couldn't offer tube: %s", error->message);
g_clear_error (&error);
tp_g_value_slice_free (address);
tp_g_value_slice_free (control_param);
g_object_unref (connection);
+ g_hash_table_unref (parameters);
return tube;
}
gpointer user_data,
GObject *weak_object)
{
+ EmpathyTpTube *tube = EMPATHY_TP_TUBE (weak_object);
+ EmpathyTpTubeAcceptData *data = (EmpathyTpTubeAcceptData *)user_data;
+ EmpathyTpTubeAddress eaddress;
+
+ eaddress.type = data->type;
+
if (error)
+ {
DEBUG ("Error accepting tube: %s", error->message);
+ data->callback (tube, NULL, error, data->user_data);
+ return;
+ }
+
+ switch (eaddress.type)
+ {
+ case TP_SOCKET_ADDRESS_TYPE_UNIX:
+ case TP_SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX:
+ eaddress.a.socket.path = g_value_get_boxed (address);
+ break;
+ case TP_SOCKET_ADDRESS_TYPE_IPV4:
+ case TP_SOCKET_ADDRESS_TYPE_IPV6:
+ dbus_g_type_struct_get (address,
+ 0, &eaddress.a.inet.hostname,
+ 1, &eaddress.a.inet.port, G_MAXUINT);
+ break;
+ }
+
+ data->callback (tube, &eaddress, NULL, data->user_data);
}
void
empathy_tp_tube_accept_stream_tube (EmpathyTpTube *tube,
- TpSocketAddressType type)
+ TpSocketAddressType type, EmpatyTpTubeAcceptStreamTubeCb *callback,
+ gpointer user_data)
{
EmpathyTpTubePriv *priv = GET_PRIV (tube);
GValue *control_param;
+ EmpathyTpTubeAcceptData *data;
g_return_if_fail (EMPATHY_IS_TP_TUBE (tube));
DEBUG ("Accepting stream tube");
-
+ /* FIXME allow other acls */
control_param = tp_g_value_slice_new (G_TYPE_STRING);
+
+ data = new_empathy_tp_tube_accept_data (type, callback, user_data);
+
emp_cli_channel_type_stream_tube_call_accept_stream_tube (
TP_PROXY (priv->channel), -1, type, TP_SOCKET_ACCESS_CONTROL_LOCALHOST,
- control_param, tp_tube_accept_stream_cb, NULL, NULL, G_OBJECT (tube));
+ control_param, tp_tube_accept_stream_cb, data,
+ free_empathy_tp_tube_accept_data, G_OBJECT (tube));
tp_g_value_slice_free (control_param);
}
void
-empathy_tp_tube_get_socket (EmpathyTpTube *tube,
- gchar **hostname,
- guint *port)
+empathy_tp_tube_call_when_ready (EmpathyTpTube *self,
+ EmpathyTpTubeReadyCb *callback,
+ gpointer user_data,
+ GDestroyNotify destroy,
+ GObject *weak_object)
{
- EmpathyTpTubePriv *priv = GET_PRIV (tube);
- GValue *address;
- guint address_type;
- gchar *ret_hostname = NULL;
- guint ret_port;
- GError *error = NULL;
+ EmpathyTpTubePriv *priv = GET_PRIV (self);
- g_assert_not_reached ();
+ g_return_if_fail (self != NULL);
+ g_return_if_fail (callback != NULL);
- g_return_if_fail (EMPATHY_IS_TP_TUBE (tube));
- g_return_if_fail (hostname != NULL || port != NULL);
-
- DEBUG ("Getting stream tube socket address");
-
- if (!tp_cli_channel_type_tubes_run_get_stream_tube_socket_address (priv->channel,
- -1, 0, &address_type, &address, &error, NULL))
+ if (priv->ready)
{
- DEBUG ("Couldn't get socket address: %s", error->message);
- g_clear_error (&error);
- return;
+ callback (self, NULL, user_data, weak_object);
+ if (destroy != NULL)
+ destroy (user_data);
}
-
- switch (address_type)
+ else
{
- case TP_SOCKET_ADDRESS_TYPE_UNIX:
- case TP_SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX:
- dbus_g_type_struct_get (address, 0, &ret_hostname, G_MAXUINT);
- break;
- case TP_SOCKET_ADDRESS_TYPE_IPV4:
- case TP_SOCKET_ADDRESS_TYPE_IPV6:
- dbus_g_type_struct_get (address, 0, &ret_hostname, 1, &ret_port, G_MAXUINT);
- break;
+ priv->ready_callbacks = g_slist_prepend (priv->ready_callbacks,
+ ready_cb_data_new (self, callback, user_data, destroy, weak_object));
}
-
- if (hostname) {
- *hostname = g_strdup (ret_hostname);
- }
- if (port) {
- *port = ret_port;
- }
- g_boxed_free (G_TYPE_VALUE, address);
}
-