trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geor...@apache.org
Subject svn commit: r908143 [2/3] - in /incubator/trafficserver/traffic/branches/dev: ./ ci/ iocore/aio/ iocore/dns/ libinktomi++/ proxy/ proxy/config/ proxy/http2/ proxy/mgmt2/ proxy/mgmt2/api2/remote/ proxy/mgmt2/cop/
Date Tue, 09 Feb 2010 18:20:06 GMT
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_init.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_res_init.cc?rev=908143&r1=908142&r2=908143&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_init.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_init.cc Tue Feb  9 18:19:44 2010
@@ -1,60 +1,95 @@
-/** @file
-
-  A brief file description
-
-  @section license License
-
-  Copyright (c) 1985, 1989, 1993
-     The Regents of the University of California.  All rights reserved.
+/*
+ * Copyright (c) 1985, 1989, 1993
+ *    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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University 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 REGENTS 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.
+ */
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. 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.
-  3. All advertising materials mentioning features or use of this software
-     must display the following acknowledgement:
-     This product includes software developed by the University of
-     California, Berkeley and its contributors.
-  4. Neither the name of the University 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 REGENTS 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.
-
-  Portions Copyright (c) 1993 by Digital Equipment Corporation.
-
-  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, and that
-  the name of Digital Equipment Corporation not be used in advertising or
-  publicity pertaining to distribution of the document or software without
-  specific, written prior permission.
-
-  THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
-  WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
-  OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
-  CORPORATION 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.
+/*
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ *
+ * 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, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION 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.
+ */
 
+/*
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Portions 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.
  */
 
+/*
+  Imported from Bind-9.5.2-P2
+  
+  Changes:
+
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
 #if !defined (_WIN32)
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
@@ -78,32 +113,6 @@
 
 #include "ink_resolver.h"
 
-/*-------------------------------------- info about "sortlist" --------------
- * Marc Majka		1994/04/16
- * Allan Nathanson	1994/10/29 (BIND 4.9.3.x)
- *
- * NetInfo resolver configuration directory support.
- *
- * Allow a NetInfo directory to be created in the hierarchy which
- * contains the same information as the resolver configuration file.
- *
- * - The local domain name is stored as the value of the "domain" property.
- * - The Internet address(es) of the name server(s) are stored as values
- *   of the "nameserver" property.
- * - The name server addresses are stored as values of the "nameserver"
- *   property.
- * - The search list for host-name lookup is stored as values of the
- *   "search" property.
- * - The sortlist comprised of IP address netmask pairs are stored as
- *   values of the "sortlist" property. The IP address and optional netmask
- *   should be seperated by a slash (/) or ampersand (&) character.
- * - Internal resolver variables can be set from the value of the "options"
- *   property.
- */
-
-
-static void res_setoptions(struct __res_state &p_res, char *options, char *source);
-static void res_setoptions_rr(struct __res_state_rr &p_res, char *options, char *source);
 #if (HOST_OS != linux)
 int inet_aton(register const char *cp, struct in_addr *addr);
 #endif
@@ -118,17 +127,304 @@
 # define isascii(c) (!(c & 0200))
 #endif
 
-/*
- * Resolver state default settings.
+/*%
+ * This routine is for closing the socket if a virtual circuit is used and
+ * the program wants to close it.  This provides support for endhostent()
+ * which expects to close the socket.
+ *
+ * This routine is not expected to be user visible.
  */
+static void
+ink_res_nclose(ink_res_state statp) {
+  int ns;
+
+  if (statp->_vcsock >= 0) { 
+    (void) close(statp->_vcsock);
+    statp->_vcsock = -1;
+    statp->_flags &= ~(RES_F_VC | RES_F_CONN);
+  }
+  for (ns = 0; ns < statp->_u._ext.nscount; ns++) {
+    if (statp->_u._ext.nssocks[ns] != -1) {
+      (void) close(statp->_u._ext.nssocks[ns]);
+      statp->_u._ext.nssocks[ns] = -1;
+    }
+  }
+}
 
-# if defined(__BIND_RES_TEXT)
-= {
-RES_TIMEOUT,}                   /* Motorola, et al. */
-# endif
-;
+static void
+ink_res_ndestroy(ink_res_state statp) {
+  ink_res_nclose(statp);
+  if (statp->_u._ext.ext != NULL)
+    free(statp->_u._ext.ext);
+  statp->options &= ~RES_INIT;
+  statp->_u._ext.ext = NULL;
+}
+
+static void
+ink_res_setservers(ink_res_state statp, const union ink_res_sockaddr_union *set, int cnt) {
+  int i, nserv;
+  size_t size;
+
+  /* close open servers */
+  ink_res_nclose(statp);
+
+  /* cause rtt times to be forgotten */
+  statp->_u._ext.nscount = 0;
+
+  nserv = 0;
+  for (i = 0; i < cnt && nserv < MAXNS; i++) {
+    switch (set->sin.sin_family) {
+      case AF_INET:
+        size = sizeof(set->sin);
+        if (statp->_u._ext.ext)
+          memcpy(&statp->_u._ext.ext->nsaddrs[nserv],
+                 &set->sin, size);
+        if (size <= sizeof(statp->nsaddr_list[nserv]))
+          memcpy(&statp->nsaddr_list[nserv],
+                 &set->sin, size);
+        else
+          statp->nsaddr_list[nserv].sin_family = 0;
+        nserv++;
+        break;
 
-/*
+#ifdef HAS_INET6_STRUCTS
+      case AF_INET6:
+        size = sizeof(set->sin6);
+        if (statp->_u._ext.ext)
+          memcpy(&statp->_u._ext.ext->nsaddrs[nserv],
+                 &set->sin6, size);
+        if (size <= sizeof(statp->nsaddr_list[nserv]))
+          memcpy(&statp->nsaddr_list[nserv],
+                 &set->sin6, size);
+        else
+          statp->nsaddr_list[nserv].sin_family = 0;
+        nserv++;
+        break;
+#endif
+
+      default:
+        break;
+    }
+    set++;
+  }
+  statp->nscount = nserv;
+	
+}
+
+int
+ink_res_getservers(ink_res_state statp, union ink_res_sockaddr_union *set, int cnt) {
+  int i;
+  size_t size;
+  u_int16_t family;
+
+  for (i = 0; i < statp->nscount && i < cnt; i++) {
+    if (statp->_u._ext.ext)
+      family = statp->_u._ext.ext->nsaddrs[i].sin.sin_family;
+    else 
+      family = statp->nsaddr_list[i].sin_family;
+
+    switch (family) {
+      case AF_INET:
+        size = sizeof(set->sin);
+        if (statp->_u._ext.ext)
+          memcpy(&set->sin,
+                 &statp->_u._ext.ext->nsaddrs[i],
+                 size);
+        else
+          memcpy(&set->sin, &statp->nsaddr_list[i],
+                 size);
+        break;
+
+#ifdef HAS_INET6_STRUCTS
+      case AF_INET6:
+        size = sizeof(set->sin6);
+        if (statp->_u._ext.ext)
+          memcpy(&set->sin6,
+                 &statp->_u._ext.ext->nsaddrs[i],
+                 size);
+        else
+          memcpy(&set->sin6, &statp->nsaddr_list[i],
+                 size);
+        break;
+#endif
+
+      default:
+        set->sin.sin_family = 0;
+        break;
+    }
+    set++;
+  }
+  return (statp->nscount);
+}
+
+static void
+ink_res_setoptions(ink_res_state statp, const char *options, const char *source)
+{
+  const char *cp = options;
+  int i;
+  struct __ink_res_state_ext *ext = statp->_u._ext.ext;
+
+#ifdef DEBUG
+  if (statp->options & RES_DEBUG)
+    printf(";; res_setoptions(\"%s\", \"%s\")...\n",
+           options, source);
+#endif
+  while (*cp) {
+    /* skip leading and inner runs of spaces */
+    while (*cp == ' ' || *cp == '\t')
+      cp++;
+    /* search for and process individual options */
+    if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
+      i = atoi(cp + sizeof("ndots:") - 1);
+      if (i <= RES_MAXNDOTS)
+        statp->ndots = i;
+      else
+        statp->ndots = RES_MAXNDOTS;
+#ifdef DEBUG
+      if (statp->options & RES_DEBUG)
+        printf(";;\tndots=%d\n", statp->ndots);
+#endif
+    } else if (!strncmp(cp, "timeout:", sizeof("timeout:") - 1)) {
+      i = atoi(cp + sizeof("timeout:") - 1);
+      if (i <= RES_MAXRETRANS)
+        statp->retrans = i;
+      else
+        statp->retrans = RES_MAXRETRANS;
+#ifdef DEBUG
+      if (statp->options & RES_DEBUG)
+        printf(";;\ttimeout=%d\n", statp->retrans);
+#endif
+#ifdef	SOLARIS2
+    } else if (!strncmp(cp, "retrans:", sizeof("retrans:") - 1)) {
+      /*
+       * For backward compatibility, 'retrans' is
+       * supported as an alias for 'timeout', though
+       * without an imposed maximum.
+       */
+      statp->retrans = atoi(cp + sizeof("retrans:") - 1);
+    } else if (!strncmp(cp, "retry:", sizeof("retry:") - 1)){
+      /*
+       * For backward compatibility, 'retry' is
+       * supported as an alias for 'attempts', though
+       * without an imposed maximum.
+       */
+      statp->retry = atoi(cp + sizeof("retry:") - 1);
+#endif	/* SOLARIS2 */
+    } else if (!strncmp(cp, "attempts:", sizeof("attempts:") - 1)){
+      i = atoi(cp + sizeof("attempts:") - 1);
+      if (i <= RES_MAXRETRY)
+        statp->retry = i;
+      else
+        statp->retry = RES_MAXRETRY;
+#ifdef DEBUG
+      if (statp->options & RES_DEBUG)
+        printf(";;\tattempts=%d\n", statp->retry);
+#endif
+    } else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
+#ifdef DEBUG
+      if (!(statp->options & RES_DEBUG)) {
+        printf(";; res_setoptions(\"%s\", \"%s\")..\n",
+               options, source);
+        statp->options |= RES_DEBUG;
+      }
+      printf(";;\tdebug\n");
+#endif
+    } else if (!strncmp(cp, "no_tld_query",
+                        sizeof("no_tld_query") - 1) ||
+               !strncmp(cp, "no-tld-query",
+                        sizeof("no-tld-query") - 1)) {
+      statp->options |= RES_NOTLDQUERY;
+    } else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
+      statp->options |= RES_USE_INET6;
+    } else if (!strncmp(cp, "rotate", sizeof("rotate") - 1)) {
+      statp->options |= RES_ROTATE;
+    } else if (!strncmp(cp, "no-check-names",
+                        sizeof("no-check-names") - 1)) {
+      statp->options |= RES_NOCHECKNAME;
+    }
+#ifdef RES_USE_EDNS0
+    else if (!strncmp(cp, "edns0", sizeof("edns0") - 1)) {
+      statp->options |= RES_USE_EDNS0;
+    }
+#endif
+    else if (!strncmp(cp, "dname", sizeof("dname") - 1)) {
+      statp->options |= RES_USE_DNAME;
+    }
+    else if (!strncmp(cp, "nibble:", sizeof("nibble:") - 1)) {
+      if (ext == NULL)
+        goto skip;
+      cp += sizeof("nibble:") - 1;
+      i = MIN(strcspn(cp, " \t"), sizeof(ext->nsuffix) - 1);
+      strncpy(ext->nsuffix, cp, i);
+      ext->nsuffix[i] = '\0';
+    }
+    else if (!strncmp(cp, "nibble2:", sizeof("nibble2:") - 1)) {
+      if (ext == NULL)
+        goto skip;
+      cp += sizeof("nibble2:") - 1;
+      i = MIN(strcspn(cp, " \t"), sizeof(ext->nsuffix2) - 1);
+      strncpy(ext->nsuffix2, cp, i);
+      ext->nsuffix2[i] = '\0';
+    }
+    else if (!strncmp(cp, "v6revmode:", sizeof("v6revmode:") - 1)) {
+      cp += sizeof("v6revmode:") - 1;
+      /* "nibble" and "bitstring" used to be valid */
+      if (!strncmp(cp, "single", sizeof("single") - 1)) {
+        statp->options |= RES_NO_NIBBLE2;
+      } else if (!strncmp(cp, "both", sizeof("both") - 1)) {
+        statp->options &=
+          ~RES_NO_NIBBLE2;
+      }
+    }
+    else {
+      /* XXX - print a warning here? */
+    }
+  skip:
+    /* skip to next run of spaces */
+    while (*cp && *cp != ' ' && *cp != '\t')
+      cp++;
+  }
+}
+
+#ifdef RESOLVSORT
+/* XXX - should really support CIDR which means explicit masks always. */
+static u_int32_t
+ink_net_mask(in)		/*!< XXX - should really use system's version of this  */
+  struct in_addr in;
+{
+  register u_int32_t i = ntohl(in.s_addr);
+
+  if (IN_CLASSA(i))
+    return (htonl(IN_CLASSA_NET));
+  else if (IN_CLASSB(i))
+    return (htonl(IN_CLASSB_NET));
+  return (htonl(IN_CLASSC_NET));
+}
+#endif
+
+static u_int
+ink_res_randomid(void) {
+  struct timeval now;
+
+  gettimeofday(&now, NULL);
+  return (0xffff & (now.tv_sec ^ now.tv_usec ^ getpid()));
+}
+
+const char *
+ink_res_get_nibblesuffix(ink_res_state statp) {
+  if (statp->_u._ext.ext)
+    return (statp->_u._ext.ext->nsuffix);
+  return ("ip6.arpa");
+}
+
+const char *
+ink_res_get_nibblesuffix2(ink_res_state statp) {
+  if (statp->_u._ext.ext)
+    return (statp->_u._ext.ext->nsuffix2);
+  return ("ip6.int");
+}
+
+/*%
  * Set up default settings.  If the configuration file exist, the values
  * there will have precedence.  Otherwise, the server address is set to
  * INADDR_ANY and the default domain name comes from the gethostname().
@@ -138,7 +434,7 @@
  * since it was noted that INADDR_ANY actually meant ``the first interface
  * you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface,
  * it had to be "up" in order for you to reach your own name server.  It
- * was later decided that since the recommended practice is to always
+ * was later decided that since the recommended practice is to always 
  * install local static routes through 127.0.0.1 for all your network
  * interfaces, that we could solve this problem without a code change.
  *
@@ -149,71 +445,121 @@
  *
  * Return 0 if completes successfully, -1 on error
  */
+/*% This function has to be reachable by res_data.c but not publically. */
 int
-ink_res_init(struct __res_state &p_res, unsigned long *pHostList, int *pPort, char *pDefDomain, char *pSearchList)
-{
+ink_res_init(ink_res_state statp, unsigned long *pHostList, int *pPort, char *pDefDomain, char *pSearchList) {
   register FILE *fp;
   register char *cp, **pp;
   register int n;
-  char buf[MAXDNAME];
-  int nserv = 0;                /* number of nameserver records read from file */
+  char buf[BUFSIZ];
+  int nserv = 0;    /*%< number of nameserver records read from file */
   int haveenv = 0;
   int havesearch = 0;
 #ifdef RESOLVSORT
   int nsort = 0;
   char *net;
 #endif
-#ifndef RFC1535
   int dots;
-#endif
-
-  /*
-   * These three fields used to be statically initialized.  This made
-   * it hard to use this code in a shared library.  It is necessary,
-   * now that we're doing dynamic initialization here, that we preserve
-   * the old semantics: if an application modifies one of these three
-   * fields of p_res before res_init() is called, res_init() will not
-   * alter them.  Of course, if an application is setting them to
-   * _zero_ before calling res_init(), hoping to override what used
-   * to be the static default, we can't detect it and unexpected results
-   * will follow.  Zero for any of these fields would make no sense,
-   * so one can safely assume that the applications were already getting
-   * unexpected results.
-   *
-   * p_res.options is tricky since some apps were known to diddle the bits
-   * before res_init() was first called. We can't replicate that semantic
-   * with dynamic initialization (they may have turned bits off that are
-   * set in RES_DEFAULT).  Our solution is to declare such applications
-   * "broken".  They could fool us by setting RES_INIT but none do (yet).
-   */
-  if (!p_res.retrans)
-    p_res.retrans = RES_TIMEOUT;
-  if (!p_res.retry)
-    p_res.retry = 4;
-  if (!(p_res.options & RES_INIT))
-    p_res.options = RES_DEFAULT;
+  union ink_res_sockaddr_union u[2];
+  int maxns = MAXNS;
 
-  /*
-   * This one used to initialize implicitly to zero, so unless the app
-   * has set it to something in particular, we can randomize it now.
-   */
-  if (!p_res.id)
-    p_res.id = res_randomid();
+  // RES_SET_H_ERRNO(statp, 0);
+  statp->res_h_errno = 0;
+  if (statp->_u._ext.ext != NULL)
+    ink_res_ndestroy(statp);
+
+  statp->retrans = RES_TIMEOUT;
+  statp->retry = RES_DFLRETRY;
+  statp->options = RES_DEFAULT;
+  statp->id = ink_res_randomid();
 
+  memset(u, 0, sizeof(u));
+#ifdef USELOOPBACK
+  u[nserv].sin.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
+#else
+  u[nserv].sin.sin_addr.s_addr = INADDR_ANY;
+#endif
+  u[nserv].sin.sin_family = AF_INET;
+  u[nserv].sin.sin_port = htons(NAMESERVER_PORT);
+#ifdef HAVE_SA_LEN
+  u[nserv].sin.sin_len = sizeof(struct sockaddr_in);
+#endif
+  nserv++;
+#ifdef HAS_INET6_STRUCTS
 #ifdef USELOOPBACK
-  p_res.nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
+  u[nserv].sin6.sin6_addr = in6addr_loopback;
 #else
-  p_res.nsaddr.sin_addr.s_addr = INADDR_ANY;
+  u[nserv].sin6.sin6_addr = in6addr_any;
+#endif
+  u[nserv].sin6.sin6_family = AF_INET6;
+  u[nserv].sin6.sin6_port = htons(NAMESERVER_PORT);
+#ifdef HAVE_SA_LEN
+  u[nserv].sin6.sin6_len = sizeof(struct sockaddr_in6);
+#endif
+  nserv++;
+#endif
+  statp->nscount = 0;
+  statp->ndots = 1;
+  statp->pfcode = 0;
+  statp->_vcsock = -1;
+  statp->_flags = 0;
+  statp->qhook = NULL;
+  statp->rhook = NULL;
+  statp->_u._ext.nscount = 0;
+  statp->_u._ext.ext = (struct __ink_res_state_ext*)malloc(sizeof(*statp->_u._ext.ext));
+  if (statp->_u._ext.ext != NULL) {
+    memset(statp->_u._ext.ext, 0, sizeof(*statp->_u._ext.ext));
+    statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr;
+    strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa");
+    strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int");
+  } else {
+    /*
+     * Historically res_init() rarely, if at all, failed.
+     * Examples and applications exist which do not check
+     * our return code.  Furthermore several applications
+     * simply call us to get the systems domainname.  So
+     * rather then immediately fail here we store the
+     * failure, which is returned later, in h_errno.  And
+     * prevent the collection of 'nameserver' information
+     * by setting maxns to 0.  Thus applications that fail
+     * to check our return code wont be able to make
+     * queries anyhow.
+     */
+    // RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
+    statp->res_h_errno = NETDB_INTERNAL;
+    maxns = 0;
+  }
+#ifdef RESOLVSORT
+  statp->nsort = 0;
 #endif
-  p_res.nsaddr.sin_family = AF_INET;
-  p_res.nsaddr.sin_port = htons(NAMESERVER_PORT);
-  p_res.nscount = 1;
-  p_res.ndots = 1;
-  p_res.pfcode = 0;
+  ink_res_setservers(statp, u, nserv);
+
+#ifdef	SOLARIS2
+  /*
+   * The old libresolv derived the defaultdomain from NIS/NIS+.
+   * We want to keep this behaviour
+   */
+  {
+    char buf[sizeof(statp->defdname)], *cp;
+    int ret;
 
-  /* Allow user to override the local domain definition */
+    if ((ret = sysinfo(SI_SRPC_DOMAIN, buf, sizeof(buf))) > 0 &&
+        (unsigned int)ret <= sizeof(buf)) {
+      if (buf[0] == '+')
+        buf[0] = '.';
+      cp = strchr(buf, '.');
+      cp = (cp == NULL) ? buf : (cp + 1);
+      strncpy(statp->defdname, cp,
+              sizeof(statp->defdname) - 1);
+      statp->defdname[sizeof(statp->defdname) - 1] = '\0';
+    }
+  }
+#endif	/* SOLARIS2 */
+
+	/* Allow user to override the local domain definition */
   if ((cp = getenv("LOCALDOMAIN")) != NULL) {
-    (void) strncpy(p_res.defdname, cp, sizeof(p_res.defdname) - 1);
+    (void)strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
+    statp->defdname[sizeof(statp->defdname) - 1] = '\0';
     haveenv++;
 
     /*
@@ -223,11 +569,11 @@
      * one that they want to use as an individual (even more
      * important now that the rfc1535 stuff restricts searches)
      */
-    cp = p_res.defdname;
-    pp = p_res.dnsrch;
+    cp = statp->defdname;
+    pp = statp->dnsrch;
     *pp++ = cp;
-    for (n = 0; *cp && pp < p_res.dnsrch + MAXDNSRCH; cp++) {
-      if (*cp == '\n')          /* silly backwards compat */
+    for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
+      if (*cp == '\n')	/*%< silly backwards compat */
         break;
       else if (*cp == ' ' || *cp == '\t') {
         *cp = 0;
@@ -244,8 +590,7 @@
     *cp = '\0';
     *pp++ = 0;
   }
-
-
+        
   /* ---------------------------------------------
      Default domain name and doamin Search list:
 
@@ -259,8 +604,8 @@
   if (pDefDomain && '\0' != *pDefDomain && '\n' != *pDefDomain) {
 
     cp = pDefDomain;
-    strncpy(p_res.defdname, cp, sizeof(p_res.defdname) - 1);
-    if ((cp = strpbrk(p_res.defdname, " \t\n")) != NULL)
+    strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
+    if ((cp = strpbrk(statp->defdname, " \t\n")) != NULL)
       *cp = '\0';
 
     havedef_domain = 1;
@@ -269,17 +614,17 @@
   if (pSearchList && '\0' != *pSearchList && '\n' != *pSearchList) {
 
     cp = pSearchList;
-    strncpy(p_res.defdname, cp, sizeof(p_res.defdname) - 1);
-    if ((cp = strchr(p_res.defdname, '\n')) != NULL)
+    strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
+    if ((cp = strchr(statp->defdname, '\n')) != NULL)
       *cp = '\0';
     /*
      * Set search list to be blank-separated strings
      * on rest of line.
      */
-    cp = p_res.defdname;
-    pp = p_res.dnsrch;
+    cp = statp->defdname;
+    pp = statp->dnsrch;
     *pp++ = cp;
-    for (n = 0; *cp && pp < p_res.dnsrch + MAXDNSRCH; cp++) {
+    for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
       if (*cp == ' ' || *cp == '\t') {
         *cp = 0;
         n = 1;
@@ -301,76 +646,62 @@
      we must be provided with atleast a named!
      ------------------------------------------- */
 
-  while (pHostList[nserv] != 0 && nserv < MAXNS) {
-
-    p_res.nsaddr_list[nserv].sin_addr.s_addr = pHostList[nserv];
-    p_res.nsaddr_list[nserv].sin_family = AF_INET;
-    p_res.nsaddr_list[nserv].sin_port = htons(pPort[nserv]);
+  while (pHostList && pHostList[nserv] != 0 && nserv < MAXNS) {
+    statp->nsaddr_list[nserv].sin_addr.s_addr = pHostList[nserv];
+    statp->nsaddr_list[nserv].sin_family = AF_INET;
+    statp->nsaddr_list[nserv].sin_port = htons(pPort[nserv]);
     nserv++;
   }
 
-  if (nserv > 1)
-    p_res.nscount = nserv;
-
-
-  if (0 == nserv)
-    return -1;
-
-#define	MATCH(line, name) \
-	(!strncmp(line, name, sizeof(name) - 1) && \
-	(line[sizeof(name) - 1] == ' ' || \
-	 line[sizeof(name) - 1] == '\t'))
+#define	MATCH(line, name)                       \
+  (!strncmp(line, name, sizeof(name) - 1) &&    \
+   (line[sizeof(name) - 1] == ' ' ||            \
+    line[sizeof(name) - 1] == '\t'))
 
+  nserv = 0;
   if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
     /* read the config file */
     while (fgets(buf, sizeof(buf), fp) != NULL) {
       /* skip comments */
       if (*buf == ';' || *buf == '#')
         continue;
-
       /* read default domain name */
       if (MATCH(buf, "domain")) {
-
-        if (havedef_domain || haveenv)
+        if (haveenv)	/*%< skip if have from environ */
           continue;
-
         cp = buf + sizeof("domain") - 1;
-
         while (*cp == ' ' || *cp == '\t')
           cp++;
         if ((*cp == '\0') || (*cp == '\n'))
           continue;
-        strncpy(p_res.defdname, cp, sizeof(p_res.defdname) - 1);
-        if ((cp = strpbrk(p_res.defdname, " \t\n")) != NULL)
+        strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
+        statp->defdname[sizeof(statp->defdname) - 1] = '\0';
+        if ((cp = strpbrk(statp->defdname, " \t\n")) != NULL)
           *cp = '\0';
         havesearch = 0;
         continue;
       }
-
-
       /* set search list */
       if (MATCH(buf, "search")) {
-
-        if (havedomain_srchlst || haveenv)      /* skip if have from environ */
+        if (haveenv)	/*%< skip if have from environ */
           continue;
-
         cp = buf + sizeof("search") - 1;
-
         while (*cp == ' ' || *cp == '\t')
           cp++;
         if ((*cp == '\0') || (*cp == '\n'))
           continue;
-        strncpy(p_res.defdname, cp, sizeof(p_res.defdname) - 1);
-        if ((cp = strchr(p_res.defdname, '\n')) != NULL)
+        strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
+        statp->defdname[sizeof(statp->defdname) - 1] = '\0';
+        if ((cp = strchr(statp->defdname, '\n')) != NULL)
           *cp = '\0';
         /*
          * Set search list to be blank-separated strings
          * on rest of line.
          */
-        cp = p_res.defdname;
-        pp = p_res.dnsrch;
+        cp = statp->defdname;
+        pp = statp->dnsrch;
         *pp++ = cp;
-        for (n = 0; *cp && pp < p_res.dnsrch + MAXDNSRCH; cp++) {
+        for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
           if (*cp == ' ' || *cp == '\t') {
             *cp = 0;
             n = 1;
@@ -387,686 +718,144 @@
         havesearch = 1;
         continue;
       }
-
-      /* we suppy the name servers! */
       /* read nameservers to query */
-      if (MATCH(buf, "nameserver")) {
-#if 0
-        if (MATCH(buf, "nameserver") && nserv < MAXNS) {
-          struct in_addr a;
-          cp = buf + sizeof("nameserver") - 1;
-          while (*cp == ' ' || *cp == '\t')
-            cp++;
-          if ((*cp != '\0') && (*cp != '\n') && inet_aton(cp, &a)) {
-            p_res.nsaddr_list[nserv].sin_addr = a;
-            p_res.nsaddr_list[nserv].sin_family = AF_INET;
-            p_res.nsaddr_list[nserv].sin_port = htons(NAMESERVER_PORT);
-            nserv++;
-          }
-#endif
-          continue;
-        }
-
-#ifdef RESOLVSORT
-        if (MATCH(buf, "sortlist")) {
-          struct in_addr a;
+      if (MATCH(buf, "nameserver") && nserv < maxns) {
+        struct addrinfo hints, *ai;
+        char sbuf[NI_MAXSERV];
+        const size_t minsiz =
+          sizeof(statp->_u._ext.ext->nsaddrs[0]);
 
-          cp = buf + sizeof("sortlist") - 1;
-          while (nsort < MAXRESOLVSORT) {
-            while (*cp == ' ' || *cp == '\t')
-              cp++;
-            if (*cp == '\0' || *cp == '\n' || *cp == ';')
-              break;
-            net = cp;
-            while (*cp && !ISSORTMASK(*cp) && *cp != ';' && isascii(*cp) && !isspace(*cp))
-              cp++;
-            n = *cp;
-            *cp = 0;
-            if (inet_aton(net, &a)) {
-              p_res.sort_list[nsort].addr = a;
-              if (ISSORTMASK(n)) {
-                *cp++ = n;
-                net = cp;
-                while (*cp && *cp != ';' && isascii(*cp) && !isspace(*cp))
-                  cp++;
-                n = *cp;
-                *cp = 0;
-                if (inet_aton(net, &a)) {
-                  p_res.sort_list[nsort].mask = a.s_addr;
-                } else {
-                  p_res.sort_list[nsort].mask = net_mask(p_res.sort_list[nsort].addr);
-                }
-              } else {
-                p_res.sort_list[nsort].mask = net_mask(p_res.sort_list[nsort].addr);
-              }
-              nsort++;
+        cp = buf + sizeof("nameserver") - 1;
+        while (*cp == ' ' || *cp == '\t')
+          cp++;
+        cp[strcspn(cp, ";# \t\n")] = '\0';
+        if ((*cp != '\0') && (*cp != '\n')) {
+          memset(&hints, 0, sizeof(hints));
+          hints.ai_family = PF_UNSPEC;
+          hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
+          hints.ai_flags = AI_NUMERICHOST;
+          sprintf(sbuf, "%u", NAMESERVER_PORT);
+          if (getaddrinfo(cp, sbuf, &hints, &ai) == 0 &&
+              ai->ai_addrlen <= minsiz) {
+            if (statp->_u._ext.ext != NULL) {
+              memcpy(&statp->_u._ext.ext->nsaddrs[nserv],
+                     ai->ai_addr, ai->ai_addrlen);
             }
-            *cp = n;
+            if (ai->ai_addrlen <=
+                sizeof(statp->nsaddr_list[nserv])) {
+              memcpy(&statp->nsaddr_list[nserv],
+                     ai->ai_addr, ai->ai_addrlen);
+            } else
+              statp->nsaddr_list[nserv].sin_family = 0;
+            freeaddrinfo(ai);
+            nserv++;
           }
-          continue;
-        }
-#endif
-        if (MATCH(buf, "options")) {
-          res_setoptions(p_res, buf + sizeof("options") - 1, "conf");
-          continue;
         }
+        continue;
       }
-      if (nserv > 1)
-        p_res.nscount = nserv;
-#ifdef RESOLVSORT
-      p_res.nsort = nsort;
-#endif
-      (void) fclose(fp);
-    }
-
-
-    /* -----------------------------
-       ----------------------------- */
-
-
-    if (p_res.defdname[0] == 0 && gethostname(buf, sizeof(p_res.defdname) - 1) == 0 && (cp = strchr(buf, '.')) != NULL)
-      ink_strncpy(p_res.defdname, cp + 1, sizeof(p_res.defdname));
-
-    /* find components of local domain that might be searched */
-    if (havesearch == 0) {
-      pp = p_res.dnsrch;
-      *pp++ = p_res.defdname;
-      *pp = NULL;
-
-#ifndef RFC1535
-      dots = 0;
-      for (cp = p_res.defdname; *cp; cp++)
-        dots += (*cp == '.');
-
-      cp = p_res.defdname;
-      while (pp < p_res.dnsrch + MAXDFLSRCH) {
-        if (dots < LOCALDOMAINPARTS)
-          break;
-        cp = strchr(cp, '.') + 1;       /* we know there is one */
-        *pp++ = cp;
-        dots--;
-      }
-      *pp = NULL;
-#ifdef DEBUG
-      if (p_res.options & RES_DEBUG) {
-        printf(";; res_init()... default dnsrch list:\n");
-        for (pp = p_res.dnsrch; *pp; pp++)
-          printf(";;\t%s\n", *pp);
-        printf(";;\t..END..\n");
-      }
-#endif /* DEBUG */
-#endif /* !RFC1535 */
-    }
-
-    if ((cp = getenv("RES_OPTIONS")) != NULL)
-      res_setoptions(p_res, cp, "env");
-    p_res.options |= RES_INIT;
-    return (0);
-  }
-
-  static void res_setoptions(struct __res_state &p_res, char *options, char *source)
-  {
-    char *cp = options;
-    int i;
-
-#ifdef DEBUG
-    if (p_res.options & RES_DEBUG)
-      printf(";; res_setoptions(\"%s\", \"%s\")...\n", options, source);
-#endif
-    while (*cp) {
-      /* skip leading and inner runs of spaces */
-      while (*cp == ' ' || *cp == '\t')
-        cp++;
-      /* search for and process individual options */
-      if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
-        i = atoi(cp + sizeof("ndots:") - 1);
-        if (i <= RES_MAXNDOTS)
-          p_res.ndots = i;
-        else
-          p_res.ndots = RES_MAXNDOTS;
-#ifdef DEBUG
-        if (p_res.options & RES_DEBUG)
-          printf(";;\tndots=%d\n", p_res.ndots);
-#endif
-      } else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
-#ifdef DEBUG
-        if (!(p_res.options & RES_DEBUG)) {
-          printf(";; res_setoptions(\"%s\", \"%s\")..\n", options, source);
-          p_res.options |= RES_DEBUG;
-        }
-        printf(";;\tdebug\n");
-#endif
-      }
-
-      else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
-        p_res.options |= RES_USE_INET6;
-      }
-
-      else {
-        /* XXX - print a warning here? */
-      }
-      /* skip to next run of spaces */
-      while (*cp && *cp != ' ' && *cp != '\t')
-        cp++;
-    }
-  }
-
-  int ink_res_init_rr(struct __res_state_rr &p_res, unsigned long *pHostList,
-                      int *pPort, char *pDefDomain, char *pSearchList)
-  {
-    register FILE *fp;
-    register char *cp, **pp;
-    register int n;
-    char buf[MAXDNAME];
-    int nserv = 0;              /* number of nameserver records read from file */
-    int haveenv = 0;
-    int havesearch = 0;
 #ifdef RESOLVSORT
-    int nsort = 0;
-    char *net;
-#endif
-#ifndef RFC1535
-    int dots;
-#endif
-
-    /*
-     * These three fields used to be statically initialized.  This made
-     * it hard to use this code in a shared library.  It is necessary,
-     * now that we're doing dynamic initialization here, that we preserve
-     * the old semantics: if an application modifies one of these three
-     * fields of p_res before res_init() is called, res_init() will not
-     * alter them.  Of course, if an application is setting them to
-     * _zero_ before calling res_init(), hoping to override what used
-     * to be the static default, we can't detect it and unexpected results
-     * will follow.  Zero for any of these fields would make no sense,
-     * so one can safely assume that the applications were already getting
-     * unexpected results.
-     *
-     * p_res.options is tricky since some apps were known to diddle the bits
-     * before res_init() was first called. We can't replicate that semantic
-     * with dynamic initialization (they may have turned bits off that are
-     * set in RES_DEFAULT).  Our solution is to declare such applications
-     * "broken".  They could fool us by setting RES_INIT but none do (yet).
-     */
-    if (!p_res.retrans)
-      p_res.retrans = RES_TIMEOUT;
-    if (!p_res.retry)
-      p_res.retry = 4;
-    if (!(p_res.options & RES_INIT))
-      p_res.options = RES_DEFAULT;
-
-    /*
-     * This one used to initialize implicitly to zero, so unless the app
-     * has set it to something in particular, we can randomize it now.
-     */
-    if (!p_res.id)
-      p_res.id = res_randomid();
-
-#ifdef USELOOPBACK
-    p_res.nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
-#else
-    p_res.nsaddr.sin_addr.s_addr = INADDR_ANY;
-#endif
-    p_res.nsaddr.sin_family = AF_INET;
-    p_res.nsaddr.sin_port = htons(NAMESERVER_PORT);
-    p_res.nscount = 1;
-    p_res.ndots = 1;
-    p_res.pfcode = 0;
-
-    /* Allow user to override the local domain definition */
-    if ((cp = getenv("LOCALDOMAIN")) != NULL) {
-      (void) strncpy(p_res.defdname, cp, sizeof(p_res.defdname) - 1);
-      haveenv++;
-
-      /*
-       * Set search list to be blank-separated strings
-       * from rest of env value.  Permits users of LOCALDOMAIN
-       * to still have a search list, and anyone to set the
-       * one that they want to use as an individual (even more
-       * important now that the rfc1535 stuff restricts searches)
-       */
-      cp = p_res.defdname;
-      pp = p_res.dnsrch;
-      *pp++ = cp;
-      for (n = 0; *cp && pp < p_res.dnsrch + MAXDNSRCH; cp++) {
-        if (*cp == '\n')        /* silly backwards compat */
-          break;
-        else if (*cp == ' ' || *cp == '\t') {
-          *cp = 0;
-          n = 1;
-        } else if (n) {
-          *pp++ = cp;
-          n = 0;
-          havesearch = 1;
-        }
-      }
-      /* null terminate last domain if there are excess */
-      while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n')
-        cp++;
-      *cp = '\0';
-      *pp++ = 0;
-    }
-
-
-    /* ---------------------------------------------
-       Default domain name and doamin Search list:
-
-       if we are supplied a default domain name,
-       and/or search list we will use it. Otherwise,
-       we will skip to using  what is present in the
-       conf file
-       ---------------------------------------------- */
-
-    int havedef_domain = 0, havedomain_srchlst = 0;
-    if (pDefDomain && '\0' != *pDefDomain && '\n' != *pDefDomain) {
-
-      cp = pDefDomain;
-      strncpy(p_res.defdname, cp, sizeof(p_res.defdname) - 1);
-      if ((cp = strpbrk(p_res.defdname, " \t\n")) != NULL)
-        *cp = '\0';
-
-      havedef_domain = 1;
-
-    }
-    if (pSearchList && '\0' != *pSearchList && '\n' != *pSearchList) {
-
-      cp = pSearchList;
-      strncpy(p_res.defdname, cp, sizeof(p_res.defdname) - 1);
-      if ((cp = strchr(p_res.defdname, '\n')) != NULL)
-        *cp = '\0';
-      /*
-       * Set search list to be blank-separated strings
-       * on rest of line.
-       */
-      cp = p_res.defdname;
-      pp = p_res.dnsrch;
-      *pp++ = cp;
-      for (n = 0; *cp && pp < p_res.dnsrch + MAXDNSRCH; cp++) {
-        if (*cp == ' ' || *cp == '\t') {
-          *cp = 0;
-          n = 1;
-        } else if (n) {
-          *pp++ = cp;
-          n = 0;
-        }
-      }
-      /* null terminate last domain if there are excess */
-      while (*cp != '\0' && *cp != ' ' && *cp != '\t')
-        cp++;
-      *cp = '\0';
-      *pp++ = 0;
-      havesearch = 1;
-      havedomain_srchlst = 1;
-    }
-
-    /* -------------------------------------------
-       we must be provided with atleast a named!
-       ------------------------------------------- */
-
-    while (pHostList[nserv] != 0 && nserv < MAXNSRR) {
-
-      p_res.nsaddr_list[nserv].sin_addr.s_addr = pHostList[nserv];
-      p_res.nsaddr_list[nserv].sin_family = AF_INET;
-      p_res.nsaddr_list[nserv].sin_port = htons(pPort[nserv]);
-      nserv++;
-    }
-
-    if (nserv > 1)
-      p_res.nscount = nserv;
-
-
-    if (0 == nserv)
-      return -1;
-
-#define	MATCH(line, name) \
-	(!strncmp(line, name, sizeof(name) - 1) && \
-	(line[sizeof(name) - 1] == ' ' || \
-	 line[sizeof(name) - 1] == '\t'))
-
-    if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
-      /* read the config file */
-      while (fgets(buf, sizeof(buf), fp) != NULL) {
-        /* skip comments */
-        if (*buf == ';' || *buf == '#')
-          continue;
-
-        /* read default domain name */
-        if (MATCH(buf, "domain")) {
-
-          if (havedef_domain || haveenv)
-            continue;
-
-          cp = buf + sizeof("domain") - 1;
+      if (MATCH(buf, "sortlist")) {
+        struct in_addr a;
 
+        cp = buf + sizeof("sortlist") - 1;
+        while (nsort < MAXRESOLVSORT) {
           while (*cp == ' ' || *cp == '\t')
             cp++;
-          if ((*cp == '\0') || (*cp == '\n'))
-            continue;
-          strncpy(p_res.defdname, cp, sizeof(p_res.defdname) - 1);
-          if ((cp = strpbrk(p_res.defdname, " \t\n")) != NULL)
-            *cp = '\0';
-          havesearch = 0;
-          continue;
-        }
-
-
-        /* set search list */
-        if (MATCH(buf, "search")) {
-
-          if (havedomain_srchlst || haveenv)    /* skip if have from environ */
-            continue;
-
-          cp = buf + sizeof("search") - 1;
-
-          while (*cp == ' ' || *cp == '\t')
-            cp++;
-          if ((*cp == '\0') || (*cp == '\n'))
-            continue;
-          strncpy(p_res.defdname, cp, sizeof(p_res.defdname) - 1);
-          if ((cp = strchr(p_res.defdname, '\n')) != NULL)
-            *cp = '\0';
-          /*
-           * Set search list to be blank-separated strings
-           * on rest of line.
-           */
-          cp = p_res.defdname;
-          pp = p_res.dnsrch;
-          *pp++ = cp;
-          for (n = 0; *cp && pp < p_res.dnsrch + MAXDNSRCH; cp++) {
-            if (*cp == ' ' || *cp == '\t') {
-              *cp = 0;
-              n = 1;
-            } else if (n) {
-              *pp++ = cp;
-              n = 0;
-            }
-          }
-          /* null terminate last domain if there are excess */
-          while (*cp != '\0' && *cp != ' ' && *cp != '\t')
+          if (*cp == '\0' || *cp == '\n' || *cp == ';')
+            break;
+          net = cp;
+          while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
+                 isascii(*cp) && !isspace((unsigned char)*cp))
             cp++;
-          *cp = '\0';
-          *pp++ = 0;
-          havesearch = 1;
-          continue;
-        }
-
-        /* we suppy the name servers! */
-        /* read nameservers to query */
-        if (MATCH(buf, "nameserver")) {
-#if 0
-          if (MATCH(buf, "nameserver") && nserv < MAXNS) {
-            struct in_addr a;
-            cp = buf + sizeof("nameserver") - 1;
-            while (*cp == ' ' || *cp == '\t')
-              cp++;
-            if ((*cp != '\0') && (*cp != '\n') && inet_aton(cp, &a)) {
-              p_res.nsaddr_list[nserv].sin_addr = a;
-              p_res.nsaddr_list[nserv].sin_family = AF_INET;
-              p_res.nsaddr_list[nserv].sin_port = htons(NAMESERVER_PORT);
-              nserv++;
-            }
-#endif
-            continue;
-          }
-
-#ifdef RESOLVSORT
-          if (MATCH(buf, "sortlist")) {
-            struct in_addr a;
-
-            cp = buf + sizeof("sortlist") - 1;
-            while (nsort < MAXRESOLVSORT) {
-              while (*cp == ' ' || *cp == '\t')
-                cp++;
-              if (*cp == '\0' || *cp == '\n' || *cp == ';')
-                break;
+          n = *cp;
+          *cp = 0;
+          if (inet_aton(net, &a)) {
+            statp->sort_list[nsort].addr = a;
+            if (ISSORTMASK(n)) {
+              *cp++ = n;
               net = cp;
-              while (*cp && !ISSORTMASK(*cp) && *cp != ';' && isascii(*cp) && !isspace(*cp))
+              while (*cp && *cp != ';' &&
+                     isascii(*cp) &&
+                     !isspace((unsigned char)*cp))
                 cp++;
               n = *cp;
               *cp = 0;
               if (inet_aton(net, &a)) {
-                p_res.sort_list[nsort].addr = a;
-                if (ISSORTMASK(n)) {
-                  *cp++ = n;
-                  net = cp;
-                  while (*cp && *cp != ';' && isascii(*cp) && !isspace(*cp))
-                    cp++;
-                  n = *cp;
-                  *cp = 0;
-                  if (inet_aton(net, &a)) {
-                    p_res.sort_list[nsort].mask = a.s_addr;
-                  } else {
-                    p_res.sort_list[nsort].mask = net_mask(p_res.sort_list[nsort].addr);
-                  }
-                } else {
-                  p_res.sort_list[nsort].mask = net_mask(p_res.sort_list[nsort].addr);
-                }
-                nsort++;
+                statp->sort_list[nsort].mask = a.s_addr;
+              } else {
+                statp->sort_list[nsort].mask = 
+                  net_mask(statp->sort_list[nsort].addr);
               }
-              *cp = n;
+            } else {
+              statp->sort_list[nsort].mask = 
+                net_mask(statp->sort_list[nsort].addr);
             }
-            continue;
+            nsort++;
           }
-#endif
-          if (MATCH(buf, "options")) {
-            res_setoptions_rr(p_res, buf + sizeof("options") - 1, "conf");
-            continue;
-          }
-        }
-        if (nserv > 1)
-          p_res.nscount = nserv;
-#ifdef RESOLVSORT
-        p_res.nsort = nsort;
-#endif
-        (void) fclose(fp);
-      }
-
-
-      /* -----------------------------
-         ----------------------------- */
-
-
-      if (p_res.defdname[0] == 0 &&
-          gethostname(buf, sizeof(p_res.defdname) - 1) == 0 && (cp = strchr(buf, '.')) != NULL)
-        ink_strncpy(p_res.defdname, cp + 1, sizeof(p_res.defdname));
-
-      /* find components of local domain that might be searched */
-      if (havesearch == 0) {
-        pp = p_res.dnsrch;
-        *pp++ = p_res.defdname;
-        *pp = NULL;
-
-#ifndef RFC1535
-        dots = 0;
-        for (cp = p_res.defdname; *cp; cp++)
-          dots += (*cp == '.');
-
-        cp = p_res.defdname;
-        while (pp < p_res.dnsrch + MAXDFLSRCH) {
-          if (dots < LOCALDOMAINPARTS)
-            break;
-          cp = strchr(cp, '.') + 1;     /* we know there is one */
-          *pp++ = cp;
-          dots--;
+          *cp = n;
         }
-        *pp = NULL;
-#ifdef DEBUG
-        if (p_res.options & RES_DEBUG) {
-          printf(";; res_init()... default dnsrch list:\n");
-          for (pp = p_res.dnsrch; *pp; pp++)
-            printf(";;\t%s\n", *pp);
-          printf(";;\t..END..\n");
-        }
-#endif /* DEBUG */
-#endif /* !RFC1535 */
+        continue;
       }
-
-      if ((cp = getenv("RES_OPTIONS")) != NULL)
-        res_setoptions_rr(p_res, cp, "env");
-      p_res.options |= RES_INIT;
-      return (0);
-    }
-
-    static void res_setoptions_rr(struct __res_state_rr &p_res, char *options, char *source)
-    {
-      char *cp = options;
-      int i;
-
-#ifdef DEBUG
-      if (p_res.options & RES_DEBUG)
-        printf(";; res_setoptions(\"%s\", \"%s\")...\n", options, source);
 #endif
-      while (*cp) {
-        /* skip leading and inner runs of spaces */
-        while (*cp == ' ' || *cp == '\t')
-          cp++;
-        /* search for and process individual options */
-        if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
-          i = atoi(cp + sizeof("ndots:") - 1);
-          if (i <= RES_MAXNDOTS)
-            p_res.ndots = i;
-          else
-            p_res.ndots = RES_MAXNDOTS;
-#ifdef DEBUG
-          if (p_res.options & RES_DEBUG)
-            printf(";;\tndots=%d\n", p_res.ndots);
-#endif
-        } else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
-#ifdef DEBUG
-          if (!(p_res.options & RES_DEBUG)) {
-            printf(";; res_setoptions(\"%s\", \"%s\")..\n", options, source);
-            p_res.options |= RES_DEBUG;
-          }
-          printf(";;\tdebug\n");
-#endif
-        }
-
-        else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
-          p_res.options |= RES_USE_INET6;
-        }
-
-        else {
-          /* XXX - print a warning here? */
-        }
-        /* skip to next run of spaces */
-        while (*cp && *cp != ' ' && *cp != '\t')
-          cp++;
+      if (MATCH(buf, "options")) {
+        ink_res_setoptions(statp, buf + sizeof("options") - 1, "conf");
+        continue;
       }
     }
-
+    if (nserv > 0) 
+      statp->nscount = nserv;
 #ifdef RESOLVSORT
-/* XXX - should really support CIDR which means explicit masks always. */
-    static u_int32_t net_mask(in)       /* XXX - should really use system's version of this */
-    struct in_addr in;
-    {
-      register u_int32_t i = ntohl(in.s_addr);
-
-      if (IN_CLASSA(i))
-        return (htonl(IN_CLASSA_NET));
-      else if (IN_CLASSB(i))
-        return (htonl(IN_CLASSB_NET));
-      return (htonl(IN_CLASSC_NET));
-    }
+    statp->nsort = nsort;
 #endif
-
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
-/* 
- * Check whether "cp" is a valid ascii representation
- * of an Internet address and convert to a binary address.
- * Returns 1 if the address is valid, 0 if not.
- * This replaces inet_addr, the return value from which
- * cannot distinguish between failure and a local broadcast address.
+    (void) fclose(fp);
+  }
+/*
+ * Last chance to get a nameserver.  This should not normally
+ * be necessary
  */
-
-    int inet_aton(register const char *cp, struct in_addr *addr)
-    {
-      register u_long val;
-      register int base, n;
-      register char c;
-      u_int parts[4];
-      register u_int *pp = parts;
-
-      c = *cp;
-      for (;;) {
-        /*
-         * Collect number up to ``.''.
-         * Values are specified as for C:
-         * 0x=hex, 0=octal, isdigit=decimal.
-         */
-        if (!isdigit(c))
-          return (0);
-        val = 0;
-        base = 10;
-        if (c == '0') {
-          c = *++cp;
-          if (c == 'x' || c == 'X')
-            base = 16, c = *++cp;
-          else
-            base = 8;
-        }
-        for (;;) {
-          if (isascii(c) && isdigit(c)) {
-            val = (val * base) + (c - '0');
-            c = *++cp;
-          } else if (base == 16 && isascii(c) && isxdigit(c)) {
-            val = (val << 4) | (c + 10 - (islower(c) ? 'a' : 'A'));
-            c = *++cp;
-          } else
-            break;
-        }
-        if (c == '.') {
-          /*
-           * Internet format:
-           *      a.b.c.d
-           *      a.b.c   (with c treated as 16 bits)
-           *      a.b     (with b treated as 24 bits)
-           */
-          if (pp >= parts + 3)
-            return (0);
-          *pp++ = val;
-          c = *++cp;
-        } else
-          break;
-      }
-      /*
-       * Check for trailing characters.
-       */
-      if (c != '\0' && (!isascii(c) || !isspace(c)))
-        return (0);
-      /*
-       * Concoct the address according to
-       * the number of parts specified.
-       */
-      n = pp - parts + 1;
-      switch (n) {
-
-      case 0:
-        return (0);             /* initial nondigit */
-
-      case 1:                  /* a -- 32 bits */
-        break;
-
-      case 2:                  /* a.b -- 8.24 bits */
-        if (val > 0xffffff)
-          return (0);
-        val |= parts[0] << 24;
-        break;
-
-      case 3:                  /* a.b.c -- 8.8.16 bits */
-        if (val > 0xffff)
-          return (0);
-        val |= (parts[0] << 24) | (parts[1] << 16);
+#ifdef NO_RESOLV_CONF
+  if(nserv == 0)
+    nserv = get_nameservers(statp);
+#endif
+
+  if (statp->defdname[0] == 0 &&
+      gethostname(buf, sizeof(statp->defdname) - 1) == 0 &&
+      (cp = strchr(buf, '.')) != NULL)
+    strcpy(statp->defdname, cp + 1);
+
+  /* find components of local domain that might be searched */
+  if (havesearch == 0) {
+    pp = statp->dnsrch;
+    *pp++ = statp->defdname;
+    *pp = NULL;
+
+    dots = 0;
+    for (cp = statp->defdname; *cp; cp++)
+      dots += (*cp == '.');
+
+    cp = statp->defdname;
+    while (pp < statp->dnsrch + MAXDFLSRCH) {
+      if (dots < LOCALDOMAINPARTS)
         break;
-
-      case 4:                  /* a.b.c.d -- 8.8.8.8 bits */
-        if (val > 0xff)
-          return (0);
-        val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
-        break;
-      }
-      if (addr)
-        addr->s_addr = htonl(val);
-      return (1);
+      cp = strchr(cp, '.') + 1;    /*%< we know there is one */
+      *pp++ = cp;
+      dots--;
+    }
+    *pp = NULL;
+#ifdef DEBUG
+    if (statp->options & RES_DEBUG) {
+      printf(";; res_init()... default dnsrch list:\n");
+      for (pp = statp->dnsrch; *pp; pp++)
+        printf(";;\t%s\n", *pp);
+      printf(";;\t..END..\n");
     }
 #endif
+  }
+
+  if ((cp = getenv("RES_OPTIONS")) != NULL)
+    ink_res_setoptions(statp, cp, "env");
+  statp->options |= RES_INIT;
+  return (statp->res_h_errno);
+}
+
 #endif

Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_mkquery.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_res_mkquery.cc?rev=908143&r1=908142&r2=908143&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_mkquery.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_mkquery.cc Tue Feb  9 18:19:44 2010
@@ -1,304 +1,525 @@
-/** @file
+/*
+ * Copyright (c) 1985, 1993
+ *    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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ * 	This product includes software developed by the University of
+ * 	California, Berkeley and its contributors.
+ * 4. Neither the name of the University 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 REGENTS 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.
+ */
 
-  A brief file description
+/*
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * 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, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION 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.
+ */
 
-  @section license License
+/*
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Portions 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.
+ */
 
-  Copyright (c) 1985, 1989, 1993
-     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:
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. 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.
-  3. All advertising materials mentioning features or use of this software
-     must display the following acknowledgement:
-     This product includes software developed by the University of
-     California, Berkeley and its contributors.
-  4. Neither the name of the University 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 REGENTS 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.
-
-  Portions Copyright (c) 1993 by Digital Equipment Corporation.
-
-  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, and that
-  the name of Digital Equipment Corporation not be used in advertising or
-  publicity pertaining to distribution of the document or software without
-  specific, written prior permission.
-
-  THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
-  WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
-  OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
-  CORPORATION 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.
+/*
+  Imported from Bind-9.5.2-P2
+  
+  Changes:
+
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
 
- */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-
+static const char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
+static const char rcsid[] = "$Id: res_mkquery.c,v 1.6.672.1 2008/04/03 02:12:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
-
-#include <stdio.h>
 #include <netdb.h>
 #include <resolv.h>
+#include <stdio.h>
 #include <string.h>
-#include <strings.h>
 
+#include "ink_defs.h"
 #include "ink_resolver.h"
 
-#ifndef __putshort
-#define __putshort putshort
-#endif
-
-#ifndef __putlong
-#define __putlong putlong
-#endif
+#define SPRINTF(x) (sprintf x)
 
-/*
+/*%
  * Form all types of queries.
  * Returns the size of the result or -1.
  */
 int
-ink_res_mkquery(struct __res_state &p_res,      /* user defined res struct */
-                int op,         /* opcode of query */
-                const char *dname,      /* domain name */
-                int res_class, int type,        /* class and type of query */
-                const u_char * data,    /* resource record data */
-                int datalen,    /* length of data */
-                const u_char * newrr_in,        /* new rr for modify or append */
-                u_char * buf,   /* buffer to put query */
-                int buflen      /* size of buffer */
-  )
+ink_res_mkquery(ink_res_state statp,
+	     int op,			/*!< opcode of query  */
+	     const char *dname,		/*!< domain name  */
+	     int _class, int type,	/*!< _class and type of query  */
+	     const u_char *data,	/*!< resource record data  */
+	     int datalen,		/*!< length of data  */
+	     const u_char *newrr_in,	/*!< new rr for modify or append  */
+	     u_char *buf,		/*!< buffer to put query  */
+	     int buflen)		/*!< size of buffer  */
+{
+	register HEADER *hp;
+	register u_char *cp, *ep;
+	register int n;
+	u_char *dnptrs[20], **dpp, **lastdnptr;
+
+	NOWARN_UNUSED(newrr_in);
+
+	/*
+	 * Initialize header fields.
+	 */
+	if ((buf == NULL) || (buflen < HFIXEDSZ))
+		return (-1);
+	memset(buf, 0, HFIXEDSZ);
+	hp = (HEADER *) buf;
+	hp->id = htons(++statp->id);
+	hp->opcode = op;
+	hp->rd = (statp->options & RES_RECURSE) != 0U;
+	hp->rcode = NOERROR;
+	cp = buf + HFIXEDSZ;
+	ep = buf + buflen;
+	dpp = dnptrs;
+	*dpp++ = buf;
+	*dpp++ = NULL;
+	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
+	/*
+	 * perform opcode specific processing
+	 */
+	switch (op) {
+	case QUERY:	/*FALLTHROUGH*/
+	case NS_NOTIFY_OP:
+		if (ep - cp < QFIXEDSZ)
+			return (-1);
+		if ((n = dn_comp(dname, cp, ep - cp - QFIXEDSZ, dnptrs,
+		    lastdnptr)) < 0)
+			return (-1);
+		cp += n;
+		NS_PUT16(type, cp);
+		NS_PUT16(_class, cp);
+		hp->qdcount = htons(1);
+		if (op == QUERY || data == NULL)
+			break;
+		/*
+		 * Make an additional record for completion domain.
+		 */
+		if ((ep - cp) < RRFIXEDSZ)
+			return (-1);
+		n = dn_comp((const char *)data, cp, ep - cp - RRFIXEDSZ,
+			    dnptrs, lastdnptr);
+		if (n < 0)
+			return (-1);
+		cp += n;
+		NS_PUT16(T_NULL, cp);
+		NS_PUT16(_class, cp);
+		NS_PUT32(0, cp);
+		NS_PUT16(0, cp);
+		hp->arcount = htons(1);
+		break;
+
+	case IQUERY:
+		/*
+		 * Initialize answer section
+		 */
+		if (ep - cp < 1 + RRFIXEDSZ + datalen)
+			return (-1);
+		*cp++ = '\0';	/*%< no domain name */
+		NS_PUT16(type, cp);
+		NS_PUT16(_class, cp);
+		NS_PUT32(0, cp);
+		NS_PUT16(datalen, cp);
+		if (datalen) {
+			memcpy(cp, data, datalen);
+			cp += datalen;
+		}
+		hp->ancount = htons(1);
+		break;
+
+	default:
+		return (-1);
+	}
+	return (cp - buf);
+}
+
+/* Public. */
+
+/*%
+ *	Thinking in noninternationalized USASCII (per the DNS spec),
+ *	is this character visible and not a space when printed ?
+ *
+ * return:
+ *\li	boolean.
+ */
+static int
+printable(int ch) {
+	return (ch > 0x20 && ch < 0x7f);
+}
+
+static const char	digits[] = "0123456789";
+
+static int
+labellen(const u_char *lp)
+{
+	int bitlen;
+	u_char l = *lp;
+
+	if ((l & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
+		/* should be avoided by the caller */
+		return(-1);
+	}
+
+	if ((l & NS_CMPRSFLGS) == NS_TYPE_ELT) {
+		if (l == DNS_LABELTYPE_BITSTRING) {
+			if ((bitlen = *(lp + 1)) == 0)
+				bitlen = 256;
+			return((bitlen + 7 ) / 8 + 1);
+		}
+		return(-1);	/*%< unknwon ELT */
+	}
+	return(l);
+}
+
+static int
+decode_bitstring(const unsigned char **cpp, char *dn, const char *eom)
+{
+	const unsigned char *cp = *cpp;
+	char *beg = dn, tc;
+	int b, blen, plen, i;
+
+	if ((blen = (*cp & 0xff)) == 0)
+		blen = 256;
+	plen = (blen + 3) / 4;
+	plen += sizeof("\\[x/]") + (blen > 99 ? 3 : (blen > 9) ? 2 : 1);
+	if (dn + plen >= eom)
+		return(-1);
+
+	cp++;
+	i = SPRINTF((dn, "\\[x"));
+	if (i < 0)
+		return (-1);
+	dn += i;
+	for (b = blen; b > 7; b -= 8, cp++) {
+		i = SPRINTF((dn, "%02x", *cp & 0xff));
+		if (i < 0)
+			return (-1);
+		dn += i;
+	}
+	if (b > 4) {
+		tc = *cp++;
+		i = SPRINTF((dn, "%02x", tc & (0xff << (8 - b))));
+		if (i < 0)
+			return (-1);
+		dn += i;
+	} else if (b > 0) {
+		tc = *cp++;
+		i = SPRINTF((dn, "%1x",
+			       ((tc >> 4) & 0x0f) & (0x0f << (4 - b)))); 
+		if (i < 0)
+			return (-1);
+		dn += i;
+	}
+	i = SPRINTF((dn, "/%d]", blen));
+	if (i < 0)
+		return (-1);
+	dn += i;
+
+	*cpp = cp;
+	return(dn - beg);
+}
+
+/*%
+ *	Thinking in noninternationalized USASCII (per the DNS spec),
+ *	is this characted special ("in need of quoting") ?
+ *
+ * return:
+ *\li	boolean.
+ */
+static int
+special(int ch) {
+	switch (ch) {
+	case 0x22: /*%< '"' */
+	case 0x2E: /*%< '.' */
+	case 0x3B: /*%< ';' */
+	case 0x5C: /*%< '\\' */
+	case 0x28: /*%< '(' */
+	case 0x29: /*%< ')' */
+	/* Special modifiers in zone files. */
+	case 0x40: /*%< '@' */
+	case 0x24: /*%< '$' */
+		return (1);
+	default:
+		return (0);
+	}
+}
+
+/*%
+ *	Convert an encoded domain name to printable ascii as per RFC1035.
+
+ * return:
+ *\li	Number of bytes written to buffer, or -1 (with errno set)
+ *
+ * notes:
+ *\li	The root is returned as "."
+ *\li	All other domains are returned in non absolute form
+ */
+int
+ink_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz)
 {
-  register HEADER *hp;
-  register u_char *cp;
-  register int n;
-  u_char *dnptrs[20], **dpp, **lastdnptr;
-
-  if ((p_res.options & RES_INIT) == 0 && res_init() == -1) {
-    h_errno = NETDB_INTERNAL;
-    return (-1);
-  }
-#ifdef DEBUG
-  if (p_res.options & RES_DEBUG)
-    printf(";; res_mkquery(%d, %s, %d, %d)\n", op, dname, res_class, type);
-#endif
-  /*
-   * Initialize header fields.
-   */
-  if ((buf == NULL) || (buflen < HFIXEDSZ))
-    return (-1);
-  bzero((char *) buf, HFIXEDSZ);
-  hp = (HEADER *) buf;
-  hp->id = htons(++p_res.id);
-  hp->opcode = op;
-  hp->rd = (p_res.options & RES_RECURSE) != 0;
-  hp->rcode = NOERROR;
-  cp = buf + HFIXEDSZ;
-  buflen -= HFIXEDSZ;
-  dpp = dnptrs;
-  *dpp++ = buf;
-  *dpp++ = NULL;
-  lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-  /*
-   * perform opcode specific processing
-   */
-  switch (op) {
-  case QUERY:
-  /*FALLTHROUGH*/ case NS_NOTIFY_OP:
-    if ((buflen -= QFIXEDSZ) < 0)
-      return (-1);
-    if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
-      return (-1);
-    cp += n;
-    buflen -= n;
-    __putshort(type, cp);
-    cp += INT16SZ;
-    __putshort(res_class, cp);
-    cp += INT16SZ;
-    hp->qdcount = htons(1);
-    if (op == QUERY || data == NULL)
-      break;
-    /*
-     * Make an additional record for completion domain.
-     */
-    buflen -= RRFIXEDSZ;
-    n = dn_comp((char *) data, cp, buflen, dnptrs, lastdnptr);
-    if (n < 0)
-      return (-1);
-    cp += n;
-    buflen -= n;
-    __putshort(T_NULL, cp);
-    cp += INT16SZ;
-    __putshort(res_class, cp);
-    cp += INT16SZ;
-    __putlong(0, cp);
-    cp += INT32SZ;
-    __putshort(0, cp);
-    cp += INT16SZ;
-    hp->arcount = htons(1);
-    break;
-
-  case IQUERY:
-    /*
-     * Initialize answer section
-     */
-    if (buflen < 1 + RRFIXEDSZ + datalen)
-      return (-1);
-    *cp++ = '\0';               /* no domain name */
-    __putshort(type, cp);
-    cp += INT16SZ;
-    __putshort(res_class, cp);
-    cp += INT16SZ;
-    __putlong(0, cp);
-    cp += INT32SZ;
-    __putshort(datalen, cp);
-    cp += INT16SZ;
-    if (datalen) {
-      bcopy((const char *) data, (char *) cp, datalen);
-      cp += datalen;
-    }
-    hp->ancount = htons(1);
-    break;
-
-  default:
-    return (-1);
-  }
-  return (cp - buf);
+	const u_char *cp;
+	char *dn, *eom;
+	u_char c;
+	u_int n;
+	int l;
+
+	cp = src;
+	dn = dst;
+	eom = dst + dstsiz;
+
+	while ((n = *cp++) != 0) {
+		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
+			/* Some kind of compression pointer. */
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		if (dn != dst) {
+			if (dn >= eom) {
+				errno = EMSGSIZE;
+				return (-1);
+			}
+			*dn++ = '.';
+		}
+		if ((l = labellen(cp - 1)) < 0) {
+			errno = EMSGSIZE; /*%< XXX */
+			return(-1);
+		}
+		if (dn + l >= eom) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		if ((n & NS_CMPRSFLGS) == NS_TYPE_ELT) {
+			int m;
+
+			if (n != DNS_LABELTYPE_BITSTRING) {
+				/* XXX: labellen should reject this case */
+				errno = EINVAL;
+				return(-1);
+			}
+			if ((m = decode_bitstring(&cp, dn, eom)) < 0)
+			{
+				errno = EMSGSIZE;
+				return(-1);
+			}
+			dn += m; 
+			continue;
+		}
+		for ((void)NULL; l > 0; l--) {
+			c = *cp++;
+			if (special(c)) {
+				if (dn + 1 >= eom) {
+					errno = EMSGSIZE;
+					return (-1);
+				}
+				*dn++ = '\\';
+				*dn++ = (char)c;
+			} else if (!printable(c)) {
+				if (dn + 3 >= eom) {
+					errno = EMSGSIZE;
+					return (-1);
+				}
+				*dn++ = '\\';
+				*dn++ = digits[c / 100];
+				*dn++ = digits[(c % 100) / 10];
+				*dn++ = digits[c % 10];
+			} else {
+				if (dn >= eom) {
+					errno = EMSGSIZE;
+					return (-1);
+				}
+				*dn++ = (char)c;
+			}
+		}
+	}
+	if (dn == dst) {
+		if (dn >= eom) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		*dn++ = '.';
+	}
+	if (dn >= eom) {
+		errno = EMSGSIZE;
+		return (-1);
+	}
+	*dn++ = '\0';
+	return (dn - dst);
 }
 
+/*%
+ *	Convert an encoded domain name to printable ascii as per RFC1035.
+
+ * return:
+ *\li	Number of bytes written to buffer, or -1 (with errno set)
+ *
+ * notes:
+ *\li	The root is returned as "."
+ *\li	All other domains are returned in non absolute form
+ */
 int
-ink_res_mkquery_rr(struct __res_state_rr &p_res,        /* user defined res struct */
-                   int op,      /* opcode of query */
-                   const char *dname,   /* domain name */
-                   int res_class, int type,     /* class and type of query */
-                   const u_char * data, /* resource record data */
-                   int datalen, /* length of data */
-                   const u_char * newrr_in,     /* new rr for modify or append */
-                   u_char * buf,        /* buffer to put query */
-                   int buflen   /* size of buffer */
-  )
+ns_name_ntop(const u_char *src, char *dst, size_t dstsiz)
 {
-  register HEADER *hp;
-  register u_char *cp;
-  register int n;
-  u_char *dnptrs[20], **dpp, **lastdnptr;
-
-  if ((p_res.options & RES_INIT) == 0 && res_init() == -1) {
-    h_errno = NETDB_INTERNAL;
-    return (-1);
-  }
-#ifdef DEBUG
-  if (p_res.options & RES_DEBUG)
-    printf(";; res_mkquery(%d, %s, %d, %d)\n", op, dname, res_class, type);
-#endif
-  /*
-   * Initialize header fields.
-   */
-  if ((buf == NULL) || (buflen < HFIXEDSZ))
-    return (-1);
-  bzero((char *) buf, HFIXEDSZ);
-  hp = (HEADER *) buf;
-  hp->id = htons(++p_res.id);
-  hp->opcode = op;
-  hp->rd = (p_res.options & RES_RECURSE) != 0;
-  hp->rcode = NOERROR;
-  cp = buf + HFIXEDSZ;
-  buflen -= HFIXEDSZ;
-  dpp = dnptrs;
-  *dpp++ = buf;
-  *dpp++ = NULL;
-  lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-  /*
-   * perform opcode specific processing
-   */
-  switch (op) {
-  case QUERY:
-  /*FALLTHROUGH*/ case NS_NOTIFY_OP:
-    if ((buflen -= QFIXEDSZ) < 0)
-      return (-1);
-    if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
-      return (-1);
-    cp += n;
-    buflen -= n;
-    __putshort(type, cp);
-    cp += INT16SZ;
-    __putshort(res_class, cp);
-    cp += INT16SZ;
-    hp->qdcount = htons(1);
-    if (op == QUERY || data == NULL)
-      break;
-    /*
-     * Make an additional record for completion domain.
-     */
-    buflen -= RRFIXEDSZ;
-    n = dn_comp((char *) data, cp, buflen, dnptrs, lastdnptr);
-    if (n < 0)
-      return (-1);
-    cp += n;
-    buflen -= n;
-    __putshort(T_NULL, cp);
-    cp += INT16SZ;
-    __putshort(res_class, cp);
-    cp += INT16SZ;
-    __putlong(0, cp);
-    cp += INT32SZ;
-    __putshort(0, cp);
-    cp += INT16SZ;
-    hp->arcount = htons(1);
-    break;
-
-  case IQUERY:
-    /*
-     * Initialize answer section
-     */
-    if (buflen < 1 + RRFIXEDSZ + datalen)
-      return (-1);
-    *cp++ = '\0';               /* no domain name */
-    __putshort(type, cp);
-    cp += INT16SZ;
-    __putshort(res_class, cp);
-    cp += INT16SZ;
-    __putlong(0, cp);
-    cp += INT32SZ;
-    __putshort(datalen, cp);
-    cp += INT16SZ;
-    if (datalen) {
-      bcopy((const char *) data, (char *) cp, datalen);
-      cp += datalen;
-    }
-    hp->ancount = htons(1);
-    break;
-
-  default:
-    return (-1);
-  }
-  return (cp - buf);
+	const u_char *cp;
+	char *dn, *eom;
+	u_char c;
+	u_int n;
+	int l;
+
+	cp = src;
+	dn = dst;
+	eom = dst + dstsiz;
+
+	while ((n = *cp++) != 0) {
+		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
+			/* Some kind of compression pointer. */
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		if (dn != dst) {
+			if (dn >= eom) {
+				errno = EMSGSIZE;
+				return (-1);
+			}
+			*dn++ = '.';
+		}
+		if ((l = labellen(cp - 1)) < 0) {
+			errno = EMSGSIZE; /*%< XXX */
+			return(-1);
+		}
+		if (dn + l >= eom) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		if ((n & NS_CMPRSFLGS) == NS_TYPE_ELT) {
+			int m;
+
+			if (n != DNS_LABELTYPE_BITSTRING) {
+				/* XXX: labellen should reject this case */
+				errno = EINVAL;
+				return(-1);
+			}
+			if ((m = decode_bitstring(&cp, dn, eom)) < 0)
+			{
+				errno = EMSGSIZE;
+				return(-1);
+			}
+			dn += m; 
+			continue;
+		}
+		for ((void)NULL; l > 0; l--) {
+			c = *cp++;
+			if (special(c)) {
+				if (dn + 1 >= eom) {
+					errno = EMSGSIZE;
+					return (-1);
+				}
+				*dn++ = '\\';
+				*dn++ = (char)c;
+			} else if (!printable(c)) {
+				if (dn + 3 >= eom) {
+					errno = EMSGSIZE;
+					return (-1);
+				}
+				*dn++ = '\\';
+				*dn++ = digits[c / 100];
+				*dn++ = digits[(c % 100) / 10];
+				*dn++ = digits[c % 10];
+			} else {
+				if (dn >= eom) {
+					errno = EMSGSIZE;
+					return (-1);
+				}
+				*dn++ = (char)c;
+			}
+		}
+	}
+	if (dn == dst) {
+		if (dn >= eom) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		*dn++ = '.';
+	}
+	if (dn >= eom) {
+		errno = EMSGSIZE;
+		return (-1);
+	}
+	*dn++ = '\0';
+	return (dn - dst);
 }

Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_resolver.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_resolver.h?rev=908143&r1=908142&r2=908143&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_resolver.h (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_resolver.h Tue Feb  9 18:19:44 2010
@@ -1,8 +1,57 @@
-/** @file
+/*
+ * Copyright (c) 1983, 1987, 1989
+ *    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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University 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 REGENTS 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.
+ */
+
+/*
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Portions 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.
+ */
 
-  A brief file description
+/*
+  Imported from Bind-9.5.2-P2
 
-  @section license License
+  Changes:
 
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -19,70 +68,151 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- */
-
-/*
- * ink_resolver.h --
- *
- *   structures required by resolver library etc.
- *
- * 
- *
- */
+*/
 
 #ifndef _ink_resolver_h_
 #define	_ink_resolver_h_
 
 #include "ink_platform.h"
+#include <resolv.h>
+#include <arpa/nameser.h>
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif                          /* __cplusplus */
-
+#define RES_USE_DNSSEC 0x00200000 
+#define RES_NOTLDQUERY  0x00100000      /*%< don't unqualified name as a tld */
+#define RES_USE_DNAME   0x10000000      /*%< use DNAME */
+#define RES_NO_NIBBLE2  0x80000000      /*%< disable alternate nibble lookup */
+#define NS_TYPE_ELT  0x40 /*%< EDNS0 extended label type */
+#define DNS_LABELTYPE_BITSTRING 0x41
 
 #define MAXNSRR 32
 
-  struct __res_state_rr
-  {
-    int retrans;                /* retransmition time interval */
-    int retry;                  /* number of times to retransmit */
-    u_long options;             /* option flags - see below. */
-    int nscount;                /* number of name servers */
-    struct sockaddr_in nsaddr_list[MAXNSRR];    /* address of name server */
-
-#define nsaddr  nsaddr_list[0]  /* for backward compatibility */
-
-    u_short id;                 /* current packet id */
-    char *dnsrch[MAXDNSRCH + 1];        /* components of domain to search */
-    char defdname[MAXDNAME];    /* default domain */
-    u_long pfcode;              /* RES_PRF_ flags - see below. */
-    unsigned ndots:4;           /* threshold for initial abs. query */
-    unsigned nsort:4;           /* number of elements in sort_list[] */
-    char unused[3];
-    struct
-    {
-      struct in_addr addr;
-      unsigned int mask;
-    } sort_list[MAXRESOLVSORT];
-    char pad[72];               /* On an i38this means 512b total. */
-  };
-
-  int ink_res_init(struct __res_state &p_res, unsigned long *pHostList,
-                   int *pPort = 0, char *pDefDomain = 0, char *pSearchList = 0);
-  int ink_res_init_rr(struct __res_state_rr &p_res, unsigned long *pHostList,
-                      int *pPort = 0, char *pDefDomain = 0, char *pSearchList = 0);
-  int ink_res_mkquery(struct __res_state &, int, const char *, int, int,
-                      const unsigned char *, int, const unsigned char *, unsigned char *, int);
-  int ink_res_mkquery_rr(struct __res_state_rr &, int, const char *, int, int,
-                         const unsigned char *, int, const unsigned char *, unsigned char *, int);
+#ifndef NS_GET16
+#define NS_GET16(s, cp) do { \
+        register const u_char *t_cp = (const u_char *)(cp); \
+        (s) = ((u_int16_t)t_cp[0] << 8) \
+            | ((u_int16_t)t_cp[1]) \
+            ; \
+        (cp) += NS_INT16SZ; \
+} while (0)
+#endif
+
+#ifndef NS_GET32
+#define NS_GET32(l, cp) do { \
+        register const u_char *t_cp = (const u_char *)(cp); \
+        (l) = ((u_int32_t)t_cp[0] << 24) \
+            | ((u_int32_t)t_cp[1] << 16) \
+            | ((u_int32_t)t_cp[2] << 8) \
+            | ((u_int32_t)t_cp[3]) \
+            ; \
+        (cp) += NS_INT32SZ; \
+} while (0)
+#endif
+
+#ifndef NS_PUT16
+#define NS_PUT16(s, cp) do { \
+        register u_int16_t t_s = (u_int16_t)(s); \
+        register u_char *t_cp = (u_char *)(cp); \
+        *t_cp++ = t_s >> 8; \
+        *t_cp   = t_s; \
+        (cp) += NS_INT16SZ; \
+} while (0)
+#endif
+
+#ifndef NS_PUT32
+#define NS_PUT32(l, cp) do { \
+        register u_int32_t t_l = (u_int32_t)(l); \
+        register u_char *t_cp = (u_char *)(cp); \
+        *t_cp++ = t_l >> 24; \
+        *t_cp++ = t_l >> 16; \
+        *t_cp++ = t_l >> 8; \
+        *t_cp   = t_l; \
+        (cp) += NS_INT32SZ; \
+} while (0)
+#endif
+
+struct __ink_res_state {
+  int     retrans;                /*%< retransmission time interval */
+  int     retry;                  /*%< number of times to retransmit */
+#ifdef sun
+  u_int   options;                /*%< option flags - see below. */
+#else
+  u_long  options;                /*%< option flags - see below. */
+#endif
+  int     nscount;                /*%< number of name servers */
+  struct sockaddr_in
+  nsaddr_list[MAXNSRR];     /*%< address of name server */
+#define nsaddr  nsaddr_list[0]          /*%< for backward compatibility */
+  u_short id;                     /*%< current message id */
+  char    *dnsrch[MAXDNSRCH+1];   /*%< components of domain to search */
+  char    defdname[256];          /*%< default domain (deprecated) */
+#ifdef sun
+  u_int   pfcode;                 /*%< RES_PRF_ flags - see below. */
+#else
+  u_long  pfcode;                 /*%< RES_PRF_ flags - see below. */
+#endif
+  unsigned ndots:4;               /*%< threshold for initial abs. query */
+  unsigned nsort:4;               /*%< number of elements in sort_list[] */
+  char    unused[3];
+  struct {
+    struct in_addr  addr;
+    u_int32_t       mask;
+  } sort_list[MAXRESOLVSORT];
+  res_send_qhook qhook;           /*%< query hook */
+  res_send_rhook rhook;           /*%< response hook */
+  int     res_h_errno;            /*%< last one set for this context */
+  int     _vcsock;                /*%< PRIVATE: for res_send VC i/o */
+  u_int   _flags;                 /*%< PRIVATE: see below */
+  u_int   _pad;                   /*%< make _u 64 bit aligned */
+  union {
+    /* On an 32-bit arch this means 512b total. */
+    char    pad[72 - 4*sizeof (int) - 2*sizeof (void *)];
+    struct {
+      u_int16_t               nscount;
+      u_int16_t               nstimes[MAXNSRR]; /*%< ms. */
+      int                     nssocks[MAXNSRR];
+      struct __ink_res_state_ext *ext;    /*%< extention for IPv6 */
+    } _ext;
+  } _u;
+};
+typedef __ink_res_state *ink_res_state;
+
+union ink_res_sockaddr_union {
+        struct sockaddr_in      sin;
+#ifdef IN6ADDR_ANY_INIT
+        struct sockaddr_in6     sin6;
+#endif
+#ifdef ISC_ALIGN64
+        int64_t                 __align64;      /*%< 64bit alignment */
+#else
+        int32_t                 __align32;      /*%< 32bit alignment */
+#endif
+        char                    __space[128];   /*%< max size */
+};
+
+struct __ink_res_state_ext {
+        union ink_res_sockaddr_union nsaddrs[MAXNSRR];
+        struct sort_list {
+                int     af;
+                union {
+                        struct in_addr  ina;
+                        struct in6_addr in6a;
+                } addr, mask;
+        } sort_list[MAXRESOLVSORT];
+        char nsuffix[64];
+        char nsuffix2[64];
+};
+
+
+int ink_res_init(ink_res_state, unsigned long *pHostList,
+                 int *pPort = 0, char *pDefDomain = 0, char *pSearchList = 0);
+int ink_res_mkquery(ink_res_state, int, const char *, int, int,
+                    const unsigned char *, int, const unsigned char *, unsigned char *, int);
 
 #if (HOST_OS != linux)
-  int inet_aton(register const char *cp, struct in_addr *addr);
+int inet_aton(register const char *cp, struct in_addr *addr);
 #endif
 
-#ifdef __cplusplus
-}
-#endif                          /* __cplusplus */
+int ink_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz);
+
 
 #endif                          /* _ink_resolver_h_ */



Mime
View raw message