Changeset 5513 for pjproject/branches/projects/uwp/pjnath/src/pjnath/stun_sock.c

Timestamp:

Dec 28, 2016 3:40:07 AM (7 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)
• pjnath/src/pjnath/stun_sock.c (modified) (3 diffs)

pjproject/branches/projects/uwp/pjnath/src/pjnath/stun_sock.c

@@ -417 +417 @@
         pj_assert(stun_sock->q == NULL);
 
-        opt = PJ_DNS_SRV_FALLBACK_A;
-        if (stun_sock->af == pj_AF_INET6()) {
-            opt |= (PJ_DNS_SRV_RESOLVE_AAAA | PJ_DNS_SRV_FALLBACK_AAAA);
-        }
+        /* Init DNS resolution option */
+        if (stun_sock->af == pj_AF_INET6())
+            opt = (PJ_DNS_SRV_RESOLVE_AAAA_ONLY | PJ_DNS_SRV_FALLBACK_AAAA);
+        else
+            opt = PJ_DNS_SRV_FALLBACK_A;
 
         status = pj_dns_srv_resolve(domain, &res_name, default_port, 
@@ -436 +437 @@
 
             status = pj_getaddrinfo(stun_sock->af, domain, &cnt, &ai);
-            if (status != PJ_SUCCESS)
+            if (cnt == 0)
+                status = PJ_EAFNOTSUP;
+
+            if (status != PJ_SUCCESS) {
+                pj_grp_lock_release(stun_sock->grp_lock);
                 return status;
+            }
 
             pj_sockaddr_cp(&stun_sock->srv_addr, &ai.ai_addr);
@@ -573 +579 @@
     pj_assert(rec->count);
     pj_assert(rec->entry[0].server.addr_count);
-
-    PJ_TODO(SUPPORT_IPV6_IN_RESOLVER);
-    pj_assert(stun_sock->af == pj_AF_INET());
+    pj_assert(rec->entry[0].server.addr[0].af == stun_sock->af);
 
     /* Set the address */
-    pj_sockaddr_in_init(&stun_sock->srv_addr.ipv4, NULL,
-                        rec->entry[0].port);
-    stun_sock->srv_addr.ipv4.sin_addr = rec->entry[0].server.addr[0];
+    pj_sockaddr_init(stun_sock->af, &stun_sock->srv_addr, NULL,
+                     rec->entry[0].port);
+    if (stun_sock->af == pj_AF_INET6()) {
+        stun_sock->srv_addr.ipv6.sin6_addr = 
+                                    rec->entry[0].server.addr[0].ip.v6;
+    } else {
+        stun_sock->srv_addr.ipv4.sin_addr = 
+                                    rec->entry[0].server.addr[0].ip.v4;
+    }
 
     /* Start sending Binding request */