Changeset 5562 for pjproject/trunk/pjnath/src/pjnath/ice_strans.c

Timestamp:

Mar 3, 2017 2:11:02 AM (7 years ago)

Author:

ming

Message:

Fixed #1966:

• Add option to specify default address family in ICE default candidate
• As answerer, match the address family in the SDP offer if possible.

File:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (6 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -232 +232 @@
     pj_bzero(cfg, sizeof(*cfg));
 
+    cfg->af = pj_AF_INET();
     pj_stun_config_init(&cfg->stun_cfg, NULL, 0, NULL, NULL);
     pj_ice_strans_stun_cfg_default(&cfg->stun);
@@ -346 +347 @@
                 if (comp->cand_list[i].type == PJ_ICE_CAND_TYPE_SRFLX) {
                     comp->default_cand = i;
-                    break;
+                    if (ice_st->cfg.af == pj_AF_UNSPEC() ||
+                        comp->cand_list[i].base_addr.addr.sa_family ==
+                        ice_st->cfg.af)
+                    {
+                        break;
+                    }
                 }
             }
@@ -548 +554 @@
 
         /* Set default candidate to srflx */
-        comp->default_cand = (unsigned)(cand - comp->cand_list);
+        if (comp->cand_list[comp->default_cand].type != PJ_ICE_CAND_TYPE_SRFLX
+            || (ice_st->cfg.af != pj_AF_UNSPEC() &&
+                comp->cand_list[comp->default_cand].base_addr.addr.sa_family
+                != ice_st->cfg.af))
+        {
+            comp->default_cand = (unsigned)(cand - comp->cand_list);
+        }
 
         pj_log_pop_indent();
@@ -639 +651 @@
                                    cand->type, &cand->base_addr);
 
+            /* Set default candidate with the preferred default
+             * address family
+             */
+            if (comp->ice_st->cfg.af != pj_AF_UNSPEC() &&
+                comp->cand_list[comp->default_cand].addr.addr.sa_family !=
+                ice_st->cfg.af)
+            {
+                comp->default_cand = (unsigned)(cand - comp->cand_list);
+            }
+
             PJ_LOG(4,(ice_st->obj_name,
                       "Comp %d/%d: host candidate %s (tpid=%d) added",
@@ -2004 +2026 @@
 
         /* Set default candidate to relay */
-        comp->default_cand = (unsigned)(cand - comp->cand_list);
+        if (comp->cand_list[comp->default_cand].type!=PJ_ICE_CAND_TYPE_RELAYED
+            || (comp->ice_st->cfg.af != pj_AF_UNSPEC() &&
+                comp->cand_list[comp->default_cand].addr.addr.sa_family
+                != comp->ice_st->cfg.af))
+        {
+            comp->default_cand = (unsigned)(cand - comp->cand_list);
+        }
 
         /* Prefer IPv4 relay as default candidate for better connectivity
          * with IPv4 endpoints.
          */
+        /*
         if (cand->addr.addr.sa_family != pj_AF_INET()) {
             for (i=0; i<comp->cand_cnt; ++i) {
@@ -2020 +2049 @@
             }
         }
+        */
 
         PJ_LOG(4,(comp->ice_st->obj_name,