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

Timestamp:

Dec 1, 2007 8:59:25 AM (16 years ago)

Author:

bennylp

Message:

Ticket #421: initial IPv6 support: UDP transport

File:

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

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

@@ -22 +22 @@
 #include <pjlib-util/errno.h>
 #include <pjlib-util/srv_resolver.h>
+#include <pj/addr_resolv.h>
 #include <pj/array.h>
 #include <pj/assert.h>
@@ -138 +139 @@
 /*
  * Internal:
- *  determine if an address is a valid IP address.
- */
-static int is_str_ip(const pj_str_t *host)
-{
-    const char *p = host->ptr;
-    const char *end = ((const char*)host->ptr) + host->slen;
-
-    while (p != end) {
-        if (pj_isdigit(*p) || *p=='.') {
-            ++p;
-        } else {
-            return 0;
-        }
-    }
-    return 1;
+ *  determine if an address is a valid IP address, and if it is,
+ *  return the IP version (4 or 6).
+ */
+static int get_ip_addr_ver(const pj_str_t *host)
+{
+    pj_in_addr dummy;
+    pj_in6_addr dummy6;
+
+    /* First check with inet_aton() */
+    if (pj_inet_aton(host, &dummy) > 0)
+        return 4;
+
+    /* Then check if this is an IPv6 address */
+    if (pj_inet_pton(pj_AF_INET6(), host, &dummy6) == PJ_SUCCESS)
+        return 6;
+
+    /* Not an IP address */
+    return 0;
 }
 
@@ -167 +171 @@
     pjsip_server_addresses svr_addr;
     pj_status_t status = PJ_SUCCESS;
-    int is_ip_addr;
+    int ip_addr_ver;
     struct query *query;
     pjsip_transport_type_e type = target->type;
 
-    /* Is it IP address or hostname?. */
-    is_ip_addr = is_str_ip(&target->addr.host);
+    /* Is it IP address or hostname? And if it's an IP, which version? */
+    ip_addr_ver = get_ip_addr_ver(&target->addr.host);
 
     /* Set the transport type if not explicitly specified. 
@@ -178 +182 @@
      */
     if (type == PJSIP_TRANSPORT_UNSPECIFIED) {
-        if (is_ip_addr || (target->addr.port != 0)) {
+        if (ip_addr_ver || (target->addr.port != 0)) {
 #if PJ_HAS_TCP
             if (target->flag & PJSIP_TRANSPORT_SECURE) 
@@ -210 +214 @@
             }
         }
+
+        /* Add IPv6 flag for IPv6 address */
+        if (ip_addr_ver == 6)
+            type = (pjsip_transport_type_e)((int)type + PJSIP_TRANSPORT_IPV6);
     }
 
@@ -216 +224 @@
      * we can just finish the resolution now using pj_gethostbyname()
      */
-    if (is_ip_addr || resolver->res == NULL) {
+    if (ip_addr_ver || resolver->res == NULL) {
 
         pj_in_addr ip_addr;
+        int af;
+        pj_addrinfo ai;
+        unsigned count;
         pj_uint16_t srv_port;
 
-        if (!is_ip_addr) {
+        if (!ip_addr_ver) {
             PJ_LOG(5,(THIS_FILE, 
                       "DNS resolver not available, target '%.*s:%d' type=%s "
@@ -239 +250 @@
         }
 
-        /* This will eventually call pj_gethostbyname() if the host
-         * is not an IP address.
-         */
-        status = pj_sockaddr_in_init((pj_sockaddr_in*)&svr_addr.entry[0].addr,
-                                      &target->addr.host, srv_port);
+        if (type & PJSIP_TRANSPORT_IPV6) {
+            af = pj_AF_INET6();
+        } else {
+            af = pj_AF_INET();
+        }
+
+        /* Resolve */
+        count = 1;
+        status = pj_getaddrinfo(af, &target->addr.host, &count, &ai);
         if (status != PJ_SUCCESS)
             goto on_error;
+
+        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));
+
+        if (af == pj_AF_INET6()) {
+            svr_addr.entry[0].addr.ipv6.sin6_port = pj_htons(srv_port);
+        } else {
+            svr_addr.entry[0].addr.ipv4.sin_port = pj_htons(srv_port);
+        }
 
         /* Call the callback. */