Changeset 5337

Timestamp:

Jun 8, 2016 2:49:56 AM (8 years ago)

Author:

nanang

Message:

Close #1926: Support IPv6 address resolution without DNS resolver.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (2 diffs)
• src/pjsip/sip_resolve.c (modified) (6 diffs)
• src/pjsip/sip_util.c (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (9 diffs)

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

@@ -284 +284 @@
 
     pj_uint16_t      next_rtp_port; /**< Next RTP port to be used.      */
+    pjsip_transport_type_e tp_type; /**< Transport type (for local acc or
+                                         transport binding)             */
 } pjsua_acc;
 
@@ -623 +625 @@
 pj_bool_t pjsua_media_acc_is_using_stun(pjsua_acc_id acc_id);
 
+/* acc use IPv6? */
+pj_bool_t pjsua_sip_acc_is_using_ipv6(pjsua_acc_id acc_id);
+
 /* Get local transport address suitable to be used for Via or Contact address
  * to send request to the specified destination URI.

pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

@@ -196 +196 @@
     struct query *query;
     pjsip_transport_type_e type = target->type;
+    int af = pj_AF_UNSPEC();
 
     /* If an external implementation has been provided use it instead */
@@ -205 +206 @@
     /* Is it IP address or hostname? And if it's an IP, which version? */
     ip_addr_ver = get_ip_addr_ver(&target->addr.host);
+
+    /* Initialize address family type */
+    if ((ip_addr_ver == 6) || (type & PJSIP_TRANSPORT_IPV6))
+        af = pj_AF_INET6();
+    else if (ip_addr_ver == 4)
+        af = pj_AF_INET();
 
     /* Set the transport type if not explicitly specified. 
@@ -242 +249 @@
             }
         }
-
-        /* Add IPv6 flag for IPv6 address */
-        if (ip_addr_ver == 6)
-            type = (pjsip_transport_type_e)((int)type + PJSIP_TRANSPORT_IPV6);
     }
 
@@ -272 +275 @@
             pj_addrinfo ai;
             unsigned count;
-            int af;
 
             PJ_LOG(5,(THIS_FILE,
@@ -281 +283 @@
                       target->addr.port,
                       pjsip_transport_get_type_name(target->type)));
-
-            if (type & PJSIP_TRANSPORT_IPV6) {
-                af = pj_AF_INET6();
-            } else {
-                af = pj_AF_INET();
-            }
 
             /* Resolve */
@@ -300 +296 @@
             }
 
-            svr_addr.entry[0].addr.addr.sa_family = (pj_uint16_t)af;
-            pj_memcpy(&svr_addr.entry[0].addr, &ai.ai_addr,
-                      sizeof(pj_sockaddr));
+            pj_sockaddr_cp(&svr_addr.entry[0].addr, &ai.ai_addr);
+            if (af == pj_AF_UNSPEC())
+                af = ai.ai_addr.addr.sa_family;
         }
+
+        /* After address resolution, update IPv6 bitflag in transport type. */
+        if (af == pj_AF_INET6())
+            type |= PJSIP_TRANSPORT_IPV6;
 
         /* Set the port number */

pjproject/trunk/pjsip/src/pjsip/sip_util.c

@@ -1016 +1016 @@
     if (status != PJ_SUCCESS)
         return status;
+
+    /* If transport selector is set, set destination type accordingly */
+    if (tdata->tp_sel.type != PJSIP_TPSELECTOR_NONE && tdata->tp_sel.u.ptr) {
+        if (tdata->tp_sel.type == PJSIP_TPSELECTOR_TRANSPORT)
+            dest_info->type = tdata->tp_sel.u.transport->key.type;
+        else if (tdata->tp_sel.type == PJSIP_TPSELECTOR_LISTENER)
+            dest_info->type = tdata->tp_sel.u.listener->type;
+    }
 
     /* If target URI is different than request URI, replace 

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

@@ -382 +382 @@
                     pjsua_var.acc_cnt, i, &acc_id);
 
+    if (acc_cfg->transport_id != PJSUA_INVALID_ID)
+        acc->tp_type = pjsua_var.tpdata[acc_cfg->transport_id].type;
+
     return PJ_SUCCESS;
 }
@@ -513 +516 @@
     char transport_param[32];
     char uri[PJSIP_MAX_URL_SIZE];
+    pjsua_acc_id acc_id;
+    pj_status_t status;
 
     /* ID must be valid */
@@ -555 +560 @@
     cfg.id = pj_str(uri);
     
-    return pjsua_acc_add(&cfg, is_default, p_acc_id);
+    status = pjsua_acc_add(&cfg, is_default, &acc_id);
+    if (status == PJ_SUCCESS) {
+        pjsua_var.acc[acc_id].tp_type = t->type;
+        if (p_acc_id)
+            *p_acc_id = acc_id;
+    }
+
+    return status;
 }
 
@@ -2481 +2493 @@
 }
 
+pj_bool_t pjsua_sip_acc_is_using_ipv6(pjsua_acc_id acc_id)
+{
+    pjsua_acc *acc = &pjsua_var.acc[acc_id];
+
+    return (acc->tp_type & PJSIP_TRANSPORT_IPV6) == PJSIP_TRANSPORT_IPV6;
+}
+
 pj_bool_t pjsua_sip_acc_is_using_stun(pjsua_acc_id acc_id)
 {
@@ -2920 +2939 @@
 
         if (acc->valid && pj_stricmp(&acc->user_part, &sip_uri->user)==0) {
-
-            if (acc->cfg.transport_id != PJSUA_INVALID_ID) {
-                pjsip_transport_type_e type;
-                type = pjsip_transport_get_type_from_name(&sip_uri->transport_param);
-                if (type == PJSIP_TRANSPORT_UNSPECIFIED)
-                    type = PJSIP_TRANSPORT_UDP;
-
-                if (pjsua_var.tpdata[acc->cfg.transport_id].type != type)
-                    continue;
+            if (acc->tp_type != PJSIP_TRANSPORT_UNSPECIFIED &&
+                acc->tp_type != rdata->tp_info.transport->key.type)
+            {
+                continue;
             }
 
@@ -3101 +3115 @@
         return PJSIP_EUNSUPTRANSPORT;
 
-    /* If destination URI specifies IPv6, then set transport type
-     * to use IPv6 as well.
+    /* If destination URI specifies IPv6 or account is configured to use IPv6,
+     * then set transport type to use IPv6 as well.
      */
-    if (pj_strchr(&sip_uri->host, ':'))
+    if (pj_strchr(&sip_uri->host, ':') || pjsua_sip_acc_is_using_ipv6(acc_id))
         tp_type = (pjsip_transport_type_e)(((int)tp_type) |
                   PJSIP_TRANSPORT_IPV6);
@@ -3167 +3181 @@
         if (status == PJ_SUCCESS) {
             unsigned cnt=1;
-            int af;
-
-            af = (dinfo.type & PJSIP_TRANSPORT_IPV6)? PJ_AF_INET6 : PJ_AF_INET;
+            int af = pj_AF_UNSPEC();
+
+            if (pjsua_sip_acc_is_using_ipv6(acc_id) ||
+                (dinfo.type & PJSIP_TRANSPORT_IPV6))
+            {
+                af = pj_AF_INET6();
+            }
             status = pj_getaddrinfo(af, &dinfo.addr.host, &cnt, &ai);
-            if (cnt == 0) status = PJ_ENOTSUP;
+            if (cnt == 0) {
+                status = PJ_ENOTSUP;
+            } else if ((dinfo.type & PJSIP_TRANSPORT_IPV6)==0 &&
+                        ai.ai_addr.addr.sa_family == pj_AF_INET6())
+            {
+                /* Destination is a hostname and account is not bound to IPv6,
+                 * but hostname resolution reveals that it has IPv6 address,
+                 * so let's use IPv6 transport type.
+                 */
+                dinfo.type |= PJSIP_TRANSPORT_IPV6;
+                tp_type |= PJSIP_TRANSPORT_IPV6;
+            }
         }
 
@@ -3417 +3446 @@
         return PJSIP_EUNSUPTRANSPORT;
 
-    /* If destination URI specifies IPv6, then set transport type
-     * to use IPv6 as well.
+    /* If destination URI specifies IPv6 or account is configured to use IPv6
+     * or the transport being used to receive data is an IPv6 transport,
+     * then set transport type to use IPv6 as well.
      */
-    if (pj_strchr(&sip_uri->host, ':'))
-        tp_type = (pjsip_transport_type_e)(((int)tp_type) + PJSIP_TRANSPORT_IPV6);
+    if (pj_strchr(&sip_uri->host, ':') ||
+        pjsua_sip_acc_is_using_ipv6(acc_id) ||
+        (rdata->tp_info.transport->key.type & PJSIP_TRANSPORT_IPV6))
+    {
+        tp_type = (pjsip_transport_type_e)
+                  (((int)tp_type) | PJSIP_TRANSPORT_IPV6);
+    }
 
     flag = pjsip_transport_get_flag_from_type(tp_type);
@@ -3505 +3540 @@
     
     acc->cfg.transport_id = tp_id;
+    acc->tp_type = pjsua_var.tpdata[tp_id].type;
 
     return PJ_SUCCESS;