Changeset 5839

Timestamp:

Jul 25, 2018 11:56:39 PM (6 years ago)

Author:

ming

Message:

Fixed #2133: Skip IPv4 STUN resolution if account is using NAT64

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (2 diffs)
• src/pjsua-lib/pjsua_core.c (modified) (6 diffs)
• src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -453 +453 @@
     pjsua_stun_resolve   stun_res;  /**< List of pending STUN resolution*/
     unsigned             stun_srv_idx; /**< Resolved STUN server index  */
+    unsigned             stun_opt;  /**< STUN resolution option.        */
     pj_dns_resolver     *resolver;  /**< DNS resolver.                  */   
 
@@ -624 +625 @@
  */
 /* Resolve the STUN server */
-pj_status_t resolve_stun_server(pj_bool_t wait, pj_bool_t retry_if_cur_error);
+pj_status_t resolve_stun_server(pj_bool_t wait, pj_bool_t retry_if_cur_error,
+                                unsigned options);
 
 /** 

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

@@ -1125 +1125 @@
 
     /* Start resolving STUN server */
-    status = resolve_stun_server(PJ_FALSE, PJ_FALSE);
+    status = resolve_stun_server(PJ_FALSE, PJ_FALSE, 0);
     if (status != PJ_SUCCESS && status != PJ_EPENDING) {
         pjsua_perror(THIS_FILE, "Error resolving STUN server", status);
@@ -1453 +1453 @@
         pj_assert(sess->idx < sess->count);
 
+        if (pjsua_var.ua_cfg.stun_try_ipv6 &&
+            pjsua_var.stun_opt != PJSUA_NAT64_DISABLED &&
+            sess->af == pj_AF_INET())
+        {
+            /* Skip IPv4 STUN resolution if NAT64 is not disabled. */
+            continue;
+        }
+
         pj_ansi_snprintf(target, sizeof(target), "%.*s",
                          (int)sess->srv[sess->idx].slen,
@@ -1549 +1557 @@
     PJSUA_UNLOCK();
     
-    status = resolve_stun_server(wait, PJ_FALSE);
+    status = resolve_stun_server(wait, PJ_FALSE, 0);
     if (wait == PJ_FALSE && status == PJ_EPENDING)
         status = PJ_SUCCESS;
@@ -1693 +1701 @@
  * Resolve STUN server.
  */
-pj_status_t resolve_stun_server(pj_bool_t wait, pj_bool_t retry_if_cur_error)
-{
+pj_status_t resolve_stun_server(pj_bool_t wait, pj_bool_t retry_if_cur_error,
+                                unsigned options)
+{
+    pjsua_var.stun_opt = options;
+
     /* Retry resolving if currently the STUN status is error */
     if (pjsua_var.stun_status != PJ_EPENDING &&
@@ -2195 +2206 @@
 
     /* Make sure STUN server resolution has completed */
-    status = resolve_stun_server(PJ_TRUE, PJ_TRUE);
+    status = resolve_stun_server(PJ_TRUE, PJ_TRUE, 0);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Error resolving STUN server", status);
@@ -3103 +3114 @@
 
     /* Make sure STUN server resolution has completed */
-    status = resolve_stun_server(PJ_TRUE, PJ_TRUE);
+    status = resolve_stun_server(PJ_TRUE, PJ_TRUE, 0);
     if (status != PJ_SUCCESS) {
         pjsua_var.nat_status = status;

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

@@ -270 +270 @@
                                 PJSUA_STUN_RETRY_ON_FAILURE) ==
                                 PJSUA_STUN_RETRY_ON_FAILURE;
-        status = resolve_stun_server(PJ_TRUE, retry_stun);
+        status = resolve_stun_server(PJ_TRUE, retry_stun,
+                                     (unsigned)acc->cfg.nat64_opt);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Error resolving STUN server", status);
@@ -861 +862 @@
                                 PJSUA_STUN_RETRY_ON_FAILURE) ==
                                 PJSUA_STUN_RETRY_ON_FAILURE;
-        status = resolve_stun_server(PJ_TRUE, retry_stun);
+        status = resolve_stun_server(PJ_TRUE, retry_stun,
+                                     (unsigned)acc_cfg->nat64_opt);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Error resolving STUN server", status);