Bug 1368159 - change log statement for pre-existing local addresses from error to warning in nr_ice_set_local_addresses. r=drno draft
authorMichael Froman <mfroman@mozilla.com>
Wed, 07 Jun 2017 13:38:46 -0500
changeset 593525 a116a8423fd999c4746e9375b8f42a6d908a1ea7
parent 593475 91134c95d68cbcfe984211fa3cbd28d610361ef1
child 633147 631cd7271c04710f876c277ec81296147839c728
push id63735
push userbmo:mfroman@nostrum.com
push dateTue, 13 Jun 2017 21:06:19 +0000
reviewersdrno
bugs1368159, 1345511
milestone56.0a1
Bug 1368159 - change log statement for pre-existing local addresses from error to warning in nr_ice_set_local_addresses. r=drno When I added this check during the modifications for Bug 1345511 (Move nICEr stun local address discovery to an IPC call to enable future sandbox restrictions on content process) I originally thought this was more of an error condition, but it really isn't. It can happen each time the following method(s) is called: PeerConnectionMedia::EnsureTransports() -> GatherIfReady() -> EnsureIceGathering_s() MozReview-Commit-ID: Ct3teqXBxWd
media/mtransport/third_party/nICEr/src/ice/ice_ctx.c
--- a/media/mtransport/third_party/nICEr/src/ice/ice_ctx.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_ctx.c
@@ -703,17 +703,17 @@ int nr_ice_set_local_addresses(nr_ice_ct
     int r,_status;
     nr_local_addr local_addrs[MAXADDRS];
     nr_local_addr *addrs = 0;
     int i,addr_ct;
     nr_local_addr default_addrs[2];
     int default_addr_ct = 0;
 
     if (ctx->local_addrs) {
-      r_log(LOG_ICE,LOG_ERR,"ICE(%s): local addresses already set",ctx->label);
+      r_log(LOG_ICE,LOG_WARNING,"ICE(%s): local addresses already set, no work to do",ctx->label);
       ABORT(R_ALREADY);
     }
     if (!stun_addrs || !stun_addr_ct) {
       r_log(LOG_ICE,LOG_ERR,"ICE(%s): no stun addrs provided",ctx->label);
       ABORT(R_BAD_ARGS);
     }
 
     addr_ct = MIN(stun_addr_ct, MAXADDRS);