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
...@@ -96,7 +96,6 @@ typedef struct { ...@@ -96,7 +96,6 @@ typedef struct {
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;
...@@ -506,7 +505,7 @@ socket_send (NiceSocket *sock, const NiceAddress *to, ...@@ -506,7 +505,7 @@ socket_send (NiceSocket *sock, const NiceAddress *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);
} }
...@@ -765,7 +764,7 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock, ...@@ -765,7 +764,7 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
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);
...@@ -1229,7 +1228,6 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp, ...@@ -1229,7 +1228,6 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp,
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,
...@@ -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) {
......
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