Changeset 5342

Timestamp:

Jun 13, 2016 7:11:41 AM (8 years ago)

Author:

nanang

Message:

Re #422: Enable IPv6 in ICE transport in pjsua-lib:

• currently only IPv6 host candidate will be generated, still not sure whether IPv6 NAT is really used in real world
• if the account enables IPv6 media and the host has IPv4 address, ICE will generate IPv4+IPv6 candidates, it should be very useful in NAT64 environment, and should not add delay in ICE nego in IPv6 only environment (note: candidate check pair must have same IP address family).

Location:

pjproject/trunk

Files:

• pjnath/src/pjnath/ice_strans.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (6 diffs)

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

@@ -675 +675 @@
     for (i=0; i<ice_st->cfg.stun_tp_cnt; ++i) {
         status = add_stun_and_host(ice_st, comp, i);
-        if (status != PJ_SUCCESS)
-            return status;
+        if (status != PJ_SUCCESS) {
+            PJ_PERROR(3,(ice_st->obj_name, status,
+                         "Failed creating STUN transport #%d for comp %d",
+                         i, comp->comp_id));
+            //return status;
+        }
     }
 
@@ -682 +686 @@
     for (i=0; i<ice_st->cfg.turn_tp_cnt; ++i) {
         status = add_update_turn(ice_st, comp, i);
-        if (status != PJ_SUCCESS)
-            return status;
+        if (status != PJ_SUCCESS) {
+            PJ_PERROR(3,(ice_st->obj_name, status,
+                         "Failed creating TURN transport #%d for comp %d",
+                         i, comp->comp_id));
+            //return status;
+        }
     }
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -824 +824 @@
     unsigned comp_cnt;
     pj_status_t status;
+    pj_bool_t use_ipv6;
 
     acc_cfg = &pjsua_var.acc[call_med->call->acc_id].cfg;
+    use_ipv6 = (acc_cfg->ipv6_media_use != PJSUA_IPV6_DISABLED);
 
     /* Make sure STUN server resolution has completed */
@@ -856 +858 @@
         ice_cfg.stun_tp_cnt = 1;
         pj_ice_strans_stun_cfg_default(&ice_cfg.stun_tp[0]);
+        if (use_ipv6 && PJ_ICE_MAX_STUN >= 2) {
+            ice_cfg.stun_tp_cnt = 2;
+            pj_ice_strans_stun_cfg_default(&ice_cfg.stun_tp[1]);
+            ice_cfg.stun_tp[1].af = pj_AF_INET6();
+        }
     }
 
@@ -866 +873 @@
         ice_cfg.stun_tp[0].port = pj_sockaddr_get_port(&pjsua_var.stun_srv);
     }
-    if (acc_cfg->ice_cfg.ice_max_host_cands >= 0)
-        ice_cfg.stun_tp[0].max_host_cands = acc_cfg->ice_cfg.ice_max_host_cands;
+    if (acc_cfg->ice_cfg.ice_max_host_cands >= 0) {
+        ice_cfg.stun_tp[0].max_host_cands =
+                                    acc_cfg->ice_cfg.ice_max_host_cands;
+        if (use_ipv6)
+            ice_cfg.stun_tp[1].max_host_cands =
+                                    acc_cfg->ice_cfg.ice_max_host_cands;
+    }
 
     /* Copy binding port setting to STUN setting */
@@ -873 +885 @@
                      &cfg->bound_addr, (pj_uint16_t)cfg->port);
     ice_cfg.stun_tp[0].cfg.port_range = (pj_uint16_t)cfg->port_range;
-    if (cfg->port != 0 && ice_cfg.stun_tp[0].cfg.port_range == 0)
+    if (cfg->port != 0 && ice_cfg.stun_tp[0].cfg.port_range == 0) {
         ice_cfg.stun_tp[0].cfg.port_range = 
                                  (pj_uint16_t)(pjsua_var.ua_cfg.max_calls * 10);
+    }
+    if (use_ipv6) {
+        pj_str_t IN6_ADDR_ANY = {"0", 1};
+        pj_sockaddr_init(pj_AF_INET6(), &ice_cfg.stun_tp[1].cfg.bound_addr,
+                         &IN6_ADDR_ANY, (pj_uint16_t)cfg->port);
+        ice_cfg.stun_tp[1].cfg.port_range = ice_cfg.stun_tp[0].cfg.port_range;
+    }
 
     /* Copy QoS setting to STUN setting */
@@ -881 +900 @@
     pj_memcpy(&ice_cfg.stun_tp[0].cfg.qos_params, &cfg->qos_params,
               sizeof(cfg->qos_params));
+    if (use_ipv6) {
+        ice_cfg.stun_tp[1].cfg.qos_type = cfg->qos_type;
+        pj_memcpy(&ice_cfg.stun_tp[1].cfg.qos_params, &cfg->qos_params,
+                  sizeof(cfg->qos_params));
+    }
 
     /* Configure TURN settings */
@@ -917 +941 @@
     ice_cfg.stun_tp[0].cfg.max_pkt_size = PJMEDIA_MAX_MRU;
     ice_cfg.turn_tp[0].cfg.max_pkt_size = PJMEDIA_MAX_MRU;
+
+    if (use_ipv6) {
+        ice_cfg.stun_tp[1].cfg.max_pkt_size = PJMEDIA_MAX_MRU;
+    }
 
     pj_bzero(&ice_cb, sizeof(pjmedia_ice_cb));