Update from mozilla's repo

CMakeLists.txt

@@ -41,7 +41,9 @@ list(APPEND nicer__c_srcs
     "${NICER_SOURCE}/src/net/local_addr.c"
     "${NICER_SOURCE}/src/net/nr_interface_prioritizer.c"
     "${NICER_SOURCE}/src/stun/addrs.c"
-    "${NICER_SOURCE}/src/stun/ifaddrs-android.c"
+    "${NICER_SOURCE}/src/stun/addrs-bsd.c"
+    "${NICER_SOURCE}/src/stun/addrs-netlink.c"
+    "${NICER_SOURCE}/src/stun/addrs-win32.c"
     "${NICER_SOURCE}/src/stun/nr_socket_turn.c"
     "${NICER_SOURCE}/src/stun/nr_socket_buffered_stun.c"
     "${NICER_SOURCE}/src/stun/stun_build.c"
@@ -78,7 +80,9 @@ list(APPEND nicer__other_srcs
     "${NICER_SOURCE}/src/net/local_addr.h"
     "${NICER_SOURCE}/src/net/nr_interface_prioritizer.h"
     "${NICER_SOURCE}/src/stun/addrs.h"
-    "${NICER_SOURCE}/src/stun/ifaddrs-android.h"
+    "${NICER_SOURCE}/src/stun/addrs-bsd.h"
+    "${NICER_SOURCE}/src/stun/addrs-netlink.h"
+    "${NICER_SOURCE}/src/stun/addrs-win32.h"
     "${NICER_SOURCE}/src/stun/nr_socket_turn.h"
     "${NICER_SOURCE}/src/stun/nr_socket_buffered_stun.h"
     "${NICER_SOURCE}/src/stun/stun.h"

src/ice/ice_candidate.c

@@ -106,26 +106,11 @@ static const char *nr_tcp_type_name(nr_socket_tcp_type tcp_type) {
 
 static int nr_ice_candidate_format_stun_label(char *label, size_t size, nr_ice_candidate *cand)
   {
-    int _status;
+  *label = 0;
+  snprintf(label, size, "%s(%s|%s)", nr_ctype_name(cand->type),
+           cand->base.as_string, cand->stun_server->addr.as_string);
 
-    *label = 0;
-    switch(cand->stun_server->type) {
-      case NR_ICE_STUN_SERVER_TYPE_ADDR:
-        snprintf(label, size, "%s(%s|%s)", nr_ctype_name(cand->type), cand->base.as_string,
-                 cand->stun_server->u.addr.as_string);
-        break;
-      case NR_ICE_STUN_SERVER_TYPE_DNSNAME:
-        snprintf(label, size, "%s(%s|%s:%u)", nr_ctype_name(cand->type), cand->base.as_string,
-                 cand->stun_server->u.dnsname.host, cand->stun_server->u.dnsname.port);
-        break;
-      default:
-        assert(0);
-        ABORT(R_BAD_ARGS);
-    }
-
-    _status=0;
-   abort:
-    return(_status);
+  return (0);
   }
 
 int nr_ice_candidate_create(nr_ice_ctx *ctx,nr_ice_component *comp,nr_ice_socket *isock, nr_socket *osock, nr_ice_candidate_type ctype, nr_socket_tcp_type tcp_type, nr_ice_stun_server *stun_server, UCHAR component_id, nr_ice_candidate **candp)
@@ -271,7 +256,7 @@ int nr_ice_peer_peer_rflx_candidate_create(nr_ice_ctx *ctx,char *label, nr_ice_c
 
 static void nr_ice_candidate_mark_done(nr_ice_candidate *cand, int state)
   {
-    if (!cand || !cand->done_cb) {
+    if (!cand) {
       assert(0);
       return;
     }
@@ -294,7 +279,9 @@ static void nr_ice_candidate_mark_done(nr_ice_candidate *cand, int state)
     cand->done_cb=0;
     cand->state=state;
     /* This might destroy cand! */
-    done_cb(0,0,cand->cb_arg);
+    if (done_cb) {
+      done_cb(0,0,cand->cb_arg);
+    }
   }
 
 int nr_ice_candidate_destroy(nr_ice_candidate **candp)
@@ -579,6 +566,24 @@ static void nr_ice_candidate_fire_ready_cb(NR_SOCKET s, int how, void *cb_arg)
     cand->ready_cb(0, 0, cand->ready_cb_arg);
   }
 
+static int nr_ice_candidate_use_nr_resolver(nr_transport_addr *addr)
+  {
+    if(addr->fqdn[0] == 0) {
+      return 0;
+    }
+
+    char use = 0;
+    if(addr->protocol == IPPROTO_UDP) {
+      NR_reg_get_char(NR_ICE_REG_USE_NR_RESOLVER_FOR_UDP, &use);
+    } else if(addr->protocol == IPPROTO_TCP) {
+      NR_reg_get_char(NR_ICE_REG_USE_NR_RESOLVER_FOR_TCP, &use);
+    } else {
+      assert(0);
+    }
+
+    return use;
+  }
+
 int nr_ice_candidate_initialize(nr_ice_candidate *cand, NR_async_cb ready_cb, void *cb_arg)
   {
     int r,_status;
@@ -603,28 +608,37 @@ int nr_ice_candidate_initialize(nr_ice_candidate *cand, NR_async_cb ready_cb, vo
         /* Fall through */
 #endif
       case SERVER_REFLEXIVE:
-        if(cand->stun_server->type == NR_ICE_STUN_SERVER_TYPE_ADDR) {
-          if(nr_transport_addr_cmp(&cand->base,&cand->stun_server->u.addr,NR_TRANSPORT_ADDR_CMP_MODE_PROTOCOL)) {
-            r_log(LOG_ICE, LOG_INFO, "ICE-CANDIDATE(%s): Skipping srflx/relayed candidate because of IP version/transport mis-match with STUN/TURN server (%u/%s - %u/%s).", cand->label,cand->base.ip_version,cand->base.protocol==IPPROTO_UDP?"UDP":"TCP",cand->stun_server->u.addr.ip_version,cand->stun_server->u.addr.protocol==IPPROTO_UDP?"UDP":"TCP");
-            ABORT(R_NOT_FOUND); /* Same error code when DNS lookup fails */
-          }
+        if (nr_transport_addr_cmp(&cand->base, &cand->stun_server->addr,
+                                  NR_TRANSPORT_ADDR_CMP_MODE_PROTOCOL)) {
+          r_log(LOG_ICE, LOG_INFO,
+                "ICE-CANDIDATE(%s): Skipping srflx/relayed candidate because "
+                "of IP version/transport mis-match with STUN/TURN server "
+                "(%u/%s - %u/%s).",
+                cand->label, cand->base.ip_version,
+                cand->base.protocol == IPPROTO_UDP ? "UDP" : "TCP",
+                cand->stun_server->addr.ip_version,
+                cand->stun_server->addr.protocol == IPPROTO_UDP ? "UDP"
+                                                                : "TCP");
+          ABORT(R_NOT_FOUND); /* Same error code when DNS lookup fails */
+        }
 
-          /* Just copy the address */
-          if (r=nr_transport_addr_copy(&cand->stun_server_addr,
-                                       &cand->stun_server->u.addr)) {
-            r_log(LOG_ICE,LOG_ERR,"ICE-CANDIDATE(%s): Could not copy STUN server addr", cand->label);
+        if(nr_ice_candidate_use_nr_resolver(&cand->stun_server->addr)) {
+          r_log(
+              LOG_ICE, LOG_DEBUG,
+              "ICE-CANDIDATE(%s): Starting DNS resolution (%u/%s - %u/%s).",
+              cand->label, cand->base.ip_version,
+              cand->base.protocol == IPPROTO_UDP ? "UDP" : "TCP",
+              cand->stun_server->addr.ip_version,
+              cand->stun_server->addr.protocol == IPPROTO_UDP ? "UDP" : "TCP");
+          nr_resolver_resource resource;
+          int port;
+          resource.domain_name = cand->stun_server->addr.fqdn;
+          if (r = nr_transport_addr_get_port(&cand->stun_server->addr, &port)) {
             ABORT(r);
           }
-
-          if(r=nr_ice_candidate_initialize2(cand))
-            ABORT(r);
-        }
-        else {
-          nr_resolver_resource resource;
-          resource.domain_name=cand->stun_server->u.dnsname.host;
-          resource.port=cand->stun_server->u.dnsname.port;
+          resource.port = (uint16_t)port;
           resource.stun_turn=protocol;
-          resource.transport_protocol=cand->stun_server->transport;
+          resource.transport_protocol = cand->stun_server->addr.protocol;
 
           switch (cand->base.ip_version) {
             case NR_IPV4:
@@ -634,6 +648,7 @@ int nr_ice_candidate_initialize(nr_ice_candidate *cand, NR_async_cb ready_cb, vo
               resource.address_family=AF_INET6;
               break;
             default:
+              assert(0);
               ABORT(R_BAD_ARGS);
           }
 
@@ -651,6 +666,16 @@ int nr_ice_candidate_initialize(nr_ice_candidate *cand, NR_async_cb ready_cb, vo
             r_log(LOG_ICE,LOG_ERR,"ICE-CANDIDATE(%s): Could not invoke DNS resolver",cand->label);
             ABORT(r);
           }
+        } else {
+          /* No nr_resolver for this, just copy the address and finish init */
+          if (r = nr_transport_addr_copy(&cand->stun_server_addr,
+                                         &cand->stun_server->addr)) {
+            r_log(LOG_ICE,LOG_ERR,"ICE-CANDIDATE(%s): Could not copy STUN server addr", cand->label);
+            ABORT(r);
+          }
+
+          if(r=nr_ice_candidate_initialize2(cand))
+            ABORT(r);
         }
         break;
       default:
@@ -818,6 +843,7 @@ static int nr_ice_start_relay_turn(nr_ice_candidate *cand)
                                    cand->u.relayed.server->username,
                                    cand->u.relayed.server->password,
                                    &cand->stun_server_addr,
+                                   cand->component->ctx,
                                    &cand->u.relayed.turn))
       ABORT(r);
 

src/ice/ice_candidate_pair.c

@@ -425,8 +425,7 @@ static int nr_ice_candidate_copy_for_triggered_check(nr_ice_cand_pair *pair)
     copy->nominated = pair->nominated;
 
     r_log(LOG_ICE,LOG_INFO,"CAND-PAIR(%s): Adding pair to check list and trigger check queue: %s",pair->codeword,pair->as_string);
-    if(r=nr_ice_candidate_pair_insert(&pair->remote->stream->check_list,copy))
-      ABORT(r);
+    nr_ice_candidate_pair_insert(&pair->remote->stream->check_list,copy);
     nr_ice_candidate_pair_trigger_check_append(&pair->remote->stream->trigger_check_queue,copy);
 
     copy->triggered = 1;
@@ -603,7 +602,7 @@ int nr_ice_candidate_pair_trigger_check_append(nr_ice_cand_pair_head *head,nr_ic
     return(0);
   }
 
-int nr_ice_candidate_pair_insert(nr_ice_cand_pair_head *head,nr_ice_cand_pair *pair)
+void nr_ice_candidate_pair_insert(nr_ice_cand_pair_head *head,nr_ice_cand_pair *pair)
   {
     nr_ice_cand_pair *c1;
 
@@ -617,8 +616,6 @@ int nr_ice_candidate_pair_insert(nr_ice_cand_pair_head *head,nr_ice_cand_pair *p
       c1=TAILQ_NEXT(c1,check_queue_entry);
     }
     if(!c1) TAILQ_INSERT_TAIL(head,pair,check_queue_entry);
-
-    return(0);
   }
 
 void nr_ice_candidate_pair_restart_stun_nominated_cb(NR_SOCKET s, int how, void *cb_arg)

src/ice/ice_candidate_pair.h

@@ -88,7 +88,7 @@ void nr_ice_candidate_pair_dump_state(nr_ice_cand_pair *pair, int log_level);
 void nr_ice_candidate_pair_cancel(nr_ice_peer_ctx *pctx,nr_ice_cand_pair *pair, int move_to_wait_state);
 int nr_ice_candidate_pair_select(nr_ice_cand_pair *pair);
 int nr_ice_candidate_pair_do_triggered_check(nr_ice_peer_ctx *pctx, nr_ice_cand_pair *pair);
-int nr_ice_candidate_pair_insert(nr_ice_cand_pair_head *head,nr_ice_cand_pair *pair);
+void nr_ice_candidate_pair_insert(nr_ice_cand_pair_head *head,nr_ice_cand_pair *pair);
 int nr_ice_candidate_pair_trigger_check_append(nr_ice_cand_pair_head *head,nr_ice_cand_pair *pair);
 void nr_ice_candidate_pair_restart_stun_nominated_cb(NR_SOCKET s, int how, void *cb_arg);
 int nr_ice_candidate_pair_destroy(nr_ice_cand_pair **pairp);