Bug 1521879 - Part 8: Don't run triggered check logic on obsolete streams. r=mjf
authorByron Campen [:bwc] <docfaraday@gmail.com>
Mon, 25 Feb 2019 21:52:26 +0000
changeset 518888 083dee3d21698b298e1a77cb09f974bdedca1b84
parent 518887 634949dfc7926a1c295b08fdd015ca13b57d3113
child 518889 5aa193f471ea49165243f10c49f6ef99e26f723f
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmjf
bugs1521879
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1521879 - Part 8: Don't run triggered check logic on obsolete streams. r=mjf Differential Revision: https://phabricator.services.mozilla.com/D18231
media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.c
--- a/media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.c
@@ -442,16 +442,22 @@ int nr_ice_candidate_pair_do_triggered_c
     int r,_status;
 
     if(pair->state==NR_ICE_PAIR_STATE_CANCELLED) {
       r_log(LOG_ICE,LOG_DEBUG,"ICE-PEER(%s)/CAND_PAIR(%s): Ignoring matching but canceled pair",pctx->label,pair->codeword);
       return(0);
     } else if(pair->state==NR_ICE_PAIR_STATE_SUCCEEDED) {
       r_log(LOG_ICE,LOG_DEBUG,"ICE-PEER(%s)/CAND_PAIR(%s): No new trigger check for succeeded pair",pctx->label,pair->codeword);
       return(0);
+    } else if (pair->local->stream->obsolete) {
+      r_log(LOG_ICE, LOG_DEBUG,
+            "ICE-PEER(%s)/CAND_PAIR(%s): No new trigger check for pair with "
+            "obsolete stream",
+            pctx->label, pair->codeword);
+      return (0);
     }
 
     /* Do not run this logic more than once on a given pair */
     if(!pair->triggered){
       r_log(LOG_ICE,LOG_INFO,"ICE-PEER(%s)/CAND-PAIR(%s): triggered check on %s",pctx->label,pair->codeword,pair->as_string);
 
       pair->triggered=1;