Commit c9d0f0f5 authored by Fabrice Bellet's avatar Fabrice Bellet Committed by Olivier Crête

agent: set component is state gathering earlier

This patch avoids to bypass state gathering, with transition
from disconnected to connecting.
parent af104bfa
...@@ -3497,6 +3497,11 @@ nice_agent_gather_candidates ( ...@@ -3497,6 +3497,11 @@ nice_agent_gather_candidates (
ret = FALSE; ret = FALSE;
goto error; goto error;
} }
if (component->state == NICE_COMPONENT_STATE_DISCONNECTED ||
component->state == NICE_COMPONENT_STATE_FAILED)
agent_signal_component_state_change (agent,
stream->id, component->id, NICE_COMPONENT_STATE_GATHERING);
} }
stream->gathering = TRUE; stream->gathering = TRUE;
......
...@@ -1209,16 +1209,6 @@ static gboolean priv_discovery_tick_unlocked (NiceAgent *agent) ...@@ -1209,16 +1209,6 @@ static gboolean priv_discovery_tick_unlocked (NiceAgent *agent)
if (nice_address_is_valid (&cand->server) && if (nice_address_is_valid (&cand->server) &&
(cand->type == NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE || (cand->type == NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE ||
cand->type == NICE_CANDIDATE_TYPE_RELAYED)) { cand->type == NICE_CANDIDATE_TYPE_RELAYED)) {
NiceComponent *component;
if (agent_find_component (agent, cand->stream_id,
cand->component_id, NULL, &component) &&
(component->state == NICE_COMPONENT_STATE_DISCONNECTED ||
component->state == NICE_COMPONENT_STATE_FAILED))
agent_signal_component_state_change (agent,
cand->stream_id,
cand->component_id,
NICE_COMPONENT_STATE_GATHERING);
if (cand->type == NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE) { if (cand->type == NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE) {
buffer_len = stun_usage_bind_create (&cand->stun_agent, buffer_len = stun_usage_bind_create (&cand->stun_agent,
......
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