[Pkg-telepathy-commits] [libnice] 234/265: conncheck: Don't fail a stream that has on-going discovery

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit b572ecc505f5c1add4623871fe01143bca0ba3cb
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Wed Apr 23 22:03:29 2014 -0400

    conncheck: Don't fail a stream that has on-going discovery
---
 agent/conncheck.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/agent/conncheck.c b/agent/conncheck.c
index 9d325fd..241151f 100644
--- a/agent/conncheck.c
+++ b/agent/conncheck.c
@@ -1162,6 +1162,18 @@ static void priv_update_check_list_failed_components (NiceAgent *agent, Stream *
    *       must be fetched before entering the loop*/
   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 */
   for (c = 0; c < components; c++) {
     Component *comp = NULL;
@@ -1170,7 +1182,7 @@ static void priv_update_check_list_failed_components (NiceAgent *agent, Stream *
 
     for (i = stream->conncheck_list; i; i = i->next) {
       CandidateCheckPair *p = i->data;
-      
+
       if (p->stream_id == stream->id &&
 	  p->component_id == (c + 1)) {
 	if (p->state != NICE_CHECK_FAILED)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git