summaryrefslogtreecommitdiff
path: root/socket/socks5.c
diff options
context:
space:
mode:
Diffstat (limited to 'socket/socks5.c')
-rw-r--r--socket/socks5.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/socket/socks5.c b/socket/socks5.c
index fd769f5..563ef25 100644
--- a/socket/socks5.c
+++ b/socket/socks5.c
@@ -78,12 +78,12 @@ struct to_be_sent {
static void socket_close (NiceSocket *sock);
static gint socket_recv_messages (NiceSocket *sock,
NiceInputMessage *recv_messages, guint n_recv_messages);
-static gint socket_send_messages (NiceSocket *sock,
+static gint socket_send_messages (NiceSocket *sock, const NiceAddress *to,
const NiceOutputMessage *messages, guint n_messages);
static gboolean socket_is_reliable (NiceSocket *sock);
-static void add_to_be_sent (NiceSocket *sock, const NiceOutputMessage *messages,
- guint n_messages);
+static void add_to_be_sent (NiceSocket *sock, const NiceAddress *to,
+ const NiceOutputMessage *messages, guint n_messages);
static void free_to_be_sent (struct to_be_sent *tbs);
@@ -419,8 +419,8 @@ socket_recv_messages (NiceSocket *sock,
}
static gint
-socket_send_messages (NiceSocket *sock, const NiceOutputMessage *messages,
- guint n_messages)
+socket_send_messages (NiceSocket *sock, const NiceAddress *to,
+ const NiceOutputMessage *messages, guint n_messages)
{
Socks5Priv *priv = sock->priv;
@@ -429,11 +429,12 @@ socket_send_messages (NiceSocket *sock, const NiceOutputMessage *messages,
if (priv->base_socket == NULL)
return FALSE;
- return nice_socket_send_messages (priv->base_socket, messages, n_messages);
+ return nice_socket_send_messages (priv->base_socket, to, messages,
+ n_messages);
} else if (priv->state == SOCKS_STATE_ERROR) {
return FALSE;
} else {
- add_to_be_sent (sock, messages, n_messages);
+ add_to_be_sent (sock, to, messages, n_messages);
}
return TRUE;
}
@@ -447,8 +448,8 @@ socket_is_reliable (NiceSocket *sock)
static void
-add_to_be_sent (NiceSocket *sock, const NiceOutputMessage *messages,
- guint n_messages)
+add_to_be_sent (NiceSocket *sock, const NiceAddress *to,
+ const NiceOutputMessage *messages, guint n_messages)
{
Socks5Priv *priv = sock->priv;
guint i;
@@ -464,8 +465,8 @@ add_to_be_sent (NiceSocket *sock, const NiceOutputMessage *messages,
/* Compact the buffer. */
tbs->buf = g_malloc (message->length);
tbs->length = message->length;
- if (message->to != NULL)
- tbs->to = *message->to;
+ if (to != NULL)
+ tbs->to = *to;
g_queue_push_tail (&priv->send_queue, tbs);
for (j = 0;