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

conncheck: Don't fail a stream that has on-going discovery

parent 5bbed7e4
...@@ -1162,6 +1162,18 @@ static void priv_update_check_list_failed_components (NiceAgent *agent, Stream * ...@@ -1162,6 +1162,18 @@ static void priv_update_check_list_failed_components (NiceAgent *agent, Stream *
* must be fetched before entering the loop*/ * must be fetched before entering the loop*/
guint c, components = stream->n_components; guint c, components = stream->n_components;
for (i = agent->discovery_list; i; i = i->next) {
CandidateDiscovery *d = i->data;
/* There is still discovery ogoing for this stream,
* so don't fail any of it's candidates.
*/
if (d->stream == stream && !d->done)
return;
}
if (agent->discovery_list != NULL)
return;
/* note: iterate the conncheck list for each component separately */ /* note: iterate the conncheck list for each component separately */
for (c = 0; c < components; c++) { for (c = 0; c < components; c++) {
Component *comp = NULL; Component *comp = NULL;
...@@ -1170,7 +1182,7 @@ static void priv_update_check_list_failed_components (NiceAgent *agent, Stream * ...@@ -1170,7 +1182,7 @@ static void priv_update_check_list_failed_components (NiceAgent *agent, Stream *
for (i = stream->conncheck_list; i; i = i->next) { for (i = stream->conncheck_list; i; i = i->next) {
CandidateCheckPair *p = i->data; CandidateCheckPair *p = i->data;
if (p->stream_id == stream->id && if (p->stream_id == stream->id &&
p->component_id == (c + 1)) { p->component_id == (c + 1)) {
if (p->state != NICE_CHECK_FAILED) if (p->state != NICE_CHECK_FAILED)
......
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