#include <telepathy-glib/gtypes.h>
#include <telepathy-glib/proxy-subclass.h>
#include <telepathy-glib/util.h>
+#include <telepathy-glib/interfaces.h>
#include "empathy-tp-file.h"
#include "empathy-marshal.h"
/* transfer properties */
gboolean incoming;
time_t start_time;
- GArray *socket_path;
+ GArray *socket_address;
+ guint port;
guint64 offset;
/* GCancellable we're passed when offering/accepting the transfer */
priv->state = g_value_get_uint (value);
}
-static gint
-uint_compare (gconstpointer a, gconstpointer b)
-{
- const guint *uinta = a;
- const guint *uintb = b;
-
- if (*uinta == *uintb)
- return 0;
-
- return (*uinta > *uintb) ? 1 : -1;
-}
-
static void
tp_file_get_available_socket_types_cb (TpProxy *proxy,
const GValue *value,
GUINT_TO_POINTER (TP_SOCKET_ADDRESS_TYPE_IPV4))) != NULL)
{
priv->socket_address_type = TP_SOCKET_ADDRESS_TYPE_IPV4;
- g_array_sort (access_controls, uint_compare);
-
- /* here port is preferred over localhost */
- if ((g_array_index (access_controls, guint, 0) ==
- TP_SOCKET_ACCESS_CONTROL_LOCALHOST) &&
- (g_array_index (access_controls, guint, 1) ==
- TP_SOCKET_ACCESS_CONTROL_PORT))
- priv->socket_access_control = TP_SOCKET_ACCESS_CONTROL_PORT;
- else
- priv->socket_access_control =
- g_array_index (access_controls, guint, 0);
+
+ /* TODO: we should prefer PORT over LOCALHOST when the CM will
+ * support it.
+ */
+
+ priv->socket_access_control = TP_SOCKET_ACCESS_CONTROL_LOCALHOST;
}
out:
DEBUG ("Socket address type: %u, access control %u",
- priv->socket_address_type, priv->socket_access_control);
+ priv->socket_address_type, priv->socket_access_control);
}
static void
{
gint fd, domain, res = 0;
GError *error = NULL;
+ struct sockaddr *my_addr = NULL;
+ size_t my_size = 0;
EmpathyTpFilePriv *priv = GET_PRIV (tp_file);
if (priv->socket_address_type == TP_SOCKET_ADDRESS_TYPE_UNIX)
- domain = AF_UNIX;
+ {
+ domain = AF_UNIX;
+ }
+ else if (priv->socket_address_type == TP_SOCKET_ADDRESS_TYPE_IPV4)
+ {
+ domain = AF_INET;
+ }
+ else
+ {
+ error = g_error_new_literal (EMPATHY_FT_ERROR_QUARK,
+ EMPATHY_FT_ERROR_NOT_SUPPORTED, _("Socket type not supported"));
- if (priv->socket_address_type == TP_SOCKET_ADDRESS_TYPE_IPV4)
- domain = AF_INET;
+ DEBUG ("Socket not supported, closing channel");
+
+ ft_operation_close_with_error (tp_file, error);
+ g_clear_error (&error);
+
+ return;
+ }
fd = socket (domain, SOCK_STREAM, 0);
memset (&addr, 0, sizeof (addr));
addr.sun_family = domain;
- strncpy (addr.sun_path, priv->socket_path->data,
- priv->socket_path->len);
+ strncpy (addr.sun_path, priv->socket_address->data,
+ priv->socket_address->len);
- res = connect (fd, (struct sockaddr*) &addr, sizeof (addr));
+ my_addr = (struct sockaddr *) &addr;
+ my_size = sizeof (addr);
}
else if (priv->socket_address_type == TP_SOCKET_ADDRESS_TYPE_IPV4)
{
memset (&addr, 0, sizeof (addr));
addr.sin_family = domain;
- addr.sin_addr.s_addr = inet_network (priv->socket_path->data);
+ inet_pton (AF_INET, priv->socket_address->data, &addr.sin_addr);
+ addr.sin_port = htons (priv->port);
- res = connect (fd, (struct sockaddr*) &addr, sizeof (addr));
+ my_addr = (struct sockaddr *) &addr;
+ my_size = sizeof (addr);
}
+ res = connect (fd, my_addr, my_size);
+
if (res < 0)
{
int code = errno;
* data transfer but are just an observer for the channel.
*/
if (state == TP_FILE_TRANSFER_STATE_OPEN &&
- priv->socket_path != NULL)
+ priv->socket_address != NULL)
tp_file_start_transfer (EMPATHY_TP_FILE (weak_object));
if (state == TP_FILE_TRANSFER_STATE_COMPLETED)
* report the method error.
*/
g_clear_error (&myerr);
- myerr = g_error_copy (error);
}
+
+ myerr = g_error_copy (error);
}
if (myerr != NULL)
{
- DEBUG ("Error: %s", error->message);
+ DEBUG ("Error: %s", myerr->message);
ft_operation_close_with_error (tp_file, myerr);
g_clear_error (&myerr);
return;
if (G_VALUE_TYPE (address) == DBUS_TYPE_G_UCHAR_ARRAY)
{
- priv->socket_path = g_value_dup_boxed (address);
+ priv->socket_address = g_value_dup_boxed (address);
}
else if (G_VALUE_TYPE (address) == G_TYPE_STRING)
{
const gchar *path;
path = g_value_get_string (address);
- priv->socket_path = g_array_sized_new (TRUE, FALSE, sizeof (gchar),
+ priv->socket_address = g_array_sized_new (TRUE, FALSE, sizeof (gchar),
strlen (path));
- g_array_insert_vals (priv->socket_path, 0, path, strlen (path));
+ g_array_insert_vals (priv->socket_address, 0, path, strlen (path));
+ }
+ else if (G_VALUE_TYPE (address) == TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4)
+ {
+ GValueArray *val_array;
+ GValue *v;
+ const char *addr;
+
+ val_array = g_value_get_boxed (address);
+
+ /* IPV4 address */
+ v = g_value_array_get_nth (val_array, 0);
+ addr = g_value_get_string (v);
+ priv->socket_address = g_array_sized_new (TRUE, FALSE, sizeof (gchar),
+ strlen (addr));
+ g_array_insert_vals (priv->socket_address, 0, addr, strlen (addr));
+
+ /* port number */
+ v = g_value_array_get_nth (val_array, 1);
+ priv->port = g_value_get_uint (v);
}
- DEBUG ("Got socket path: %s", priv->socket_path->data);
+ DEBUG ("Got socket address: %s, port (not zero if IPV4): %d",
+ priv->socket_address->data, priv->port);
/* if the channel is already open, start the transfer now, otherwise,
* wait for the state change signal.
initialize_empty_ac_variant (TpSocketAccessControl ac,
GValue *val)
{
+ /* TODO: we will add more types here once we support PORT access control. */
if (ac == TP_SOCKET_ACCESS_CONTROL_LOCALHOST)
{
g_value_init (val, G_TYPE_STRING);
g_value_set_static_string (val, "");
}
- else if (ac == TP_SOCKET_ACCESS_CONTROL_PORT)
- {
- g_value_init (val, TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4);
- }
}
static void
DEBUG ("%p", object);
- if (priv->socket_path != NULL)
+ if (priv->socket_address != NULL)
{
- g_array_free (priv->socket_path, TRUE);
- priv->socket_path = NULL;
+ g_array_free (priv->socket_address, TRUE);
+ priv->socket_address = NULL;
}
G_OBJECT_CLASS (empathy_tp_file_parent_class)->finalize (object);
tp_cli_dbus_properties_call_get (priv->channel,
-1, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "AvailableSocketTypes",
- tp_file_get_available_socket_types_cb, NULL, NULL, file_obj);
+ tp_file_get_available_socket_types_cb, NULL, NULL, object);
priv->state_change_reason =
TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE;
projects / empathy.git / blobdiff