Commit ed7e0e6d authored by Youness Alaoui's avatar Youness Alaoui

MSN calls do not support keepalive connchecks, so enable keepalive connchecks...

MSN calls do not support keepalive connchecks, so enable keepalive connchecks for google only and not for != DRAFT19
parent 11d3ded8
...@@ -552,7 +552,7 @@ static gboolean priv_conn_keepalive_tick_unlocked (NiceAgent *agent) ...@@ -552,7 +552,7 @@ static gboolean priv_conn_keepalive_tick_unlocked (NiceAgent *agent)
memset (&sockaddr, 0, sizeof (sockaddr)); memset (&sockaddr, 0, sizeof (sockaddr));
nice_address_copy_to_sockaddr (&p->remote->addr, &sockaddr); nice_address_copy_to_sockaddr (&p->remote->addr, &sockaddr);
if (agent->compatibility != NICE_COMPATIBILITY_DRAFT19) { if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE) {
guint32 priority = nice_candidate_ice_priority_full ( guint32 priority = nice_candidate_ice_priority_full (
NICE_CANDIDATE_TYPE_PREF_PEER_REFLEXIVE, 1, NICE_CANDIDATE_TYPE_PREF_PEER_REFLEXIVE, 1,
p->local->component_id); p->local->component_id);
...@@ -566,10 +566,6 @@ static gboolean priv_conn_keepalive_tick_unlocked (NiceAgent *agent) ...@@ -566,10 +566,6 @@ static gboolean priv_conn_keepalive_tick_unlocked (NiceAgent *agent)
agent_find_stream (agent, stream->id), p->remote, &password); agent_find_stream (agent, stream->id), p->remote, &password);
gchar tmpbuf[INET6_ADDRSTRLEN]; gchar tmpbuf[INET6_ADDRSTRLEN];
if (agent->compatibility == NICE_COMPATIBILITY_MSN) {
password = g_base64_decode ((gchar *) password, &password_len);
}
nice_address_to_string (&p->remote->addr, tmpbuf); nice_address_to_string (&p->remote->addr, tmpbuf);
nice_debug ("Agent %p : Keepalive STUN-CC REQ to '%s:%u', " nice_debug ("Agent %p : Keepalive STUN-CC REQ to '%s:%u', "
"socket=%u (c-id:%u), username='%s' (%d), " "socket=%u (c-id:%u), username='%s' (%d), "
...@@ -590,10 +586,6 @@ static gboolean priv_conn_keepalive_tick_unlocked (NiceAgent *agent) ...@@ -590,10 +586,6 @@ static gboolean priv_conn_keepalive_tick_unlocked (NiceAgent *agent)
nice_debug ("Agent %p: conncheck created %d - %p", nice_debug ("Agent %p: conncheck created %d - %p",
agent, buf_len, p->keepalive.stun_message.buffer); agent, buf_len, p->keepalive.stun_message.buffer);
if (agent->compatibility == NICE_COMPATIBILITY_MSN) {
g_free (password);
}
if (buf_len > 0) { if (buf_len > 0) {
stun_timer_start (&p->keepalive.timer); stun_timer_start (&p->keepalive.timer);
......
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