Changeset 5420

Timestamp:

Aug 17, 2016 4:29:17 AM (8 years ago)

Author:

nanang

Message:

Fixed #1953: Skip IPv6 socket in resolver on system without IPv6 support.

Location:

pjproject/trunk

Files:

• pjlib-util/src/pjlib-util/resolver.c (modified) (8 diffs)
• pjlib/include/pj/compat/socket.h (modified) (3 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c

@@ -20 +20 @@
 #include <pjlib-util/resolver.h>
 #include <pjlib-util/errno.h>
+#include <pj/compat/socket.h>
 #include <pj/assert.h>
 #include <pj/ctype.h>
@@ -310 +311 @@
     status = pj_sock_socket(pj_AF_INET6(), pj_SOCK_DGRAM(), 0,
                             &resv->udp6_sock);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        /* Skip IPv6 socket on system without IPv6 (see ticket #1953) */
+        if (status == PJ_STATUS_FROM_OS(OSERR_EAFNOSUPPORT)) {
+            PJ_LOG(3,(resv->name.ptr,
+                      "System does not support IPv6, resolver will "
+                      "ignore any IPv6 nameservers"));
+            return PJ_SUCCESS;
+        }
         return status;
+    }
 
     /* Bind to any address/port */
@@ -651 +660 @@
 {
     unsigned pkt_size;
-    unsigned i, server_cnt;
+    unsigned i, server_cnt, send_cnt;
     unsigned servers[PJ_DNS_RESOLVER_MAX_NS];
     pj_time_val now;
@@ -686 +695 @@
     if (pj_ioqueue_is_pending(resolver->udp_key, &resolver->udp_op_tx_key)
 #if PJ_HAS_IPV6
-        || pj_ioqueue_is_pending(resolver->udp6_key,
-                                 &resolver->udp6_op_tx_key)
+        || (resolver->udp6_key &&
+            pj_ioqueue_is_pending(resolver->udp6_key,
+                                  &resolver->udp6_op_tx_key))
 #endif
         )
@@ -715 +725 @@
 
     /* Send the packet to name servers */
+    send_cnt = 0;
     for (i=0; i<server_cnt; ++i) {
         char addr[PJ_INET6_ADDRSTRLEN];
@@ -726 +737 @@
                                        &ns->addr,
                                        pj_sockaddr_get_len(&ns->addr));
+            if (status == PJ_SUCCESS || status == PJ_EPENDING)
+                send_cnt++;
         }
 #if PJ_HAS_IPV6
-        else {
+        else if (resolver->udp6_key) {
             status = pj_ioqueue_sendto(resolver->udp6_key,
                                        &resolver->udp6_op_tx_key,
@@ -734 +747 @@
                                        &ns->addr,
                                        pj_sockaddr_get_len(&ns->addr));
+            if (status == PJ_SUCCESS || status == PJ_EPENDING)
+                send_cnt++;
         }
 #endif
+        else {
+            continue;
+        }
 
         PJ_PERROR(4,(resolver->name.ptr, status,
@@ -751 +769 @@
         }
     }
+
+    if (send_cnt == 0)
+        return PJLIB_UTIL_EDNSNOWORKINGNS;
 
     ++q->transmit_cnt;

pjproject/trunk/pjlib/include/pj/compat/socket.h

@@ -159 +159 @@
 #  define OSERR_ECONNRESET     WSAECONNRESET
 #  define OSERR_ENOTCONN       WSAENOTCONN
+#  define OSERR_EAFNOSUPPORT   WSAEAFNOSUPPORT
 #elif defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0
 #  define OSERR_EWOULDBLOCK    -1
@@ -164 +165 @@
 #  define OSERR_ECONNRESET     -1
 #  define OSERR_ENOTCONN       -1
+#  define OSERR_EAFNOSUPPORT   -1
 #else
 #  define OSERR_EWOULDBLOCK    EWOULDBLOCK
@@ -169 +171 @@
 #  define OSERR_ECONNRESET     ECONNRESET
 #  define OSERR_ENOTCONN       ENOTCONN
+#  define OSERR_EAFNOSUPPORT   EAFNOSUPPORT
 #endif