grpc 1.55.0 → 1.56.0.pre3

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

@@ -18,51 +18,10 @@
 #endif
 
 #include "ares_setup.h"
-#include "ares_strsplit.h"
 #include "ares.h"
 #include "ares_private.h"
 
-static int list_contains(char * const *list, size_t num_elem, const char *str, int insensitive)
-{
-  size_t len;
-  size_t i;
-
-  len = strlen(str);
-  for (i=0; i<num_elem; i++)
-  {
-    if (insensitive)
-    {
-#ifdef WIN32
-      if (strnicmp(list[i], str, len) == 0)
-#else
-      if (strncasecmp(list[i], str, len) == 0)
-#endif
-        return 1;
-    }
-    else
-    {
-      if (strncmp(list[i], str, len) == 0)
-        return 1;
-    }
-  }
-
-  return 0;
-}
-
-static int is_delim(char c, const char *delims, size_t num_delims)
-{
-  size_t i;
-
-  for (i=0; i<num_delims; i++)
-  {
-    if (c == delims[i])
-      return 1;
-  }
-  return 0;
-}
-
-
-void ares_strsplit_free(char **elms, size_t num_elm)
+void ares__strsplit_free(char **elms, size_t num_elm)
 {
   size_t i;
 
@@ -74,105 +33,62 @@ void ares_strsplit_free(char **elms, size_t num_elm)
   ares_free(elms);
 }
 
-
-char **ares_strsplit(const char *in, const char *delms, int make_set, size_t *num_elm)
-{
-  char *parsestr;
-  char **temp;
-  char **out;
-  size_t cnt;
-  size_t nelms;
-  size_t in_len;
-  size_t num_delims;
-  size_t i;
+char **ares__strsplit(const char *in, const char *delms, size_t *num_elm) {
+  const char *p;
+  char **table;
+  void *tmp;
+  size_t i, j, k, count;
 
   if (in == NULL || delms == NULL || num_elm == NULL)
     return NULL;
 
   *num_elm = 0;
 
-  in_len = strlen(in);
-  num_delims = strlen(delms);
-
-  /* Figure out how many elements. */
-  nelms = 1;
-  for (i=0; i<in_len; i++)
-  {
-    if (is_delim(in[i], delms, num_delims))
-    {
-      nelms++;
+  /* count non-empty delimited substrings */
+  count = 0;
+  p = in;
+  do {
+    i = strcspn(p, delms);
+    if (i != 0) {
+      /* string is non-empty */
+      count++;
+      p += i;
     }
-  }
+  } while (*p++ != 0);
 
-  /* Copy of input so we can cut it up. */
-  parsestr = ares_strdup(in);
-  if (parsestr == NULL)
+  if (count == 0)
     return NULL;
-
-  /* Temporary array to store locations of start of each element
-   * within parsestr. */
-  temp = ares_malloc(nelms * sizeof(*temp));
-  if (temp == NULL)
-  {
-    ares_free(parsestr);
+  table = ares_malloc(count * sizeof(*table));
+  if (table == NULL)
     return NULL;
-  }
-  temp[0] = parsestr;
-  cnt = 1;
-  for (i=0; i<in_len && cnt<nelms; i++)
-  {
-    if (!is_delim(parsestr[i], delms, num_delims))
-      continue;
-
-    /* Replace sep with NULL. */
-    parsestr[i] = '\0';
-    /* Add the pointer to the array of elements */
-    temp[cnt] = parsestr+i+1;
-    cnt++;
-  }
 
-  /* Copy each element to our output array. */
-  out = ares_malloc(nelms * sizeof(*out));
-  if (out == NULL)
-  {
-    ares_free(parsestr);
-    ares_free(temp);
-    return NULL;
-  }
-
-  nelms = 0;
-  for (i=0; i<cnt; i++)
-  {
-    if (temp[i][0] == '\0')
-      continue;
-
-    if (make_set && list_contains(out, nelms, temp[i], 1))
-      continue;
-
-    out[nelms] = ares_strdup(temp[i]);
-    if (out[nelms] == NULL)
-    {
-      ares_strsplit_free(out, nelms);
-      ares_free(parsestr);
-      ares_free(temp);
-      return NULL;
+  j = 0; /* current table entry */
+  /* re-calculate indices and allocate new strings for table */
+  for (p = in; j < count; p += i + 1) {
+    i = strcspn(p, delms);
+    if (i != 0) {
+      for (k = 0; k < j; k++) {
+        if (strncasecmp(table[k], p, i) == 0 && table[k][i] == 0)
+          break;
+      }
+      if (k == j) {
+        /* copy unique strings only */
+        table[j] = ares_malloc(i + 1);
+        if (table[j] == NULL) {
+          ares__strsplit_free(table, j);
+          return NULL;
+        }
+        strncpy(table[j], p, i);
+        table[j++][i] = 0;
+      } else
+        count--;
     }
-    nelms++;
-  }
-
-
-  /* If there are no elements don't return an empty allocated
-   * array. */
-  if (nelms == 0)
-  {
-    ares_strsplit_free(out, nelms);
-    out = NULL;
   }
 
-  /* Get the true number of elements (recalculated because of make_set) */
-  *num_elm = nelms;
+  tmp = ares_realloc(table, count * sizeof (*table));
+  if (tmp != NULL)
+    table = tmp;
 
-  ares_free(parsestr);
-  ares_free(temp);
-  return out;
+  *num_elm = count;
+  return table;
 }

data/third_party/cares/cares/src/lib/ares_strsplit.h

@@ -18,25 +18,24 @@
 
 #include "ares_setup.h"
 
-/* Split a string on delem skipping empty elements.
+/* Split a string on delms skipping empty or duplicate elements.
  *
  * param in String to split.
- * param delims String of characters to treat as a delimitor.
- *              Each character in the string is a delimitor so
- *              there can be multiple delimitors to split on.
- *              E.g. ", " will split on all comma's and spaces.
- * param make_set Have the list be a Set where there are no
- *                duplicate entries. 1 for true, 0 or false.
+ * param delms String of characters to treat as a delimitor.
+ *             Each character in the string is a delimitor so
+ *             there can be multiple delimitors to split on.
+ *             E.g. ", " will split on all comma's and spaces.
+ *             Duplicate entries are removed.
  * param num_elm Return parameter of the number of elements
  *               in the result array.
  *
  * returns an allocated array of allocated string elements.
  *
  */
-char **ares_strsplit(const char *in, const char *delms, int make_set, size_t *num_elm);
+char **ares__strsplit(const char *in, const char *delms, size_t *num_elm);
 
-/* Frees the result returned from ares_strsplit(). */
-void ares_strsplit_free(char **elms, size_t num_elm);
+/* Frees the result returned from ares__strsplit(). */
+void ares__strsplit_free(char **elms, size_t num_elm);
 
 
 #endif /* HEADER_CARES_STRSPLIT_H */

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

@@ -1,19 +1,20 @@
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2012 by Gilles Chehade <gilles@openbsd.org>
  * Copyright (c) 1996,1999 by Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
  */
 
 #include "ares_setup.h"
@@ -35,9 +36,6 @@
 
 const struct ares_in6_addr ares_in6addr_any = { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
 
-
-#ifndef HAVE_INET_NET_PTON
-
 /*
  * static int
  * inet_net_pton_ipv4(src, dst, size)
@@ -60,7 +58,7 @@ const struct ares_in6_addr ares_in6addr_any = { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,
  *      Paul Vixie (ISC), June 1996
  */
 static int
-inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size)
+ares_inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size)
 {
   static const char xdigits[] = "0123456789abcdef";
   static const char digits[] = "0123456789";
@@ -216,64 +214,16 @@ getbits(const char *src, int *bitsp)
   return (1);
 }
 
-static int
-getv4(const char *src, unsigned char *dst, int *bitsp)
-{
-  static const char digits[] = "0123456789";
-  unsigned char *odst = dst;
-  int n;
-  unsigned int val;
-  char ch;
-
-  val = 0;
-  n = 0;
-  while ((ch = *src++) != '\0') {
-    const char *pch;
-
-    pch = strchr(digits, ch);
-    if (pch != NULL) {
-      if (n++ != 0 && val == 0)       /* no leading zeros */
-        return (0);
-      val *= 10;
-      val += aresx_sztoui(pch - digits);
-      if (val > 255)                  /* range */
-        return (0);
-      continue;
-    }
-    if (ch == '.' || ch == '/') {
-      if (dst - odst > 3)             /* too many octets? */
-        return (0);
-      *dst++ = (unsigned char)val;
-      if (ch == '/')
-        return (getbits(src, bitsp));
-      val = 0;
-      n = 0;
-      continue;
-    }
-    return (0);
-  }
-  if (n == 0)
-    return (0);
-  if (dst - odst > 3)             /* too many octets? */
-    return (0);
-  *dst = (unsigned char)val;
-  return 1;
-}
 
 static int
-inet_net_pton_ipv6(const char *src, unsigned char *dst, size_t size)
+ares_inet_pton6(const char *src, unsigned char *dst)
 {
   static const char xdigits_l[] = "0123456789abcdef",
-    xdigits_u[] = "0123456789ABCDEF";
+        xdigits_u[] = "0123456789ABCDEF";
   unsigned char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
   const char *xdigits, *curtok;
-  int ch, saw_xdigit;
+  int ch, saw_xdigit, count_xdigit;
   unsigned int val;
-  int digits;
-  int bits;
-  size_t bytes;
-  int words;
-  int ipv4;
 
   memset((tp = tmp), '\0', NS_IN6ADDRSZ);
   endp = tp + NS_IN6ADDRSZ;
@@ -283,22 +233,22 @@ inet_net_pton_ipv6(const char *src, unsigned char *dst, size_t size)
     if (*++src != ':')
       goto enoent;
   curtok = src;
-  saw_xdigit = 0;
+  saw_xdigit = count_xdigit = 0;
   val = 0;
-  digits = 0;
-  bits = -1;
-  ipv4 = 0;
   while ((ch = *src++) != '\0') {
     const char *pch;
 
     if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
       pch = strchr((xdigits = xdigits_u), ch);
     if (pch != NULL) {
+      if (count_xdigit >= 4)
+        goto enoent;
       val <<= 4;
-      val |= aresx_sztoui(pch - xdigits);
-      if (++digits > 4)
+      val |= (unsigned int)(pch - xdigits);
+      if (val > 0xffff)
         goto enoent;
       saw_xdigit = 1;
+      count_xdigit++;
       continue;
     }
     if (ch == ':') {
@@ -308,76 +258,99 @@ inet_net_pton_ipv6(const char *src, unsigned char *dst, size_t size)
           goto enoent;
         colonp = tp;
         continue;
-      } else if (*src == '\0')
+      } else if (*src == '\0') {
         goto enoent;
+      }
       if (tp + NS_INT16SZ > endp)
-        return (0);
-      *tp++ = (unsigned char)((val >> 8) & 0xff);
-      *tp++ = (unsigned char)(val & 0xff);
+        goto enoent;
+      *tp++ = (unsigned char) (val >> 8) & 0xff;
+      *tp++ = (unsigned char) val & 0xff;
       saw_xdigit = 0;
-      digits = 0;
+      count_xdigit = 0;
       val = 0;
       continue;
     }
     if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-        getv4(curtok, tp, &bits) > 0) {
+        ares_inet_net_pton_ipv4(curtok, tp, NS_INADDRSZ) > 0) {
       tp += NS_INADDRSZ;
       saw_xdigit = 0;
-      ipv4 = 1;
       break;  /* '\0' was seen by inet_pton4(). */
     }
-    if (ch == '/' && getbits(src, &bits) > 0)
-      break;
     goto enoent;
   }
   if (saw_xdigit) {
     if (tp + NS_INT16SZ > endp)
       goto enoent;
-    *tp++ = (unsigned char)((val >> 8) & 0xff);
-    *tp++ = (unsigned char)(val & 0xff);
+    *tp++ = (unsigned char) (val >> 8) & 0xff;
+    *tp++ = (unsigned char) val & 0xff;
   }
-  if (bits == -1)
-    bits = 128;
-
-  words = (bits + 15) / 16;
-  if (words < 2)
-    words = 2;
-  if (ipv4)
-    words = 8;
-  endp =  tmp + 2 * words;
-
   if (colonp != NULL) {
     /*
      * Since some memmove()'s erroneously fail to handle
      * overlapping regions, we'll do the shift by hand.
      */
-    const ares_ssize_t n = tp - colonp;
-    ares_ssize_t i;
+    const int n = (int)(tp - colonp);
+    int i;
 
     if (tp == endp)
       goto enoent;
     for (i = 1; i <= n; i++) {
-      *(endp - i) = *(colonp + n - i);
-      *(colonp + n - i) = 0;
+      endp[- i] = colonp[n - i];
+      colonp[n - i] = 0;
     }
     tp = endp;
   }
   if (tp != endp)
     goto enoent;
 
-  bytes = (bits + 7) / 8;
-  if (bytes > size)
-    goto emsgsize;
-  memcpy(dst, tmp, bytes);
-  return (bits);
+  memcpy(dst, tmp, NS_IN6ADDRSZ);
+  return (1);
 
-  enoent:
+enoent:
   SET_ERRNO(ENOENT);
   return (-1);
+}
 
-  emsgsize:
-  SET_ERRNO(EMSGSIZE);
-  return (-1);
+static int
+ares_inet_net_pton_ipv6(const char *src, unsigned char *dst, size_t size)
+{
+  struct ares_in6_addr in6;
+  int                  ret;
+  int                  bits;
+  size_t               bytes;
+  char                 buf[INET6_ADDRSTRLEN + sizeof("/128")];
+  char                *sep;
+
+  if (strlen(src) >= sizeof buf) {
+    SET_ERRNO(EMSGSIZE);
+    return (-1);
+  }
+  strncpy(buf, src, sizeof buf);
+
+  sep = strchr(buf, '/');
+  if (sep != NULL)
+    *sep++ = '\0';
+
+  ret = ares_inet_pton6(buf, (unsigned char *)&in6);
+  if (ret != 1)
+    return (-1);
+
+  if (sep == NULL)
+    bits = 128;
+  else {
+    if (!getbits(sep, &bits)) {
+      SET_ERRNO(ENOENT);
+      return (-1);
+    }
+  }
+
+  bytes = (bits + 7) / 8;
+  if (bytes > size) {
+    SET_ERRNO(EMSGSIZE);
+    return (-1);
+  }
+  memcpy(dst, &in6, bytes);
+  return (bits);
 }
 
 /*
@@ -403,18 +376,15 @@ ares_inet_net_pton(int af, const char *src, void *dst, size_t size)
 {
   switch (af) {
   case AF_INET:
-    return (inet_net_pton_ipv4(src, dst, size));
+    return (ares_inet_net_pton_ipv4(src, dst, size));
   case AF_INET6:
-    return (inet_net_pton_ipv6(src, dst, size));
+    return (ares_inet_net_pton_ipv6(src, dst, size));
   default:
     SET_ERRNO(EAFNOSUPPORT);
     return (-1);
   }
 }
 
-#endif /* HAVE_INET_NET_PTON */
-
-#ifndef HAVE_INET_PTON
 int ares_inet_pton(int af, const char *src, void *dst)
 {
   int result;
@@ -434,11 +404,3 @@ int ares_inet_pton(int af, const char *src, void *dst)
     return 0;
   return (result > -1 ? 1 : -1);
 }
-#else /* HAVE_INET_PTON */
-int ares_inet_pton(int af, const char *src, void *dst)
-{
-  /* just relay this to the underlying function */
-  return inet_pton(af, src, dst);
-}
-
-#endif

data/third_party/cares/cares/src/tools/ares_getopt.h

@@ -0,0 +1,53 @@
+#ifndef ARES_GETOPT_H
+#define ARES_GETOPT_H
+
+/*
+ * Copyright (c) 1987-2001 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * A. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * B. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * C. Neither the names of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
+ * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+int ares_getopt(int nargc, char * const nargv[], const char *ostr);
+
+#undef optarg
+#undef optind
+#undef opterr
+#undef optopt
+#undef optreset
+
+#define optarg   ares_optarg
+#define optind   ares_optind
+#define opterr   ares_opterr
+#define optopt   ares_optopt
+#define optreset ares_optreset
+
+extern char *optarg;
+extern int optind;
+extern int opterr;
+extern int optopt;
+
+#endif /* ARES_GETOPT_H */