Changeset 5513 for pjproject/branches/projects/uwp/pjlib/src/pj/sock_common.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjlib/src/pj/sock_common.c (modified) (3 diffs)

pjproject/branches/projects/uwp/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;
             }
         }
@@ -1245 +1250 @@
 }
 
+PJ_DEF(int) pj_IPV6_TCLASS(void)
+{
+    return PJ_IPV6_TCLASS;
+}
+
 PJ_DEF(pj_uint16_t) pj_SO_TYPE(void)
 {