Changeset 6044 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Jul 26, 2019 5:40:42 AM (4 years ago)

Author:

nanang

Message:

Fix #2216: reverted back changes in ticket #2198: r6025, r5998, r5995.

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (6 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -1255 +1255 @@
 {
     pjsua_transport_id transport_id = -1;
-    pjsua_transport_id udp6_tp_id = -1, tcp6_tp_id = -1, tls6_tp_id = -1;
     pjsua_transport_config tcp_cfg;
     unsigned i;
@@ -1284 +1283 @@
         return status;
     }
-    
-    if (app_config.ipv6)
-        app_config.cfg.stun_try_ipv6 = PJ_TRUE;
 
     /* Initialize application callbacks */
@@ -1613 +1609 @@
         if (status != PJ_SUCCESS)
             goto on_error;
-        udp6_tp_id = transport_id;
 
         /* Add local account */
@@ -1679 +1674 @@
         if (status != PJ_SUCCESS)
             goto on_error;
-        tcp6_tp_id = transport_id;
 
         /* Add local account */
@@ -1719 +1713 @@
         if (status != PJ_SUCCESS)
             goto on_error;
-        tls6_tp_id = transport_id;
         
         /* Add local account */
@@ -1782 +1775 @@
         app_config.acc_cfg[i].reg_retry_interval = 300;
         app_config.acc_cfg[i].reg_first_retry_interval = 60;
-        if (app_config.ipv6) {
-            pj_str_t *dst_uri = NULL;
-            pj_str_t tmp;
-            pjsip_uri *uri;
-
-            // Uncomment this for testing in a NAT64 network
-            // app_config.acc_cfg[i].nat64_opt = PJSUA_NAT64_ENABLED;
-            app_config.acc_cfg[i].ipv6_media_use = PJSUA_IPV6_ENABLED;
-
-            if ((app_config.cfg.outbound_proxy_cnt > 0) &&
-                (app_config.acc_cfg[i].reg_use_proxy == 1 /* outbound */ ||
-                 app_config.acc_cfg[i].reg_use_proxy == 3 /* all */))
-            {
-                dst_uri = &app_config.cfg.outbound_proxy[0];
-            } else if ((app_config.acc_cfg[i].proxy_cnt > 0) &&
-                (app_config.acc_cfg[i].reg_use_proxy == 2 /* acc */ ||
-                 app_config.acc_cfg[i].reg_use_proxy == 3 /* all */))
-            {
-                dst_uri = &app_config.acc_cfg[i].proxy[0];
-            } else if (app_config.acc_cfg[i].reg_uri.slen > 0) {
-                dst_uri = &app_config.acc_cfg[i].reg_uri;
-            }
-            
-            pj_strdup_with_null(app_config.pool, &tmp, dst_uri);
-
-            uri = pjsip_parse_uri(app_config.pool, tmp.ptr, tmp.slen, 0);
-            if (uri != NULL) {
-                pjsip_sip_uri *sip_uri;
-                pjsip_transport_type_e tp_type = PJSIP_TRANSPORT_UNSPECIFIED;   
-                
-                sip_uri = (pjsip_sip_uri*)pjsip_uri_get_uri(uri);
-
-                /* Get transport type of the URI */
-                if (PJSIP_URI_SCHEME_IS_SIPS(sip_uri)) {
-                    tp_type = PJSIP_TRANSPORT_TLS;
-                } else if (sip_uri->transport_param.slen == 0) {
-                    tp_type = PJSIP_TRANSPORT_UDP;
-                } else {
-                    tp_type = pjsip_transport_get_type_from_name(
-                                  &sip_uri->transport_param);
-                    tp_type &= ~ PJSIP_TRANSPORT_IPV6;
-                }
-                
-                if (tp_type == PJSIP_TRANSPORT_UDP) {
-                    app_config.acc_cfg[i].transport_id = udp6_tp_id;
-                } else if (tp_type == PJSIP_TRANSPORT_TCP) {
-                    app_config.acc_cfg[i].transport_id = tcp6_tp_id;
-                } else if (tp_type == PJSIP_TRANSPORT_TLS) {
-                    app_config.acc_cfg[i].transport_id = tls6_tp_id;
-                }
-            }
-        }
 
         app_config_init_video(&app_config.acc_cfg[i]);