Update contrib/libs/c-ares to 1.33.0

023d295bf695dc8b9df70e1ee966dc423cdf62ca

1 files changed, 3 insertions, 11 deletions

diff --git a/contrib/libs/c-ares/src/lib/ares__sortaddrinfo.c b/contrib/libs/c-ares/src/lib/ares__sortaddrinfo.c
index 155cc8caf4..1aab81ecf8 100644
--- a/contrib/libs/c-ares/src/lib/ares__sortaddrinfo.c
+++ b/contrib/libs/c-ares/src/lib/ares__sortaddrinfo.c
@@ -36,7 +36,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -51,9 +51,6 @@
 #include <assert.h>
 #include <limits.h>
 
-#include "ares.h"
-#include "ares_private.h"
-
 struct addrinfo_sort_elem {
   struct ares_addrinfo_node *ai;
   ares_bool_t                has_src_addr;
@@ -349,7 +346,6 @@ static int find_src_addr(ares_channel_t *channel, const struct sockaddr *addr,
                          struct sockaddr *src_addr)
 {
   ares_socket_t  sock;
-  int            ret;
   ares_socklen_t len;
 
   switch (addr->sa_family) {
@@ -366,18 +362,14 @@ static int find_src_addr(ares_channel_t *channel, const struct sockaddr *addr,
 
   sock = ares__open_socket(channel, addr->sa_family, SOCK_DGRAM, IPPROTO_UDP);
   if (sock == ARES_SOCKET_BAD) {
-    if (errno == EAFNOSUPPORT) {
+    if (SOCKERRNO == EAFNOSUPPORT) {
       return 0;
     } else {
       return -1;
     }
   }
 
-  do {
-    ret = ares__connect_socket(channel, sock, addr, len);
-  } while (ret == -1 && errno == EINTR);
-
-  if (ret == -1) {
+  if (ares__connect_socket(channel, sock, addr, len) != ARES_SUCCESS) {
     ares__close_socket(channel, sock);
     return 0;
   }