Changeset 5485

Timestamp:

Nov 17, 2016 4:38:25 AM (8 years ago)

Author:

ming

Message:

Fixed #1979: Add support to parse address string with scope ID

Location:

pjproject/trunk/pjlib

Files:

• include/pj/compat/os_auto.h.in (modified) (1 diff)
• src/pj/sock_common.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/compat/os_auto.h.in

@@ -182 +182 @@
      /* Disable local host resolution in pj_gethostip() (see ticket #1342) */
 #    define PJ_GETHOSTIP_DISABLE_LOCAL_RESOLUTION 1
+     /* Use pj_getaddrinfo() (instead of pj_inet_pton()) in
+      * pj_sockaddr_set_str_addr()
+      */
+#    define PJ_SOCKADDR_USE_GETADDRINFO 1
 
 #    include "TargetConditionals.h"

pjproject/trunk/pjlib/src/pj/sock_common.c

@@ -173 +173 @@
 
     if (str_addr && str_addr->slen) {
+#if defined(PJ_SOCKADDR_USE_GETADDRINFO) && PJ_SOCKADDR_USE_GETADDRINFO!=0
+        if (1) {
+#else
         status = pj_inet_pton(PJ_AF_INET6, str_addr, &addr->ipv6.sin6_addr);
         if (status != PJ_SUCCESS) {
+#endif
             pj_addrinfo ai;
             unsigned count = 1;
@@ -182 +186 @@
                 pj_memcpy(&addr->ipv6.sin6_addr, &ai.ai_addr.ipv6.sin6_addr,
                           sizeof(addr->ipv6.sin6_addr));
+                addr->ipv6.sin6_scope_id = ai.ai_addr.ipv6.sin6_scope_id;
             }
         }