jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

ice: resort the check list when adding prflx candidates

Browse Source 
Resort the check list  when new prflx candidates are discovered,
to avoid the nomination of candidates pairs with less priority.

Gitlab: #617

Change-Id: I93559facd8b6ce99708ccf1311925837d9cd119d
This commit is contained in:
Mohamed Chibani
2021-08-26 11:03:16 -04:00
committed by Sébastien Blin
parent 172834b2d7
commit b954f3b53b
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
contrib/src/pjproject/0019-resort-check-list-after-adding-prflx.patch Normal file
View File

@ -0,0 +1,31 @@
From 45430f86d00f60c439f936693bf033ff4c066329 Mon Sep 17 00:00:00 2001
From: Mohamed Chibani <mohamed.chibani@savoirfairelinux.com>
Date: Thu, 26 Aug 2021 10:49:20 -0400
Subject: [PATCH] resort check list after adding prflx
---
pjnath/src/pjnath/ice_session.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/pjnath/src/pjnath/ice_session.c b/pjnath/src/pjnath/ice_session.c
index 77d014d62..f2c347163 100644
--- a/pjnath/src/pjnath/ice_session.c
+++ b/pjnath/src/pjnath/ice_session.c
@@ -4034,8 +4034,12 @@ static void handle_incoming_check(pj_ice_sess *ice,
LOG5((ice->obj_name, "Performing triggered check for check %d",i));
pj_log_push_indent();
- perform_check(ice, &ice->clist, i, nominate);
- pj_log_pop_indent();
+
+ perform_check(ice, &ice->clist, i, nominate);
+ /* Re-sort the list because of the newly added pair. */
+ sort_checklist(ice, &ice->clist);
+
+ pj_log_pop_indent();
} else if (c->state == PJ_ICE_SESS_CHECK_STATE_IN_PROGRESS) {
/* Should retransmit immediately
--
2.25.1

1
contrib/src/pjproject/package.json
View File

@ -21,6 +21,7 @@
"0015-fix-socktype-and-duplicate-checking.patch",
"0017-auto-register-thread.patch",
"0018-fix-ioqueue-lock-acquire.patch",
"0019-resort-check-list-after-adding-prflx.patch",
"0001-win-config.patch",
"0002-win-vs-gnutls.patch",
"0003-win-vs2017-props.patch"

1
contrib/src/pjproject/rules.mak
View File

@ -63,6 +63,7 @@ pjproject: pjproject-$(PJPROJECT_VERSION).tar.gz .sum-pjproject
$(APPLY) $(SRC)/pjproject/0015-fix-socktype-and-duplicate-checking.patch # TODO remove with 2.12 (https://github.com/pjsip/pjproject/commits/2feee8db77ed47e7b574367295d4f03f9aea67f8)
$(APPLY) $(SRC)/pjproject/0017-auto-register-thread.patch
$(APPLY) $(SRC)/pjproject/0018-fix-ioqueue-lock-acquire.patch
$(APPLY) $(SRC)/pjproject/0019-resort-check-list-after-adding-prflx.patch
ifdef HAVE_ANDROID
$(APPLY) $(SRC)/pjproject/0001-android.patch
endif