Changeset 5337 for pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

Timestamp:

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

Author:

nanang

Message:

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

File:

• pjproject/trunk/pjsip/src/pjsip/sip_resolve.c (modified) (6 diffs)

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 */