ice: avoid late mDNS candidates

baresip · Oct 4, 2023 · 02529e2 · 02529e2
1 parent 4bace25
commit 02529e2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/ice/connchk.c b/src/ice/connchk.c
@@ -404,6 +404,9 @@ static void rcand_wait_timeout(void *arg)
 {
 	struct icem *icem = arg;
 
+	/* Avoid long startup delay */
+	icem->rcand_wait = false;
+
 	icem_conncheck_start(icem);
 }
 

diff --git a/src/ice/icesdp.c b/src/ice/icesdp.c
@@ -239,6 +239,11 @@ static void delayed_rcand(int err, void *arg)
 	if (err)
 		goto out;
 
+	if (!rcand->icem->rcand_wait) {
+		DEBUG_INFO("Late mDNS candidate\n");
+		goto out;
+	}
+
 	/* add only if not exist */
 	if (icem_cand_find(&rcand->icem->rcandl, rcand->cid, &rcand->caddr))
 		goto out;
@@ -247,7 +252,6 @@ static void delayed_rcand(int err, void *arg)
 		       &rcand->caddr, &rcand->rel_addr, &rcand->foundation);
 
 out:
-	rcand->icem->rcand_wait = false;
 	mem_deref(rcand);
 }