Bug 1215616: use base address for server rflx ICE candidates r=bwc, a=sylvestre
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Sat, 17 Oct 2015 11:34:01 -0400
changeset 291242 c3daaf421fe6c6e88f40d0f3d59635c5cadb7f2d
parent 291241 f585fae6c50ac0cca9b33f5d7d2793debeb9f106
child 291243 dc552539eb771729c6b4049d91126cef26a1076e
push id934
push userraliiev@mozilla.com
push dateMon, 26 Oct 2015 12:58:05 +0000
treeherdermozilla-release@05704e35c1d0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwc, sylvestre
bugs1215616
milestone42.0
Bug 1215616: use base address for server rflx ICE candidates r=bwc, a=sylvestre
media/mtransport/third_party/nICEr/src/ice/ice_candidate.c
--- a/media/mtransport/third_party/nICEr/src/ice/ice_candidate.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_candidate.c
@@ -936,18 +936,19 @@ int nr_ice_format_candidate_attribute(nr
       port=9;
     snprintf(attr,maxlen,"candidate:%s %d %s %u %s %d typ %s",
       cand->foundation, cand->component_id, cand->addr.protocol==IPPROTO_UDP?"UDP":"TCP",cand->priority, addr, port,
       nr_ctype_name(cand->type));
 
     len=strlen(attr); attr+=len; maxlen-=len;
 
     /* raddr, rport */
-    raddr = (cand->stream->ctx->flags & NR_ICE_CTX_FLAGS_RELAY_ONLY |
-             NR_ICE_CTX_FLAGS_ONLY_DEFAULT_ADDRS) ?
+    raddr = (cand->stream->ctx->flags &
+             (NR_ICE_CTX_FLAGS_RELAY_ONLY |
+              NR_ICE_CTX_FLAGS_ONLY_DEFAULT_ADDRS)) ?
       &cand->addr : &cand->base;
 
     switch(cand->type){
       case HOST:
         break;
       case SERVER_REFLEXIVE:
       case PEER_REFLEXIVE:
         if(r=nr_transport_addr_get_addrstring(raddr,addr,sizeof(addr)))