grpc 1.55.0 → 1.56.2

data/third_party/cares/cares/src/lib/ares_library_init.c

@@ -18,18 +18,10 @@
 #include "ares_setup.h"
 
 #include "ares.h"
-#include "ares_library_init.h"
 #include "ares_private.h"
 
 /* library-private global and unique instance vars */
 
-#ifdef USE_WINSOCK
-fpGetNetworkParams_t ares_fpGetNetworkParams = ZERO_NULL;
-fpSystemFunction036_t ares_fpSystemFunction036 = ZERO_NULL;
-fpGetAdaptersAddresses_t ares_fpGetAdaptersAddresses = ZERO_NULL;
-fpGetBestRoute2_t ares_fpGetBestRoute2 = ZERO_NULL;
-#endif
-
 #if defined(ANDROID) || defined(__ANDROID__)
 #include "ares_android.h"
 #endif
@@ -59,81 +51,8 @@ void *(*ares_malloc)(size_t size) = default_malloc;
 void *(*ares_realloc)(void *ptr, size_t size) = default_realloc;
 void (*ares_free)(void *ptr) = default_free;
 
-#ifdef USE_WINSOCK
-static HMODULE hnd_iphlpapi;
-static HMODULE hnd_advapi32;
-#endif
-
-
-static int ares_win32_init(void)
-{
-#ifdef USE_WINSOCK
-
-  hnd_iphlpapi = 0;
-  hnd_iphlpapi = LoadLibraryW(L"iphlpapi.dll");
-  if (!hnd_iphlpapi)
-    return ARES_ELOADIPHLPAPI;
-
-  ares_fpGetNetworkParams = (fpGetNetworkParams_t)
-    GetProcAddress(hnd_iphlpapi, "GetNetworkParams");
-  if (!ares_fpGetNetworkParams)
-    {
-      FreeLibrary(hnd_iphlpapi);
-      return ARES_EADDRGETNETWORKPARAMS;
-    }
-
-  ares_fpGetAdaptersAddresses = (fpGetAdaptersAddresses_t)
-    GetProcAddress(hnd_iphlpapi, "GetAdaptersAddresses");
-  if (!ares_fpGetAdaptersAddresses)
-    {
-      /* This can happen on clients before WinXP, I don't
-         think it should be an error, unless we don't want to
-         support Windows 2000 anymore */
-    }
-
-  ares_fpGetBestRoute2 = (fpGetBestRoute2_t)
-    GetProcAddress(hnd_iphlpapi, "GetBestRoute2");
-  if (!ares_fpGetBestRoute2)
-    {
-      /* This can happen on clients before Vista, I don't
-         think it should be an error, unless we don't want to
-         support Windows XP anymore */
-    }
-
-  /*
-   * When advapi32.dll is unavailable or advapi32.dll has no SystemFunction036,
-   * also known as RtlGenRandom, which is the case for Windows versions prior
-   * to WinXP then c-ares uses portable rand() function. Then don't error here.
-   */
-
-  hnd_advapi32 = 0;
-  hnd_advapi32 = LoadLibraryW(L"advapi32.dll");
-  if (hnd_advapi32)
-    {
-      ares_fpSystemFunction036 = (fpSystemFunction036_t)
-        GetProcAddress(hnd_advapi32, "SystemFunction036");
-    }
-
-#endif
-  return ARES_SUCCESS;
-}
-
-
-static void ares_win32_cleanup(void)
-{
-#ifdef USE_WINSOCK
-  if (hnd_advapi32)
-    FreeLibrary(hnd_advapi32);
-  if (hnd_iphlpapi)
-    FreeLibrary(hnd_iphlpapi);
-#endif
-}
-
-
 int ares_library_init(int flags)
 {
-  int res;
-
   if (ares_initialized)
     {
       ares_initialized++;
@@ -141,12 +60,7 @@ int ares_library_init(int flags)
     }
   ares_initialized++;
 
-  if (flags & ARES_LIB_INIT_WIN32)
-    {
-      res = ares_win32_init();
-      if (res != ARES_SUCCESS)
-        return res;  /* LCOV_EXCL_LINE: can't test Win32 init failure */
-    }
+  /* NOTE: ARES_LIB_INIT_WIN32 flag no longer used */
 
   ares_init_flags = flags;
 
@@ -176,8 +90,7 @@ void ares_library_cleanup(void)
   if (ares_initialized)
     return;
 
-  if (ares_init_flags & ARES_LIB_INIT_WIN32)
-    ares_win32_cleanup();
+  /* NOTE: ARES_LIB_INIT_WIN32 flag no longer used */
 
 #if defined(ANDROID) || defined(__ANDROID__)
   ares_library_cleanup_android();

data/third_party/cares/cares/src/lib/ares_parse_a_reply.c

@@ -42,168 +42,49 @@
 #include "ares_private.h"
 
 int ares_parse_a_reply(const unsigned char *abuf, int alen,
-                       struct hostent **host,
-                       struct ares_addrttl *addrttls, int *naddrttls)
+                       struct hostent **host, struct ares_addrttl *addrttls,
+                       int *naddrttls)
 {
   struct ares_addrinfo ai;
-  struct ares_addrinfo_node *next;
-  struct ares_addrinfo_cname *next_cname;
-  char **aliases = NULL;
   char *question_hostname = NULL;
-  struct hostent *hostent = NULL;
-  struct in_addr *addrs = NULL;
-  int naliases = 0, naddrs = 0, alias = 0, i;
-  int cname_ttl = INT_MAX;
   int status;
+  int req_naddrttls = 0;
 
-  memset(&ai, 0, sizeof(ai));
-
-  status = ares__parse_into_addrinfo2(abuf, alen, &question_hostname, &ai);
-  if (status != ARES_SUCCESS)
-    {
-      ares_free(question_hostname);
-
-      if (naddrttls)
-        {
-          *naddrttls = 0;
-        }
-
-      return status;
-    }
-
-  hostent = ares_malloc(sizeof(struct hostent));
-  if (!hostent)
-    {
-      goto enomem;
-    }
-
-  next = ai.nodes;
-  while (next)
-    {
-      if (next->ai_family == AF_INET)
-        {
-          ++naddrs;
-        }
-      next = next->ai_next;
-    }
-
-  next_cname = ai.cnames;
-  while (next_cname)
-    {
-      if(next_cname->alias)
-        ++naliases;
-      next_cname = next_cname->next;
-    }
-
-  aliases = ares_malloc((naliases + 1) * sizeof(char *));
-  if (!aliases)
-    {
-      goto enomem;
-    }
-
-  if (naliases)
-    {
-      next_cname = ai.cnames;
-      while (next_cname)
-        {
-          if(next_cname->alias)
-            aliases[alias++] = ares_strdup(next_cname->alias);
-          if(next_cname->ttl < cname_ttl)
-            cname_ttl = next_cname->ttl;
-          next_cname = next_cname->next;
-        }
-    }
-
-  aliases[alias] = NULL;
-
-  hostent->h_addr_list = ares_malloc((naddrs + 1) * sizeof(char *));
-  if (!hostent->h_addr_list)
+  if (naddrttls)
     {
-      goto enomem;
+      req_naddrttls = *naddrttls;
+      *naddrttls = 0;
     }
 
-  for (i = 0; i < naddrs + 1; ++i)
-    {
-      hostent->h_addr_list[i] = NULL;
-    }
+  memset(&ai, 0, sizeof(ai));
 
-  if (ai.cnames)
+  status = ares__parse_into_addrinfo(abuf, alen, 0, 0, &ai);
+  if (status != ARES_SUCCESS && status != ARES_ENODATA)
     {
-      hostent->h_name = ares_strdup(ai.cnames->name);
-      ares_free(question_hostname);
+      goto fail;
     }
-  else
-    {
-      hostent->h_name = question_hostname;
-    }
-
-  hostent->h_aliases = aliases;
-  hostent->h_addrtype = AF_INET;
-  hostent->h_length = sizeof(struct in_addr);
 
-  if (naddrs)
+  if (host != NULL)
     {
-      addrs = ares_malloc(naddrs * sizeof(struct in_addr));
-      if (!addrs)
-        {
-          goto enomem;
-        }
-
-      i = 0;
-      next = ai.nodes;
-      while (next)
+      status = ares__addrinfo2hostent(&ai, AF_INET, host);
+      if (status != ARES_SUCCESS && status != ARES_ENODATA)
         {
-          if (next->ai_family == AF_INET)
-            {
-              hostent->h_addr_list[i] = (char *)&addrs[i];
-              memcpy(hostent->h_addr_list[i],
-                     &(CARES_INADDR_CAST(struct sockaddr_in *, next->ai_addr)->sin_addr),
-                     sizeof(struct in_addr));
-              if (naddrttls && i < *naddrttls)
-                {
-                  if (next->ai_ttl > cname_ttl)
-                    addrttls[i].ttl = cname_ttl;
-                  else
-                    addrttls[i].ttl = next->ai_ttl;
-
-                  memcpy(&addrttls[i].ipaddr,
-                         &(CARES_INADDR_CAST(struct sockaddr_in *, next->ai_addr)->sin_addr),
-                         sizeof(struct in_addr));
-                }
-              ++i;
-            }
-          next = next->ai_next;
-        }
-      if (i == 0)
-        {
-          ares_free(addrs);
+          goto fail;
         }
     }
 
-  if (host)
-    {
-      *host = hostent;
-    }
-  else
-    {
-      ares_free_hostent(hostent);
-    }
+  if (addrttls != NULL && req_naddrttls)
+   {
+     ares__addrinfo2addrttl(&ai, AF_INET, req_naddrttls, addrttls,
+                            NULL, naddrttls);
+   }
 
-  if (naddrttls)
-    {
-      /* Truncated to at most *naddrttls entries */
-      *naddrttls = (naddrs > *naddrttls)?*naddrttls:naddrs;
-    }
-
-  ares__freeaddrinfo_cnames(ai.cnames);
-  ares__freeaddrinfo_nodes(ai.nodes);
-  return ARES_SUCCESS;
 
-enomem:
-  ares_free(aliases);
-  ares_free(hostent);
+fail:
   ares__freeaddrinfo_cnames(ai.cnames);
   ares__freeaddrinfo_nodes(ai.nodes);
+  ares_free(ai.name);
   ares_free(question_hostname);
-  return ARES_ENOMEM;
+
+  return status;
 }

data/third_party/cares/cares/src/lib/ares_parse_aaaa_reply.c

@@ -48,165 +48,45 @@ int ares_parse_aaaa_reply(const unsigned char *abuf, int alen,
                           int *naddrttls)
 {
   struct ares_addrinfo ai;
-  struct ares_addrinfo_node *next;
-  struct ares_addrinfo_cname *next_cname;
-  char **aliases = NULL;
   char *question_hostname = NULL;
-  struct hostent *hostent = NULL;
-  struct ares_in6_addr *addrs = NULL;
-  int naliases = 0, naddrs = 0, alias = 0, i;
-  int cname_ttl = INT_MAX;
   int status;
+  int req_naddrttls = 0;
 
-  memset(&ai, 0, sizeof(ai));
-
-  status = ares__parse_into_addrinfo2(abuf, alen, &question_hostname, &ai);
-  if (status != ARES_SUCCESS)
-    {
-      ares_free(question_hostname);
-
-      if (naddrttls)
-        {
-          *naddrttls = 0;
-        }
-
-      return status;
-    }
-
-  hostent = ares_malloc(sizeof(struct hostent));
-  if (!hostent)
-    {
-      goto enomem;
-    }
-
-  next = ai.nodes;
-  while (next)
-    {
-      if(next->ai_family == AF_INET6)
-        {
-          ++naddrs;
-        }
-      next = next->ai_next;
-    }
-
-  next_cname = ai.cnames;
-  while (next_cname)
-    {
-      if(next_cname->alias)
-        ++naliases;
-      next_cname = next_cname->next;
-    }
-
-  aliases = ares_malloc((naliases + 1) * sizeof(char *));
-  if (!aliases)
-    {
-      goto enomem;
-    }
-
-  if (naliases)
-    {
-      next_cname = ai.cnames;
-      while (next_cname)
-        {
-          if(next_cname->alias)
-            aliases[alias++] = ares_strdup(next_cname->alias);
-          if(next_cname->ttl < cname_ttl)
-            cname_ttl = next_cname->ttl;
-          next_cname = next_cname->next;
-        }
-    }
-
-  aliases[alias] = NULL;
-
-  hostent->h_addr_list = ares_malloc((naddrs + 1) * sizeof(char *));
-  if (!hostent->h_addr_list)
+  if (naddrttls)
     {
-      goto enomem;
+      req_naddrttls = *naddrttls;
+      *naddrttls = 0;
     }
 
-  for (i = 0; i < naddrs + 1; ++i)
-    {
-      hostent->h_addr_list[i] = NULL;
-    }
+  memset(&ai, 0, sizeof(ai));
 
-  if (ai.cnames)
-    {
-      hostent->h_name = ares_strdup(ai.cnames->name);
-      ares_free(question_hostname);
-    }
-  else
+  status = ares__parse_into_addrinfo(abuf, alen, 0, 0, &ai);
+  if (status != ARES_SUCCESS && status != ARES_ENODATA)
     {
-      hostent->h_name = question_hostname;
+      goto fail;
     }
 
-  hostent->h_aliases = aliases;
-  hostent->h_addrtype = AF_INET6;
-  hostent->h_length = sizeof(struct ares_in6_addr);
-
-  if (naddrs)
+  if (host != NULL)
     {
-      addrs = ares_malloc(naddrs * sizeof(struct ares_in6_addr));
-      if (!addrs)
-        {
-          goto enomem;
-        }
-
-      i = 0;
-      next = ai.nodes;
-      while (next)
-        {
-          if(next->ai_family == AF_INET6)
-            {
-              hostent->h_addr_list[i] = (char*)&addrs[i];
-              memcpy(hostent->h_addr_list[i],
-                     &(CARES_INADDR_CAST(struct sockaddr_in6 *, next->ai_addr)->sin6_addr),
-                     sizeof(struct ares_in6_addr));
-              if (naddrttls && i < *naddrttls)
-                {
-                    if(next->ai_ttl > cname_ttl)
-                      addrttls[i].ttl = cname_ttl;
-                    else
-                      addrttls[i].ttl = next->ai_ttl;
-
-                    memcpy(&addrttls[i].ip6addr,
-                           &(CARES_INADDR_CAST(struct sockaddr_in6 *, next->ai_addr)->sin6_addr),
-                           sizeof(struct ares_in6_addr));
-                }
-              ++i;
-            }
-          next = next->ai_next;
-        }
-
-      if (i == 0)
+      status = ares__addrinfo2hostent(&ai, AF_INET6, host);
+      if (status != ARES_SUCCESS && status != ARES_ENODATA)
         {
-          ares_free(addrs);
+          goto fail;
         }
     }
 
-  if (host)
-    {
-      *host = hostent;
-    }
-  else
-    {
-      ares_free_hostent(hostent);
-    }
+  if (addrttls != NULL && req_naddrttls)
+   {
+     ares__addrinfo2addrttl(&ai, AF_INET6, req_naddrttls, NULL,
+                            addrttls, naddrttls);
+   }
 
-  if (naddrttls)
-    {
-      /* Truncated to at most *naddrttls entries */
-      *naddrttls = (naddrs > *naddrttls)?*naddrttls:naddrs;
-    }
-
-  ares__freeaddrinfo_cnames(ai.cnames);
-  ares__freeaddrinfo_nodes(ai.nodes);
-  return ARES_SUCCESS;
-
-enomem:
-  ares_free(aliases);
-  ares_free(hostent);
+fail:
   ares__freeaddrinfo_cnames(ai.cnames);
   ares__freeaddrinfo_nodes(ai.nodes);
   ares_free(question_hostname);
-  return ARES_ENOMEM;
+  ares_free(ai.name);
+
+  return status;
 }
+

data/third_party/cares/cares/src/lib/ares_parse_uri_reply.c

@@ -0,0 +1,184 @@
+
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ * Copyright (C) 2009 by Jakub Hrozek <jhrozek@redhat.com>
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#include "ares_setup.h"
+
+#ifdef HAVE_NETINET_IN_H
+#  include <netinet/in.h>
+#endif
+#ifdef HAVE_NETDB_H
+#  include <netdb.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#  include <arpa/inet.h>
+#endif
+
+#include "ares_nameser.h"
+
+#include "ares.h"
+#include "ares_dns.h"
+#include "ares_data.h"
+#include "ares_private.h"
+
+/* AIX portability check */
+#ifndef T_URI
+#  define T_URI 256 /* uri selection */
+#endif
+
+int
+ares_parse_uri_reply (const unsigned char *abuf, int alen,
+                      struct ares_uri_reply **uri_out)
+{
+  unsigned int qdcount, ancount, i;
+  const unsigned char *aptr, *vptr;
+  int status, rr_type, rr_class, rr_len, rr_ttl;
+  long len;
+  char *uri_str = NULL, *rr_name = NULL;
+  struct ares_uri_reply *uri_head = NULL;
+  struct ares_uri_reply *uri_last = NULL;
+  struct ares_uri_reply *uri_curr;
+
+  /* Set *uri_out to NULL for all failure cases. */
+  *uri_out = NULL;
+
+  /* Give up if abuf doesn't have room for a header. */
+  if (alen < HFIXEDSZ){
+	  return ARES_EBADRESP;
+  }
+
+  /* Fetch the question and answer count from the header. */
+  qdcount = DNS_HEADER_QDCOUNT (abuf);
+  ancount = DNS_HEADER_ANCOUNT (abuf);
+  if (qdcount != 1) {
+      return ARES_EBADRESP;
+  }
+  if (ancount == 0) {
+	  return ARES_ENODATA;
+  }
+  /* Expand the name from the question, and skip past the question. */
+  aptr = abuf + HFIXEDSZ;
+
+  status = ares_expand_name (aptr, abuf, alen, &uri_str, &len);
+  if (status != ARES_SUCCESS){
+	  return status;
+  }
+  if (aptr + len + QFIXEDSZ > abuf + alen)
+    {
+      ares_free (uri_str);
+      return ARES_EBADRESP;
+    }
+  aptr += len + QFIXEDSZ;
+
+  /* Examine each answer resource record (RR) in turn. */
+  for (i = 0; i < ancount; i++)
+    {
+      /* Decode the RR up to the data field. */
+      status = ares_expand_name (aptr, abuf, alen, &rr_name, &len);
+      if (status != ARES_SUCCESS)
+        {
+          break;
+        }
+      aptr += len;
+      if (aptr + RRFIXEDSZ > abuf + alen)
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
+
+      rr_type 	= DNS_RR_TYPE (aptr);
+      rr_class 	= DNS_RR_CLASS (aptr);
+      rr_ttl 	= DNS_RR_TTL(aptr);
+      rr_len 	= DNS_RR_LEN (aptr);
+      aptr += RRFIXEDSZ;
+
+      if (aptr + rr_len > abuf + alen)
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
+
+      /* Check if we are really looking at a URI record */
+      if (rr_class == C_IN && rr_type == T_URI)
+        {
+          /* parse the URI record itself */
+          if (rr_len < 5)
+            {
+              status = ARES_EBADRESP;
+              break;
+            }
+          /* Allocate storage for this URI answer appending it to the list */
+          uri_curr = ares_malloc_data(ARES_DATATYPE_URI_REPLY);
+          if (!uri_curr)
+            {
+              status = ARES_ENOMEM;
+              break;
+            }
+          if (uri_last)
+            {
+              uri_last->next = uri_curr;
+            }
+          else
+            {
+              uri_head = uri_curr;
+            }
+          uri_last = uri_curr;
+
+          vptr = aptr;
+          uri_curr->priority = DNS__16BIT(vptr);
+          vptr += sizeof(unsigned short);
+          uri_curr->weight = DNS__16BIT(vptr);
+          vptr += sizeof(unsigned short);
+          uri_curr->uri = (char *)ares_malloc(rr_len-3);
+	  	  if (!uri_curr->uri)
+	      	{
+	      	  status = ARES_ENOMEM;
+			  break;
+		    }
+          uri_curr->uri = strncpy(uri_curr->uri, (const char *)vptr, rr_len-4);
+          uri_curr->uri[rr_len-4]='\0';
+          uri_curr->ttl = rr_ttl;
+
+          if (status != ARES_SUCCESS)
+            break;
+        }
+
+      /* Don't lose memory in the next iteration */
+      ares_free (rr_name);
+      rr_name = NULL;
+
+      /* Move on to the next record */
+      aptr += rr_len;
+    }
+
+  if (uri_str)
+    ares_free (uri_str);
+  if (rr_name)
+    ares_free (rr_name);
+
+  /* clean up on error */
+  if (status != ARES_SUCCESS)
+    {
+      if (uri_head)
+        ares_free_data (uri_head);
+      return status;
+    }
+
+  /* everything looks fine, return the data */
+  *uri_out = uri_head;
+
+  return ARES_SUCCESS;
+}