Bug 830451 Treat PEER_REFLEXIVE like SERVER_REFLEXIVE r=adam
authorEthan Hugg <ethanhugg@gmail.com>
Mon, 14 Jan 2013 12:07:28 -0800
changeset 119070 c71380f318edb1e9707a84bf94e9b1a0136e3036
parent 119069 9229b7917f472fba11f25ee272d628202aeac9e0
child 119071 0f87c11f27b0a6ed8eeaa0d5d2c4c25947e6d2e1
push id24189
push useremorley@mozilla.com
push dateThu, 17 Jan 2013 10:42:06 +0000
treeherdermozilla-central@712eca11a04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersadam
bugs830451
milestone21.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 830451 Treat PEER_REFLEXIVE like SERVER_REFLEXIVE r=adam
media/mtransport/third_party/nICEr/src/ice/ice_component.c
--- a/media/mtransport/third_party/nICEr/src/ice/ice_component.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_component.c
@@ -555,25 +555,20 @@ int nr_ice_component_pair_candidates(nr_
 
       nr_ice_compute_codeword(lcand->label,strlen(lcand->label),codeword);
       r_log(LOG_ICE,LOG_DEBUG,"Examining local candidate %s:%s",codeword,lcand->label);
 
       switch(lcand->type){
         case HOST:
           break;
         case SERVER_REFLEXIVE:
+        case PEER_REFLEXIVE:
           /* Don't actually pair these candidates */
           goto next_cand;
           break;
-        case PEER_REFLEXIVE:
-          /* This is not implemented, and I'm not sure if we need it
-             for trickle ICE. We don't need it for regular ICE */
-          assert(0);
-          ABORT(R_INTERNAL);
-          break;
         case RELAYED:
           break;
         default:
           assert(0);
           ABORT(R_INTERNAL);
           break;
       }