Commit b08212d0 authored by Marcus Lundblad's avatar Marcus Lundblad Committed by Youness Alaoui

Fix indentation

Remove sent_binding boolean, use current_binding_msg instead
parent e6dd9758
...@@ -90,13 +90,12 @@ typedef struct { ...@@ -90,13 +90,12 @@ typedef struct {
uint32_t ms_sequence_num; uint32_t ms_sequence_num;
bool ms_connection_id_valid; bool ms_connection_id_valid;
GList *permissions; /* the peers (NiceAddress) for which GList *permissions; /* the peers (NiceAddress) for which
there is an installed permission */ there is an installed permission */
GList *sent_permissions; /* ongoing permission installed */ GList *sent_permissions; /* ongoing permission installed */
GHashTable *send_data_queues; /* stores a send data queue for per peer */ GHashTable *send_data_queues; /* stores a send data queue for per peer */
guint permission_timeout_source; /* timer used to invalidate guint permission_timeout_source; /* timer used to invalidate
permissions */ permissions */
gboolean has_binding; gboolean has_binding;
gboolean sent_binding;
guint binding_timeout_source; guint binding_timeout_source;
} TurnPriv; } TurnPriv;
...@@ -115,9 +114,9 @@ typedef struct { ...@@ -115,9 +114,9 @@ typedef struct {
static void socket_close (NiceSocket *sock); static void socket_close (NiceSocket *sock);
static gint socket_recv (NiceSocket *sock, NiceAddress *from, static gint socket_recv (NiceSocket *sock, NiceAddress *from,
guint len, gchar *buf); guint len, gchar *buf);
static gboolean socket_send (NiceSocket *sock, const NiceAddress *to, static gboolean socket_send (NiceSocket *sock, const NiceAddress *to,
guint len, const gchar *buf); guint len, const gchar *buf);
static gboolean socket_is_reliable (NiceSocket *sock); static gboolean socket_is_reliable (NiceSocket *sock);
static void priv_process_pending_bindings (TurnPriv *priv); static void priv_process_pending_bindings (TurnPriv *priv);
...@@ -126,14 +125,14 @@ static gboolean priv_retransmissions_tick (gpointer pointer); ...@@ -126,14 +125,14 @@ static gboolean priv_retransmissions_tick (gpointer pointer);
static void priv_schedule_tick (TurnPriv *priv); static void priv_schedule_tick (TurnPriv *priv);
static void priv_send_turn_message (TurnPriv *priv, TURNMessage *msg); static void priv_send_turn_message (TurnPriv *priv, TURNMessage *msg);
static gboolean priv_send_create_permission (TurnPriv *priv, static gboolean priv_send_create_permission (TurnPriv *priv,
uint8_t *realm, gsize realm_len, uint8_t *realm, gsize realm_len,
uint8_t *nonce, gsize nonce_len, uint8_t *nonce, gsize nonce_len,
const NiceAddress *peer); const NiceAddress *peer);
static gboolean priv_send_channel_bind (TurnPriv *priv, StunMessage *resp, static gboolean priv_send_channel_bind (TurnPriv *priv, StunMessage *resp,
uint16_t channel, uint16_t channel,
const NiceAddress *peer); const NiceAddress *peer);
static gboolean priv_add_channel_binding (TurnPriv *priv, static gboolean priv_add_channel_binding (TurnPriv *priv,
const NiceAddress *peer); const NiceAddress *peer);
static gboolean priv_forget_send_request (gpointer pointer); static gboolean priv_forget_send_request (gpointer pointer);
static guint static guint
...@@ -163,9 +162,9 @@ priv_send_data_queue_destroy (gpointer data) ...@@ -163,9 +162,9 @@ priv_send_data_queue_destroy (gpointer data)
NiceSocket * NiceSocket *
nice_turn_socket_new (NiceAgent *agent, NiceAddress *addr, nice_turn_socket_new (NiceAgent *agent, NiceAddress *addr,
NiceSocket *base_socket, NiceAddress *server_addr, NiceSocket *base_socket, NiceAddress *server_addr,
gchar *username, gchar *password, gchar *username, gchar *password,
NiceTurnSocketCompatibility compatibility) NiceTurnSocketCompatibility compatibility)
{ {
TurnPriv *priv = g_new0 (TurnPriv, 1); TurnPriv *priv = g_new0 (TurnPriv, 1);
NiceSocket *sock = g_slice_new0 (NiceSocket); NiceSocket *sock = g_slice_new0 (NiceSocket);
...@@ -177,18 +176,18 @@ nice_turn_socket_new (NiceAgent *agent, NiceAddress *addr, ...@@ -177,18 +176,18 @@ nice_turn_socket_new (NiceAgent *agent, NiceAddress *addr,
if (compatibility == NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9 || if (compatibility == NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9 ||
compatibility == NICE_TURN_SOCKET_COMPATIBILITY_RFC5766) { compatibility == NICE_TURN_SOCKET_COMPATIBILITY_RFC5766) {
stun_agent_init (&priv->agent, STUN_ALL_KNOWN_ATTRIBUTES, stun_agent_init (&priv->agent, STUN_ALL_KNOWN_ATTRIBUTES,
STUN_COMPATIBILITY_RFC5389, STUN_COMPATIBILITY_RFC5389,
STUN_AGENT_USAGE_LONG_TERM_CREDENTIALS); STUN_AGENT_USAGE_LONG_TERM_CREDENTIALS);
} else if (compatibility == NICE_TURN_SOCKET_COMPATIBILITY_MSN) { } else if (compatibility == NICE_TURN_SOCKET_COMPATIBILITY_MSN) {
stun_agent_init (&priv->agent, STUN_ALL_KNOWN_ATTRIBUTES, stun_agent_init (&priv->agent, STUN_ALL_KNOWN_ATTRIBUTES,
STUN_COMPATIBILITY_RFC3489, STUN_COMPATIBILITY_RFC3489,
STUN_AGENT_USAGE_SHORT_TERM_CREDENTIALS | STUN_AGENT_USAGE_SHORT_TERM_CREDENTIALS |
STUN_AGENT_USAGE_NO_INDICATION_AUTH); STUN_AGENT_USAGE_NO_INDICATION_AUTH);
} else if (compatibility == NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE) { } else if (compatibility == NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE) {
stun_agent_init (&priv->agent, STUN_ALL_KNOWN_ATTRIBUTES, stun_agent_init (&priv->agent, STUN_ALL_KNOWN_ATTRIBUTES,
STUN_COMPATIBILITY_RFC3489, STUN_COMPATIBILITY_RFC3489,
STUN_AGENT_USAGE_SHORT_TERM_CREDENTIALS | STUN_AGENT_USAGE_SHORT_TERM_CREDENTIALS |
STUN_AGENT_USAGE_IGNORE_CREDENTIALS); STUN_AGENT_USAGE_IGNORE_CREDENTIALS);
} else if (compatibility == NICE_TURN_SOCKET_COMPATIBILITY_OC2007) { } else if (compatibility == NICE_TURN_SOCKET_COMPATIBILITY_OC2007) {
stun_agent_init (&priv->agent, STUN_ALL_KNOWN_ATTRIBUTES, stun_agent_init (&priv->agent, STUN_ALL_KNOWN_ATTRIBUTES,
STUN_COMPATIBILITY_OC2007, STUN_COMPATIBILITY_OC2007,
...@@ -223,9 +222,9 @@ nice_turn_socket_new (NiceAgent *agent, NiceAddress *addr, ...@@ -223,9 +222,9 @@ nice_turn_socket_new (NiceAgent *agent, NiceAddress *addr,
priv->send_data_queues = priv->send_data_queues =
g_hash_table_new_full (priv_nice_address_hash, g_hash_table_new_full (priv_nice_address_hash,
(GEqualFunc) nice_address_equal, (GEqualFunc) nice_address_equal,
(GDestroyNotify) nice_address_free, (GDestroyNotify) nice_address_free,
priv_send_data_queue_destroy); priv_send_data_queue_destroy);
sock->addr = *addr; sock->addr = *addr;
sock->fileno = base_socket->fileno; sock->fileno = base_socket->fileno;
sock->send = socket_send; sock->send = socket_send;
...@@ -251,7 +250,7 @@ socket_close (NiceSocket *sock) ...@@ -251,7 +250,7 @@ socket_close (NiceSocket *sock)
g_list_free (priv->channels); g_list_free (priv->channels);
g_list_foreach (priv->pending_bindings, (GFunc) nice_address_free, g_list_foreach (priv->pending_bindings, (GFunc) nice_address_free,
NULL); NULL);
g_list_free (priv->pending_bindings); g_list_free (priv->pending_bindings);
if (priv->tick_source_channel_bind != NULL) { if (priv->tick_source_channel_bind != NULL) {
...@@ -298,12 +297,12 @@ socket_recv (NiceSocket *sock, NiceAddress *from, guint len, gchar *buf) ...@@ -298,12 +297,12 @@ socket_recv (NiceSocket *sock, NiceAddress *from, guint len, gchar *buf)
nice_debug ("received message on TURN socket"); nice_debug ("received message on TURN socket");
recv_len = nice_socket_recv (priv->base_socket, &recv_from, recv_len = nice_socket_recv (priv->base_socket, &recv_from,
sizeof(recv_buf), (gchar *) recv_buf); sizeof(recv_buf), (gchar *) recv_buf);
if (recv_len > 0) if (recv_len > 0)
return nice_turn_socket_parse_recv (sock, &dummy, from, len, buf, return nice_turn_socket_parse_recv (sock, &dummy, from, len, buf,
&recv_from, (gchar *) recv_buf, &recv_from, (gchar *) recv_buf,
(guint) recv_len); (guint) recv_len);
else else
return recv_len; return recv_len;
} }
...@@ -339,7 +338,7 @@ static gboolean ...@@ -339,7 +338,7 @@ static gboolean
priv_has_permission_for_peer (TurnPriv *priv, const NiceAddress *to) priv_has_permission_for_peer (TurnPriv *priv, const NiceAddress *to)
{ {
GList *found = g_list_find_custom (priv->permissions, to, GList *found = g_list_find_custom (priv->permissions, to,
(GCompareFunc) nice_address_equal); (GCompareFunc) nice_address_equal);
return found != NULL; return found != NULL;
} }
...@@ -348,12 +347,12 @@ static gboolean ...@@ -348,12 +347,12 @@ static gboolean
priv_has_sent_permission_for_peer (TurnPriv *priv, const NiceAddress *to) priv_has_sent_permission_for_peer (TurnPriv *priv, const NiceAddress *to)
{ {
return g_list_find_custom (priv->sent_permissions, to, return g_list_find_custom (priv->sent_permissions, to,
(GCompareFunc) nice_address_equal) != NULL; (GCompareFunc) nice_address_equal) != NULL;
} }
static void static void
socket_enqueue_data(TurnPriv *priv, const NiceAddress *to, socket_enqueue_data(TurnPriv *priv, const NiceAddress *to,
guint len, const gchar *buf) guint len, const gchar *buf)
{ {
SendData *data = g_slice_new0 (SendData); SendData *data = g_slice_new0 (SendData);
GQueue *queue = g_hash_table_lookup (priv->send_data_queues, to); GQueue *queue = g_hash_table_lookup (priv->send_data_queues, to);
...@@ -361,7 +360,7 @@ socket_enqueue_data(TurnPriv *priv, const NiceAddress *to, ...@@ -361,7 +360,7 @@ socket_enqueue_data(TurnPriv *priv, const NiceAddress *to,
if (queue == NULL) { if (queue == NULL) {
queue = g_queue_new (); queue = g_queue_new ();
g_hash_table_insert (priv->send_data_queues, nice_address_dup (to), g_hash_table_insert (priv->send_data_queues, nice_address_dup (to),
queue); queue);
} }
data->data = g_memdup(buf, len); data->data = g_memdup(buf, len);
...@@ -377,7 +376,7 @@ socket_dequeue_all_data (TurnPriv *priv, const NiceAddress *to) ...@@ -377,7 +376,7 @@ socket_dequeue_all_data (TurnPriv *priv, const NiceAddress *to)
if (send_queue) { if (send_queue) {
while (!g_queue_is_empty (send_queue)) { while (!g_queue_is_empty (send_queue)) {
SendData *data = SendData *data =
(SendData *) g_queue_pop_head(send_queue); (SendData *) g_queue_pop_head(send_queue);
nice_debug("dequeing data enqueued when installing permission or binding"); nice_debug("dequeing data enqueued when installing permission or binding");
nice_socket_send (priv->base_socket, to, data->data_len, data->data); nice_socket_send (priv->base_socket, to, data->data_len, data->data);
...@@ -394,7 +393,7 @@ socket_dequeue_all_data (TurnPriv *priv, const NiceAddress *to) ...@@ -394,7 +393,7 @@ socket_dequeue_all_data (TurnPriv *priv, const NiceAddress *to)
static gboolean static gboolean
socket_send (NiceSocket *sock, const NiceAddress *to, socket_send (NiceSocket *sock, const NiceAddress *to,
guint len, const gchar *buf) guint len, const gchar *buf)
{ {
TurnPriv *priv = (TurnPriv *) sock->priv; TurnPriv *priv = (TurnPriv *) sock->priv;
StunMessage msg; StunMessage msg;
...@@ -435,30 +434,30 @@ socket_send (NiceSocket *sock, const NiceAddress *to, ...@@ -435,30 +434,30 @@ socket_send (NiceSocket *sock, const NiceAddress *to,
if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9 || if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9 ||
priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_RFC5766) { priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_RFC5766) {
if (!stun_agent_init_indication (&priv->agent, &msg, if (!stun_agent_init_indication (&priv->agent, &msg,
buffer, sizeof(buffer), STUN_IND_SEND)) buffer, sizeof(buffer), STUN_IND_SEND))
goto send; goto send;
if (stun_message_append_xor_addr (&msg, STUN_ATTRIBUTE_PEER_ADDRESS, if (stun_message_append_xor_addr (&msg, STUN_ATTRIBUTE_PEER_ADDRESS,
(struct sockaddr *)&sa, sizeof(sa)) != (struct sockaddr *)&sa, sizeof(sa)) !=
STUN_MESSAGE_RETURN_SUCCESS) STUN_MESSAGE_RETURN_SUCCESS)
goto send; goto send;
} else { } else {
if (!stun_agent_init_request (&priv->agent, &msg, if (!stun_agent_init_request (&priv->agent, &msg,
buffer, sizeof(buffer), STUN_SEND)) buffer, sizeof(buffer), STUN_SEND))
goto send; goto send;
if (stun_message_append32 (&msg, STUN_ATTRIBUTE_MAGIC_COOKIE, if (stun_message_append32 (&msg, STUN_ATTRIBUTE_MAGIC_COOKIE,
TURN_MAGIC_COOKIE) != TURN_MAGIC_COOKIE) !=
STUN_MESSAGE_RETURN_SUCCESS) STUN_MESSAGE_RETURN_SUCCESS)
goto send; goto send;
if (priv->username != NULL && priv->username_len > 0) { if (priv->username != NULL && priv->username_len > 0) {
if (stun_message_append_bytes (&msg, STUN_ATTRIBUTE_USERNAME, if (stun_message_append_bytes (&msg, STUN_ATTRIBUTE_USERNAME,
priv->username, priv->username_len) != priv->username, priv->username_len) !=
STUN_MESSAGE_RETURN_SUCCESS) STUN_MESSAGE_RETURN_SUCCESS)
goto send; goto send;
} }
if (stun_message_append_addr (&msg, STUN_ATTRIBUTE_DESTINATION_ADDRESS, if (stun_message_append_addr (&msg, STUN_ATTRIBUTE_DESTINATION_ADDRESS,
(struct sockaddr *)&sa, (struct sockaddr *)&sa,
sizeof(sa)) != STUN_MESSAGE_RETURN_SUCCESS) sizeof(sa)) != STUN_MESSAGE_RETURN_SUCCESS)
goto send; goto send;
if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE && if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE &&
...@@ -479,20 +478,20 @@ socket_send (NiceSocket *sock, const NiceAddress *to, ...@@ -479,20 +478,20 @@ socket_send (NiceSocket *sock, const NiceAddress *to,
} }
if (stun_message_append_bytes (&msg, STUN_ATTRIBUTE_DATA, if (stun_message_append_bytes (&msg, STUN_ATTRIBUTE_DATA,
buf, len) != STUN_MESSAGE_RETURN_SUCCESS) buf, len) != STUN_MESSAGE_RETURN_SUCCESS)
goto send; goto send;
msg_len = stun_agent_finish_message (&priv->agent, &msg, msg_len = stun_agent_finish_message (&priv->agent, &msg,
priv->password, priv->password_len); priv->password, priv->password_len);
if (msg_len > 0 && stun_message_get_class (&msg) == STUN_REQUEST) { if (msg_len > 0 && stun_message_get_class (&msg) == STUN_REQUEST) {
SendRequest *req = g_slice_new0 (SendRequest); SendRequest *req = g_slice_new0 (SendRequest);
req->priv = priv; req->priv = priv;
stun_message_id (&msg, req->id); stun_message_id (&msg, req->id);
req->source = agent_timeout_add_with_context (priv->nice, req->source = agent_timeout_add_with_context (priv->nice,
STUN_END_TIMEOUT, STUN_END_TIMEOUT,
priv_forget_send_request, priv_forget_send_request,
req); req);
g_queue_push_tail (priv->send_requests, req); g_queue_push_tail (priv->send_requests, req);
} }
} }
...@@ -500,26 +499,26 @@ socket_send (NiceSocket *sock, const NiceAddress *to, ...@@ -500,26 +499,26 @@ socket_send (NiceSocket *sock, const NiceAddress *to,
if (msg_len > 0) { if (msg_len > 0) {
if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_RFC5766) { if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_RFC5766) {
if (!priv_has_permission_for_peer (priv, to) && if (!priv_has_permission_for_peer (priv, to) &&
!priv_has_sent_permission_for_peer (priv, to)) { !priv_has_sent_permission_for_peer (priv, to)) {
nice_debug ("no permission installed for peer"); nice_debug ("no permission installed for peer");
priv_send_create_permission(priv, NULL, 0, NULL, 0, to); priv_send_create_permission(priv, NULL, 0, NULL, 0, to);
} }
} }
if (!priv->has_binding && !priv->sent_binding && binding) { if (!priv->has_binding && !priv->current_binding_msg && binding) {
nice_debug("renewing channel binding"); nice_debug("renewing channel binding");
priv_send_channel_bind (priv, NULL, binding->channel, to); priv_send_channel_bind (priv, NULL, binding->channel, to);
} }
if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_RFC5766 && if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_RFC5766 &&
!priv_has_permission_for_peer (priv, to)) { !priv_has_permission_for_peer (priv, to)) {
/* enque data */ /* enque data */
nice_debug("enqueing data to be sent when aquiring permission or binding"); nice_debug("enqueing data to be sent when aquiring permission or binding");
socket_enqueue_data(priv, to, msg_len, (gchar *)buffer); socket_enqueue_data(priv, to, msg_len, (gchar *)buffer);
return TRUE; return TRUE;
} else { } else {
return nice_socket_send (priv->base_socket, &priv->server_addr, return nice_socket_send (priv->base_socket, &priv->server_addr,
msg_len, (gchar *)buffer); msg_len, (gchar *)buffer);
} }
} }
send: send:
...@@ -542,7 +541,7 @@ priv_forget_send_request (gpointer pointer) ...@@ -542,7 +541,7 @@ priv_forget_send_request (gpointer pointer)
if (g_source_is_destroyed (g_main_current_source ())) { if (g_source_is_destroyed (g_main_current_source ())) {
nice_debug ("Source was destroyed. " nice_debug ("Source was destroyed. "
"Avoided race condition in turn.c:priv_forget_send_request"); "Avoided race condition in turn.c:priv_forget_send_request");
agent_unlock (); agent_unlock ();
return FALSE; return FALSE;
} }
...@@ -596,8 +595,8 @@ priv_binding_timeout (gpointer data) ...@@ -596,8 +595,8 @@ priv_binding_timeout (gpointer data)
gint gint
nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock, nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
NiceAddress *from, guint len, gchar *buf, NiceAddress *from, guint len, gchar *buf,
NiceAddress *recv_from, gchar *recv_buf, guint recv_len) NiceAddress *recv_from, gchar *recv_buf, guint recv_len)
{ {
TurnPriv *priv = (TurnPriv *) sock->priv; TurnPriv *priv = (TurnPriv *) sock->priv;
...@@ -610,15 +609,15 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock, ...@@ -610,15 +609,15 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
if (nice_address_equal (&priv->server_addr, recv_from)) { if (nice_address_equal (&priv->server_addr, recv_from)) {
valid = stun_agent_validate (&priv->agent, &msg, valid = stun_agent_validate (&priv->agent, &msg,
(uint8_t *) recv_buf, (size_t) recv_len, NULL, (uint8_t *) recv_buf, (size_t) recv_len, NULL,
NULL); NULL);
if (valid == STUN_VALIDATION_SUCCESS) { if (valid == STUN_VALIDATION_SUCCESS) {
if (priv->compatibility != NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9 && if (priv->compatibility != NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9 &&
priv->compatibility != NICE_TURN_SOCKET_COMPATIBILITY_RFC5766) { priv->compatibility != NICE_TURN_SOCKET_COMPATIBILITY_RFC5766) {
uint32_t cookie; uint32_t cookie;
if (stun_message_find32 (&msg, STUN_ATTRIBUTE_MAGIC_COOKIE, if (stun_message_find32 (&msg, STUN_ATTRIBUTE_MAGIC_COOKIE,
&cookie) != STUN_MESSAGE_RETURN_SUCCESS) &cookie) != STUN_MESSAGE_RETURN_SUCCESS)
goto recv; goto recv;
if (cookie != TURN_MAGIC_COOKIE) if (cookie != TURN_MAGIC_COOKIE)
goto recv; goto recv;
...@@ -665,7 +664,7 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock, ...@@ -665,7 +664,7 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
stun_message_id (&msg, response_id); stun_message_id (&msg, response_id);
stun_message_id (&priv->current_binding_msg->message, request_id); stun_message_id (&priv->current_binding_msg->message, request_id);
if (memcmp (request_id, response_id, if (memcmp (request_id, response_id,
sizeof(StunTransactionId)) == 0) { sizeof(StunTransactionId)) == 0) {
g_free (priv->current_binding_msg); g_free (priv->current_binding_msg);
priv->current_binding_msg = NULL; priv->current_binding_msg = NULL;
...@@ -689,72 +688,72 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock, ...@@ -689,72 +688,72 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
stun_message_id (&msg, response_id); stun_message_id (&msg, response_id);
stun_message_id (&priv->current_binding_msg->message, request_id); stun_message_id (&priv->current_binding_msg->message, request_id);
if (memcmp (request_id, response_id, if (memcmp (request_id, response_id,
sizeof(StunTransactionId)) == 0) { sizeof(StunTransactionId)) == 0) {
if (stun_message_get_class (&msg) == STUN_ERROR) { if (stun_message_get_class (&msg) == STUN_ERROR) {
int code = -1; int code = -1;
uint8_t *sent_realm = NULL; uint8_t *sent_realm = NULL;
uint8_t *recv_realm = NULL; uint8_t *recv_realm = NULL;
uint16_t sent_realm_len = 0; uint16_t sent_realm_len = 0;
uint16_t recv_realm_len = 0; uint16_t recv_realm_len = 0;
sent_realm = sent_realm =
(uint8_t *) stun_message_find ( (uint8_t *) stun_message_find (
&priv->current_binding_msg->message, &priv->current_binding_msg->message,
STUN_ATTRIBUTE_REALM, &sent_realm_len); STUN_ATTRIBUTE_REALM, &sent_realm_len);
recv_realm = recv_realm =
(uint8_t *) stun_message_find (&msg, (uint8_t *) stun_message_find (&msg,
STUN_ATTRIBUTE_REALM, &recv_realm_len); STUN_ATTRIBUTE_REALM, &recv_realm_len);
if (!priv->has_binding) { if (!priv->has_binding) {
nice_debug ("sent realm: %s\n", sent_realm); nice_debug ("sent realm: %s\n", sent_realm);
nice_debug ("recv realm: %s\n", recv_realm); nice_debug ("recv realm: %s\n", recv_realm);
} }
/* check for unauthorized error response */ /* check for unauthorized error response */
if (stun_message_find_error (&msg, &code) == if (stun_message_find_error (&msg, &code) ==
STUN_MESSAGE_RETURN_SUCCESS && STUN_MESSAGE_RETURN_SUCCESS &&
(code == 438 || (code == 401 && (code == 438 || (code == 401 &&
!(recv_realm != NULL && !(recv_realm != NULL &&
recv_realm_len > 0 && recv_realm_len > 0 &&
recv_realm_len == sent_realm_len && recv_realm_len == sent_realm_len &&
sent_realm != NULL && sent_realm != NULL &&
memcmp (sent_realm, recv_realm, memcmp (sent_realm, recv_realm,
sent_realm_len) == 0)))) { sent_realm_len) == 0)))) {
if (priv->current_binding) { if (priv->current_binding) {
g_free (priv->current_binding_msg); g_free (priv->current_binding_msg);
priv->current_binding_msg = NULL; priv->current_binding_msg = NULL;
priv_send_channel_bind (priv, &msg, priv_send_channel_bind (priv, &msg,
priv->current_binding->channel, priv->current_binding->channel,
&priv->current_binding->peer); &priv->current_binding->peer);
} else { } else {
/* look up binding associated with peer */ /* look up binding associated with peer */
GList *i = priv->channels; GList *i = priv->channels;
ChannelBinding *binding = NULL; ChannelBinding *binding = NULL;
struct sockaddr sa; struct sockaddr sa;
socklen_t sa_len = sizeof(sa); socklen_t sa_len = sizeof(sa);
NiceAddress to; NiceAddress to;
stun_message_find_xor_addr (&priv->current_binding_msg->message, stun_message_find_xor_addr (&priv->current_binding_msg->message,
STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &sa, STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &sa,
&sa_len); &sa_len);
nice_address_set_from_sockaddr (&to, &sa); nice_address_set_from_sockaddr (&to, &sa);
for (; i; i = i->next) { for (; i; i = i->next) {
ChannelBinding *b = i->data; ChannelBinding *b = i->data;
if (nice_address_equal (&b->peer, &to)) { if (nice_address_equal (&b->peer, &to)) {
binding = b; binding = b;
break; break;
} }
} }
g_free (priv->current_binding_msg); g_free (priv->current_binding_msg);
priv->current_binding_msg = NULL; priv->current_binding_msg = NULL;
if (binding) if (binding)
priv_send_channel_bind (priv, &msg, binding->channel, &to); priv_send_channel_bind (priv, &msg, binding->channel, &to);
} }
} else { } else {
g_free (priv->current_binding); g_free (priv->current_binding);
priv->current_binding = NULL; priv->current_binding = NULL;
g_free (priv->current_binding_msg); g_free (priv->current_binding_msg);
...@@ -764,123 +763,123 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock, ...@@ -764,123 +763,123 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
} else if (stun_message_get_class (&msg) == STUN_RESPONSE) { } else if (stun_message_get_class (&msg) == STUN_RESPONSE) {
g_free (priv->current_binding_msg); g_free (priv->current_binding_msg);
priv->current_binding_msg = NULL; priv->current_binding_msg = NULL;
priv->has_binding = TRUE; priv->has_binding = TRUE;
priv->sent_binding = FALSE;
if (priv->current_binding) { if (priv->current_binding) {
priv->channels = g_list_append (priv->channels, priv->channels = g_list_append (priv->channels,
priv->current_binding); priv->current_binding);
priv->current_binding = NULL; priv->current_binding = NULL;
} }
priv_process_pending_bindings (priv); priv_process_pending_bindings (priv);
/* install timer to schedule refresh of the permission */ /* install timer to schedule refresh of the permission */
if (!priv->binding_timeout_source) { if (!priv->binding_timeout_source) {
priv->binding_timeout_source = priv->binding_timeout_source =
g_timeout_add_seconds (STUN_BINDING_TIMEOUT, g_timeout_add_seconds (STUN_BINDING_TIMEOUT,
priv_binding_timeout, priv); priv_binding_timeout, priv);
} }
} }
} }
} }
return 0; return 0;
} else if (stun_message_get_method (&msg) == STUN_CREATEPERMISSION) { } else if (stun_message_get_method (&msg) == STUN_CREATEPERMISSION) {
StunTransactionId request_id; StunTransactionId request_id;
StunTransactionId response_id; StunTransactionId response_id;
if (priv->current_create_permission_msg) { if (priv->current_create_permission_msg) {
stun_message_id (&msg, response_id); stun_message_id (&msg, response_id);
stun_message_id (&priv->current_create_permission_msg->message, stun_message_id (&priv->current_create_permission_msg->message,
request_id); request_id);
if (memcmp (request_id, response_id, sizeof(StunTransactionId)) == 0) { if (memcmp (request_id, response_id, sizeof(StunTransactionId)) == 0) {
struct sockaddr peer; struct sockaddr peer;
socklen_t peer_len = sizeof(peer); socklen_t peer_len = sizeof(peer);
int code = -1; int code = -1;
NiceAddress *to = nice_address_new ();; NiceAddress *to = nice_address_new ();;
nice_debug("got response for CreatePermission"); nice_debug("got response for CreatePermission");
stun_message_find_xor_addr (&priv->current_create_permission_msg->message, stun_message_find_xor_addr (&priv->current_create_permission_msg->message,
STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &peer, STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &peer,
&peer_len); &peer_len);
nice_address_set_from_sockaddr (to, &peer); nice_address_set_from_sockaddr (to, &peer);
g_free (priv->current_create_permission_msg); g_free (priv->current_create_permission_msg);
priv->current_create_permission_msg = NULL; priv->current_create_permission_msg = NULL;
/* unathorized => resend with realm and nonce) */ /* unathorized => resend with realm and nonce) */
if (stun_message_get_class (&msg) == STUN_ERROR && if (stun_message_get_class (&msg) == STUN_ERROR &&
stun_message_find_error (&msg, &code) == stun_message_find_error (&msg, &code) ==
STUN_MESSAGE_RETURN_SUCCESS && STUN_MESSAGE_RETURN_SUCCESS &&
(code == 438 || (code == 401))) { (code == 438 || (code == 401))) {
uint8_t *recv_realm = NULL; uint8_t *recv_realm = NULL;
uint16_t recv_realm_len = 0; uint16_t recv_realm_len = 0;
uint8_t *recv_nonce = NULL; uint8_t *recv_nonce = NULL;
uint16_t recv_nonce_len = 0; uint16_t recv_nonce_len = 0;
recv_realm = (uint8_t *) stun_message_find (&msg, recv_realm = (uint8_t *) stun_message_find (&msg,
STUN_ATTRIBUTE_REALM, &recv_realm_len); STUN_ATTRIBUTE_REALM, &recv_realm_len);
recv_nonce = (uint8_t *) stun_message_find (&msg, recv_nonce = (uint8_t *) stun_message_find (&msg,
STUN_ATTRIBUTE_NONCE, &recv_nonce_len); STUN_ATTRIBUTE_NONCE, &recv_nonce_len);
nice_debug("got realm: %s", recv_realm); nice_debug("got realm: %s", recv_realm);
nice_debug("got nonce: %s", recv_nonce); nice_debug("got nonce: %s", recv_nonce);
/* resend CreatePermission */ /* resend CreatePermission */
priv_send_create_permission (priv, recv_realm, recv_realm_len, priv_send_create_permission (priv, recv_realm, recv_realm_len,
recv_nonce, recv_nonce_len, to); recv_nonce, recv_nonce_len, to);
nice_address_free (to); nice_address_free (to);
} else { } else {
/* we now have a permission installed for this peer */ /* we now have a permission installed for this peer */
GList *sent_permission = GList *sent_permission =
g_list_find_custom (priv->sent_permissions, to, g_list_find_custom (priv->sent_permissions, to,
(GCompareFunc) nice_address_equal); (GCompareFunc) nice_address_equal);
priv->permissions = priv->permissions =
g_list_append (priv->permissions, to); g_list_append (priv->permissions, to);
if (sent_permission) { if (sent_permission) {
nice_address_free ((NiceAddress *) sent_permission->data); nice_address_free ((NiceAddress *) sent_permission->data);
priv->sent_permissions = priv->sent_permissions =
g_list_remove_link (priv->sent_permissions, sent_permission); g_list_remove_link (priv->sent_permissions, sent_permission);
} }
/* install timer to schedule refresh of the permission */ /* install timer to schedule refresh of the permission */
/* (will not schedule refresh if we got an error) */ /* (will not schedule refresh if we got an error) */
if (stun_message_get_class (&msg) == STUN_RESPONSE && if (stun_message_get_class (&msg) == STUN_RESPONSE &&
!priv->permission_timeout_source) { !priv->permission_timeout_source) {
priv->permission_timeout_source = priv->permission_timeout_source =
g_timeout_add_seconds (STUN_PERMISSION_TIMEOUT, g_timeout_add_seconds (STUN_PERMISSION_TIMEOUT,
priv_permission_timeout, priv); priv_permission_timeout, priv);
} }
/* send enqued data */ /* send enqued data */
nice_debug("about to dequeue data"); nice_debug("about to dequeue data");
socket_dequeue_all_data (priv, to); socket_dequeue_all_data (priv, to);
} }
} }
} }
return 0; return 0;
} else if (stun_message_get_class (&msg) == STUN_INDICATION && } else if (stun_message_get_class (&msg) == STUN_INDICATION &&
stun_message_get_method (&msg) == STUN_IND_DATA) { stun_message_get_method (&msg) == STUN_IND_DATA) {
uint16_t data_len; uint16_t data_len;
uint8_t *data; uint8_t *data;
if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9 || if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9 ||
priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_RFC5766) { priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_RFC5766) {
if (stun_message_find_xor_addr (&msg, STUN_ATTRIBUTE_REMOTE_ADDRESS, if (stun_message_find_xor_addr (&msg, STUN_ATTRIBUTE_REMOTE_ADDRESS,
(struct sockaddr *)&sa, &from_len) != (struct sockaddr *)&sa, &from_len) !=
STUN_MESSAGE_RETURN_SUCCESS) STUN_MESSAGE_RETURN_SUCCESS)
goto recv; goto recv;
} else { } else {
if (stun_message_find_addr (&msg, STUN_ATTRIBUTE_REMOTE_ADDRESS, if (stun_message_find_addr (&msg, STUN_ATTRIBUTE_REMOTE_ADDRESS,
(struct sockaddr *)&sa, &from_len) != (struct sockaddr *)&sa, &from_len) !=
STUN_MESSAGE_RETURN_SUCCESS) STUN_MESSAGE_RETURN_SUCCESS)
goto recv; goto recv;
} }
data = (uint8_t *) stun_message_find (&msg, STUN_ATTRIBUTE_DATA, data = (uint8_t *) stun_message_find (&msg, STUN_ATTRIBUTE_DATA,
&data_len); &data_len);
if (data == NULL) if (data == NULL)
goto recv; goto recv;
...@@ -968,26 +967,26 @@ priv_retransmissions_tick_unlocked (TurnPriv *priv) ...@@ -968,26 +967,26 @@ priv_retransmissions_tick_unlocked (TurnPriv *priv)
switch (stun_timer_refresh (&priv->current_binding_msg->timer)) { switch (stun_timer_refresh (&priv->current_binding_msg->timer)) {
case STUN_USAGE_TIMER_RETURN_TIMEOUT: case STUN_USAGE_TIMER_RETURN_TIMEOUT:
{ {
/* Time out */ /* Time out */
StunTransactionId id; StunTransactionId id;
stun_message_id (&priv->current_binding_msg->message, id); stun_message_id (&priv->current_binding_msg->message, id);
stun_agent_forget_transaction (&priv->agent, id); stun_agent_forget_transaction (&priv->agent, id);
g_free (priv->current_binding); g_free (priv->current_binding);
priv->current_binding = NULL; priv->current_binding = NULL;
g_free (priv->current_binding_msg); g_free (priv->current_binding_msg);
priv->current_binding_msg = NULL; priv->current_binding_msg = NULL;
priv_process_pending_bindings (priv); priv_process_pending_bindings (priv);
break; break;
} }
case STUN_USAGE_TIMER_RETURN_RETRANSMIT: case STUN_USAGE_TIMER_RETURN_RETRANSMIT:
/* Retransmit */ /* Retransmit */
nice_socket_send (priv->base_socket, &priv->server_addr, nice_socket_send (priv->base_socket, &priv->server_addr,
stun_message_length (&priv->current_binding_msg->message), stun_message_length (&priv->current_binding_msg->message),
(gchar *)priv->current_binding_msg->buffer); (gchar *)priv->current_binding_msg->buffer);
break; break;
case STUN_USAGE_TIMER_RETURN_SUCCESS: case STUN_USAGE_TIMER_RETURN_SUCCESS:
break; break;
...@@ -1005,47 +1004,47 @@ priv_retransmissions_create_permission_tick_unlocked (TurnPriv *priv) ...@@ -1005,47 +1004,47 @@ priv_retransmissions_create_permission_tick_unlocked (TurnPriv *priv)
switch (stun_timer_refresh (&priv->current_create_permission_msg->timer)) { switch (stun_timer_refresh (&priv->current_create_permission_msg->timer)) {
case STUN_USAGE_TIMER_RETURN_TIMEOUT: case STUN_USAGE_TIMER_RETURN_TIMEOUT:
{ {
/* Time out */ /* Time out */
StunTransactionId id; StunTransactionId id;
NiceAddress *to = nice_address_new (); NiceAddress *to = nice_address_new ();
struct sockaddr addr; struct sockaddr addr;
socklen_t addr_len = sizeof(addr); socklen_t addr_len = sizeof(addr);
GList *sent_permission; GList *sent_permission;
stun_message_id (&priv->current_create_permission_msg->message, id); stun_message_id (&priv->current_create_permission_msg->message, id);
stun_agent_forget_transaction (&priv->agent, id); stun_agent_forget_transaction (&priv->agent, id);
stun_message_find_xor_addr (&priv->current_create_permission_msg->message, stun_message_find_xor_addr (&priv->current_create_permission_msg->message,
STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &addr, STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &addr,
&addr_len); &addr_len);
nice_address_set_from_sockaddr (to, &addr); nice_address_set_from_sockaddr (to, &addr);
sent_permission = sent_permission =
g_list_find_custom (priv->sent_permissions, to, g_list_find_custom (priv->sent_permissions, to,
(GCompareFunc) nice_address_equal); (GCompareFunc) nice_address_equal);
g_free (priv->current_create_permission_msg); g_free (priv->current_create_permission_msg);
priv->current_create_permission_msg = NULL; priv->current_create_permission_msg = NULL;
/* we got a timeout when retransmitting a CreatePermission /* we got a timeout when retransmitting a CreatePermission
message, assume we can just send the data, the server message, assume we can just send the data, the server
might not support RFC TURN, or connectivity check will might not support RFC TURN, or connectivity check will
fail eventually anyway */ fail eventually anyway */
priv->permissions = g_list_append (priv->permissions, to); priv->permissions = g_list_append (priv->permissions, to);
if (sent_permission) { if (sent_permission) {
nice_address_free ((NiceAddress *) sent_permission->data); nice_address_free ((NiceAddress *) sent_permission->data);
priv->sent_permissions = priv->sent_permissions =
g_list_delete_link (priv->sent_permissions, sent_permission); g_list_delete_link (priv->sent_permissions, sent_permission);
} }
socket_dequeue_all_data (priv, to); socket_dequeue_all_data (priv, to);
break; break;
} }
case STUN_USAGE_TIMER_RETURN_RETRANSMIT: case STUN_USAGE_TIMER_RETURN_RETRANSMIT:
/* Retransmit */ /* Retransmit */
nice_socket_send (priv->base_socket, &priv->server_addr, nice_socket_send (priv->base_socket, &priv->server_addr,
stun_message_length (&priv->current_create_permission_msg->message), stun_message_length (&priv->current_create_permission_msg->message),
(gchar *)priv->current_create_permission_msg->buffer); (gchar *)priv->current_create_permission_msg->buffer);
break; break;
case STUN_USAGE_TIMER_RETURN_SUCCESS: case STUN_USAGE_TIMER_RETURN_SUCCESS:
break; break;
...@@ -1065,7 +1064,7 @@ priv_retransmissions_tick (gpointer pointer) ...@@ -1065,7 +1064,7 @@ priv_retransmissions_tick (gpointer pointer)
agent_lock (); agent_lock ();
if (g_source_is_destroyed (g_main_current_source ())) { if (g_source_is_destroyed (g_main_current_source ())) {
nice_debug ("Source was destroyed. " nice_debug ("Source was destroyed. "
"Avoided race condition in turn.c:priv_retransmissions_tick"); "Avoided race condition in turn.c:priv_retransmissions_tick");
agent_unlock (); agent_unlock ();
return FALSE; return FALSE;
} }
...@@ -1092,7 +1091,7 @@ priv_retransmissions_create_permission_tick (gpointer pointer) ...@@ -1092,7 +1091,7 @@ priv_retransmissions_create_permission_tick (gpointer pointer)
agent_lock (); agent_lock ();
if (g_source_is_destroyed (g_main_current_source ())) { if (g_source_is_destroyed (g_main_current_source ())) {
nice_debug ("Source was destroyed. " nice_debug ("Source was destroyed. "
"Avoided race condition in turn.c:priv_retransmissions_create_permission_tick"); "Avoided race condition in turn.c:priv_retransmissions_create_permission_tick");
agent_unlock (); agent_unlock ();
return FALSE; return FALSE;
} }
...@@ -1134,10 +1133,10 @@ priv_schedule_tick (TurnPriv *priv) ...@@ -1134,10 +1133,10 @@ priv_schedule_tick (TurnPriv *priv)
guint timeout = stun_timer_remainder (&priv->current_create_permission_msg->timer); guint timeout = stun_timer_remainder (&priv->current_create_permission_msg->timer);
if (timeout > 0) { if (timeout > 0) {
priv->tick_source_create_permission = priv->tick_source_create_permission =
agent_timeout_add_with_context (priv->nice, agent_timeout_add_with_context (priv->nice,
timeout, timeout,
priv_retransmissions_create_permission_tick, priv_retransmissions_create_permission_tick,
priv); priv);
} else { } else {
priv_retransmissions_create_permission_tick_unlocked (priv); priv_retransmissions_create_permission_tick_unlocked (priv);
} }
...@@ -1155,7 +1154,7 @@ priv_send_turn_message (TurnPriv *priv, TURNMessage *msg) ...@@ -1155,7 +1154,7 @@ priv_send_turn_message (TurnPriv *priv, TURNMessage *msg)
} }
nice_socket_send (priv->base_socket, &priv->server_addr, nice_socket_send (priv->base_socket, &priv->server_addr,
stun_len, (gchar *)msg->buffer); stun_len, (gchar *)msg->buffer);
if (nice_socket_is_reliable (priv->base_socket)) { if (nice_socket_is_reliable (priv->base_socket)) {
stun_timer_start_reliable (&msg->timer, stun_timer_start_reliable (&msg->timer,
...@@ -1187,22 +1186,22 @@ priv_send_create_permission(TurnPriv *priv, uint8_t *realm, gsize realm_len, ...@@ -1187,22 +1186,22 @@ priv_send_create_permission(TurnPriv *priv, uint8_t *realm, gsize realm_len,
/* send CreatePermission */ /* send CreatePermission */
msg_buf_len = stun_usage_turn_create_permission(&priv->agent, &msg->message, msg_buf_len = stun_usage_turn_create_permission(&priv->agent, &msg->message,
msg->buffer, msg->buffer,
sizeof(msg->buffer), sizeof(msg->buffer),
priv->username, priv->username,
priv->username_len, priv->username_len,
priv->password, priv->password,
priv->password_len, priv->password_len,
realm, realm_len, realm, realm_len,
nonce, nonce_len, nonce, nonce_len,
&addr, &addr,
NICE_TURN_SOCKET_COMPATIBILITY_RFC5766); NICE_TURN_SOCKET_COMPATIBILITY_RFC5766);
if (msg_buf_len > 0) { if (msg_buf_len > 0) {
nice_debug("sending CreatePermission message, lenght: %d", nice_debug("sending CreatePermission message, lenght: %d",
msg_buf_len); msg_buf_len);
res = nice_socket_send (priv->base_socket, &priv->server_addr, res = nice_socket_send (priv->base_socket, &priv->server_addr,
msg_buf_len, (gchar *) msg->buffer); msg_buf_len, (gchar *) msg->buffer);
nice_debug("sent CreatePermission message, result: %d", res); nice_debug("sent CreatePermission message, result: %d", res);
if (nice_socket_is_reliable (priv->base_socket)) { if (nice_socket_is_reliable (priv->base_socket)) {
...@@ -1222,32 +1221,31 @@ priv_send_create_permission(TurnPriv *priv, uint8_t *realm, gsize realm_len, ...@@ -1222,32 +1221,31 @@ priv_send_create_permission(TurnPriv *priv, uint8_t *realm, gsize realm_len,
static gboolean static gboolean
priv_send_channel_bind (TurnPriv *priv, StunMessage *resp, priv_send_channel_bind (TurnPriv *priv, StunMessage *resp,
uint16_t channel, const NiceAddress *peer) uint16_t channel, const NiceAddress *peer)
{ {
uint32_t channel_attr = channel << 16; uint32_t channel_attr = channel << 16;
size_t stun_len; size_t stun_len;
struct sockaddr_storage sa; struct sockaddr_storage sa;
TURNMessage *msg = g_new0 (TURNMessage, 1); TURNMessage *msg = g_new0 (TURNMessage, 1);
priv->sent_binding = TRUE;
nice_address_copy_to_sockaddr (peer, (struct sockaddr *)&sa); nice_address_copy_to_sockaddr (peer, (struct sockaddr *)&sa);
if (!stun_agent_init_request (&priv->agent, &msg->message, if (!stun_agent_init_request (&priv->agent, &msg->message,
msg->buffer, sizeof(msg->buffer), msg->buffer, sizeof(msg->buffer),
STUN_CHANNELBIND)) { STUN_CHANNELBIND)) {
g_free (msg); g_free (msg);
return FALSE; return FALSE;
} }
if (stun_message_append32 (&msg->message, STUN_ATTRIBUTE_CHANNEL_NUMBER, if (stun_message_append32 (&msg->message, STUN_ATTRIBUTE_CHANNEL_NUMBER,
channel_attr) != STUN_MESSAGE_RETURN_SUCCESS) { channel_attr) != STUN_MESSAGE_RETURN_SUCCESS) {
g_free (msg); g_free (msg);
return FALSE; return FALSE;
} }
if (stun_message_append_xor_addr (&msg->message, STUN_ATTRIBUTE_PEER_ADDRESS, if (stun_message_append_xor_addr (&msg->message, STUN_ATTRIBUTE_PEER_ADDRESS,
(struct sockaddr *)&sa, (struct sockaddr *)&sa,
sizeof(sa)) sizeof(sa))
!= STUN_MESSAGE_RETURN_SUCCESS) { != STUN_MESSAGE_RETURN_SUCCESS) {
g_free (msg); g_free (msg);
return FALSE; return FALSE;
...@@ -1255,8 +1253,8 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp, ...@@ -1255,8 +1253,8 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp,
if (priv->username != NULL && priv->username_len > 0) { if (priv->username != NULL && priv->username_len > 0) {
if (stun_message_append_bytes (&msg->message, STUN_ATTRIBUTE_USERNAME, if (stun_message_append_bytes (&msg->message, STUN_ATTRIBUTE_USERNAME,
priv->username, priv->username_len) priv->username, priv->username_len)
!= STUN_MESSAGE_RETURN_SUCCESS) { != STUN_MESSAGE_RETURN_SUCCESS) {
g_free (msg); g_free (msg);
return FALSE; return FALSE;
} }
...@@ -1270,8 +1268,8 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp, ...@@ -1270,8 +1268,8 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp,
realm = (uint8_t *) stun_message_find (resp, STUN_ATTRIBUTE_REALM, &len); realm = (uint8_t *) stun_message_find (resp, STUN_ATTRIBUTE_REALM, &len);
if (realm != NULL) { if (realm != NULL) {
if (stun_message_append_bytes (&msg->message, STUN_ATTRIBUTE_REALM, if (stun_message_append_bytes (&msg->message, STUN_ATTRIBUTE_REALM,
realm, len) realm, len)
!= STUN_MESSAGE_RETURN_SUCCESS) { != STUN_MESSAGE_RETURN_SUCCESS) {
g_free (msg); g_free (msg);
return 0; return 0;
} }
...@@ -1279,8 +1277,8 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp, ...@@ -1279,8 +1277,8 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp,
nonce = (uint8_t *) stun_message_find (resp, STUN_ATTRIBUTE_NONCE, &len); nonce = (uint8_t *) stun_message_find (resp, STUN_ATTRIBUTE_NONCE, &len);
if (nonce != NULL) { if (nonce != NULL) {
if (stun_message_append_bytes (&msg->message, STUN_ATTRIBUTE_NONCE, if (stun_message_append_bytes (&msg->message, STUN_ATTRIBUTE_NONCE,
nonce, len) nonce, len)
!= STUN_MESSAGE_RETURN_SUCCESS) { != STUN_MESSAGE_RETURN_SUCCESS) {
g_free (msg); g_free (msg);
return 0; return 0;
} }
...@@ -1288,7 +1286,7 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp, ...@@ -1288,7 +1286,7 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp,
} }
stun_len = stun_agent_finish_message (&priv->agent, &msg->message, stun_len = stun_agent_finish_message (&priv->agent, &msg->message,
priv->password, priv->password_len); priv->password, priv->password_len);
if (stun_len > 0) { if (stun_len > 0) {
priv_send_turn_message (priv, msg); priv_send_turn_message (priv, msg);
...@@ -1305,7 +1303,6 @@ priv_add_channel_binding (TurnPriv *priv, const NiceAddress *peer) ...@@ -1305,7 +1303,6 @@ priv_add_channel_binding (TurnPriv *priv, const NiceAddress *peer)
size_t stun_len; size_t stun_len;
struct sockaddr_storage sa; struct sockaddr_storage sa;
priv->sent_binding = TRUE;
nice_address_copy_to_sockaddr (peer, (struct sockaddr *)&sa); nice_address_copy_to_sockaddr (peer, (struct sockaddr *)&sa);
if (priv->current_binding) { if (priv->current_binding) {
...@@ -1342,23 +1339,23 @@ priv_add_channel_binding (TurnPriv *priv, const NiceAddress *peer) ...@@ -1342,23 +1339,23 @@ priv_add_channel_binding (TurnPriv *priv, const NiceAddress *peer)
priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_OC2007) { priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_OC2007) {
TURNMessage *msg = g_new0 (TURNMessage, 1); TURNMessage *msg = g_new0 (TURNMessage, 1);
if (!stun_agent_init_request (&priv->agent, &msg->message, if (!stun_agent_init_request (&priv->agent, &msg->message,
msg->buffer, sizeof(msg->buffer), msg->buffer, sizeof(msg->buffer),
STUN_OLD_SET_ACTIVE_DST)) { STUN_OLD_SET_ACTIVE_DST)) {
g_free (msg); g_free (msg);
return FALSE; return FALSE;
} }
if (stun_message_append32 (&msg->message, STUN_ATTRIBUTE_MAGIC_COOKIE, if (stun_message_append32 (&msg->message, STUN_ATTRIBUTE_MAGIC_COOKIE,
TURN_MAGIC_COOKIE) TURN_MAGIC_COOKIE)
!= STUN_MESSAGE_RETURN_SUCCESS) { != STUN_MESSAGE_RETURN_SUCCESS) {
g_free (msg); g_free (msg);
return FALSE; return FALSE;
} }
if (priv->username != NULL && priv->username_len > 0) { if (priv->username != NULL && priv->username_len > 0) {
if (stun_message_append_bytes (&msg->message, STUN_ATTRIBUTE_USERNAME, if (stun_message_append_bytes (&msg->message, STUN_ATTRIBUTE_USERNAME,
priv->username, priv->username_len) priv->username, priv->username_len)
!= STUN_MESSAGE_RETURN_SUCCESS) { != STUN_MESSAGE_RETURN_SUCCESS) {
g_free (msg); g_free (msg);
return FALSE; return FALSE;
} }
...@@ -1373,15 +1370,15 @@ priv_add_channel_binding (TurnPriv *priv, const NiceAddress *peer) ...@@ -1373,15 +1370,15 @@ priv_add_channel_binding (TurnPriv *priv, const NiceAddress *peer)
} }
if (stun_message_append_addr (&msg->message, if (stun_message_append_addr (&msg->message,
STUN_ATTRIBUTE_DESTINATION_ADDRESS, STUN_ATTRIBUTE_DESTINATION_ADDRESS,
(struct sockaddr *)&sa, sizeof(sa)) (struct sockaddr *)&sa, sizeof(sa))
!= STUN_MESSAGE_RETURN_SUCCESS) { != STUN_MESSAGE_RETURN_SUCCESS) {
g_free (msg); g_free (msg);
return FALSE; return FALSE;
} }
stun_len = stun_agent_finish_message (&priv->agent, &msg->message, stun_len = stun_agent_finish_message (&priv->agent, &msg->message,
priv->password, priv->password_len); priv->password, priv->password_len);
if (stun_len > 0) { if (stun_len > 0) {
priv->current_binding = g_new0 (ChannelBinding, 1); priv->current_binding = g_new0 (ChannelBinding, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment