Changeset 5481 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Nov 14, 2016 6:13:01 AM (8 years ago)

Author:

nanang

Message:

Re #1971: Request IPv4 relay address to an IPv6 TURN server for IPv6-IPv4 connectivity.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (4 diffs)

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

@@ -927 +927 @@
         ice_cfg.turn_tp_cnt = 1;
         pj_ice_strans_turn_cfg_default(&ice_cfg.turn_tp[0]);
-        if (use_ipv6 && PJ_ICE_MAX_TURN >= 2) {
-            ice_cfg.turn_tp_cnt = 2;
+        if (use_ipv6 && PJ_ICE_MAX_TURN >= 3) {
+            ice_cfg.turn_tp_cnt = 3;
+
             pj_ice_strans_turn_cfg_default(&ice_cfg.turn_tp[1]);
             ice_cfg.turn_tp[1].af = pj_AF_INET6();
+
+            /* Additional candidate: IPv4 relay via IPv6 TURN server */
+            pj_ice_strans_turn_cfg_default(&ice_cfg.turn_tp[2]);
+            ice_cfg.turn_tp[2].af = pj_AF_INET6();
+            ice_cfg.turn_tp[2].alloc_param.af = pj_AF_INET();
         }
 
@@ -957 +963 @@
                       &acc_cfg->turn_cfg.turn_auth_cred,
                       sizeof(ice_cfg.turn_tp[1].auth_cred));
+
+            ice_cfg.turn_tp[2].server    = ice_cfg.turn_tp[0].server;
+            ice_cfg.turn_tp[2].port      = ice_cfg.turn_tp[0].port;
+            ice_cfg.turn_tp[2].conn_type = ice_cfg.turn_tp[0].conn_type;
+            pj_memcpy(&ice_cfg.turn_tp[2].auth_cred, 
+                      &acc_cfg->turn_cfg.turn_auth_cred,
+                      sizeof(ice_cfg.turn_tp[2].auth_cred));
         }
 
@@ -967 +980 @@
             pj_memcpy(&ice_cfg.turn_tp[1].cfg.qos_params, &cfg->qos_params,
                       sizeof(cfg->qos_params));
+
+            ice_cfg.turn_tp[2].cfg.qos_type = cfg->qos_type;
+            pj_memcpy(&ice_cfg.turn_tp[2].cfg.qos_params, &cfg->qos_params,
+                      sizeof(cfg->qos_params));
         }
 
@@ -984 +1001 @@
             ice_cfg.turn_tp[1].cfg.port_range =
                             ice_cfg.turn_tp[0].cfg.port_range;
+
+            pj_sockaddr_init(pj_AF_INET6(),
+                             &ice_cfg.turn_tp[2].cfg.bound_addr,
+                             &IN6_ADDR_ANY, (pj_uint16_t)cfg->port);
+            ice_cfg.turn_tp[2].cfg.port_range =
+                            ice_cfg.turn_tp[0].cfg.port_range;
         }
 
         /* Configure max packet size */
         ice_cfg.turn_tp[0].cfg.max_pkt_size = PJMEDIA_MAX_MRU;
-        if (use_ipv6 && ice_cfg.turn_tp_cnt > 1)
+        if (use_ipv6 && ice_cfg.turn_tp_cnt > 1) {
             ice_cfg.turn_tp[1].cfg.max_pkt_size = PJMEDIA_MAX_MRU;
+            ice_cfg.turn_tp[2].cfg.max_pkt_size = PJMEDIA_MAX_MRU;
+        }
     }