Commit ee16b91f authored by Olivier Crête's avatar Olivier Crête

agent: Remove useless checks from priv_add_remote_candidate

parent 5aa6553b
...@@ -1976,47 +1976,43 @@ static gboolean priv_add_remote_candidate ( ...@@ -1976,47 +1976,43 @@ static gboolean priv_add_remote_candidate (
candidate = nice_candidate_new (type); candidate = nice_candidate_new (type);
if (candidate) { if (candidate) {
GSList *modified_list = g_slist_append (component->remote_candidates, candidate); component->remote_candidates = g_slist_append (component->remote_candidates,
if (modified_list) { candidate);
component->remote_candidates = modified_list;
candidate->stream_id = stream_id;
candidate->stream_id = stream_id; candidate->component_id = component_id;
candidate->component_id = component_id;
candidate->type = type;
candidate->type = type; if (addr)
if (addr) candidate->addr = *addr;
candidate->addr = *addr; {
{ gchar tmpbuf[INET6_ADDRSTRLEN] = {0};
gchar tmpbuf[INET6_ADDRSTRLEN] = {0}; if(addr)
if(addr) nice_address_to_string (addr, tmpbuf);
nice_address_to_string (addr, tmpbuf); nice_debug ("Agent %p : Adding remote candidate with addr [%s]:%u"
nice_debug ("Agent %p : Adding remote candidate with addr [%s]:%u" " for s%d/c%d. U/P '%s'/'%s' prio: %u", agent, tmpbuf,
" for s%d/c%d. U/P '%s'/'%s' prio: %u", agent, tmpbuf, addr? nice_address_get_port (addr) : 0, stream_id, component_id,
addr? nice_address_get_port (addr) : 0, stream_id, component_id, username, password, priority);
username, password, priority); }
}
if (base_addr) if (base_addr)
candidate->base_addr = *base_addr; candidate->base_addr = *base_addr;
candidate->transport = transport; candidate->transport = transport;
candidate->priority = priority; candidate->priority = priority;
candidate->username = g_strdup (username); candidate->username = g_strdup (username);
candidate->password = g_strdup (password); candidate->password = g_strdup (password);
if (foundation) if (foundation)
g_strlcpy (candidate->foundation, foundation, g_strlcpy (candidate->foundation, foundation,
NICE_CANDIDATE_MAX_FOUNDATION); NICE_CANDIDATE_MAX_FOUNDATION);
if (conn_check_add_for_candidate (agent, stream_id, component, candidate) < 0) if (conn_check_add_for_candidate (agent, stream_id, component, candidate) < 0)
error_flag = TRUE; error_flag = TRUE;
}
else /* memory alloc error: list insert */
error_flag = TRUE;
} }
else /* memory alloc error: candidate creation */ else /* memory alloc error: candidate creation */
error_flag = TRUE; error_flag = TRUE;
} }
if (error_flag) { if (error_flag) {
if (candidate) if (candidate)
......
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