[ViewVC] Diff of: svn/ircd-hybrid/branches/8.2.x/src/res.c

Comparing:
ircd-hybrid/trunk/src/irc_res.c (file contents), Revision 3268 by michael, Sat Apr 5 19:21:55 2014 UTC vs.
ircd-hybrid/branches/8.2.x/src/res.c (file contents), Revision 4235 by michael, Tue Jul 15 17:32:14 2014 UTC

+ *  USA
+ */
-<
+/*! \file irc_res.c
->
+/*! \file res.c
+ * \brief ircd resolver functions
+ * \version $Id$
+ */
+#include "fdlist.h"
+#include "s_bsd.h"
+#include "log.h"
-<
+#include "s_misc.h"
->
+#include "misc.h"
+#include "send.h"
+#include "memory.h"
+#include "mempool.h"
-<
+#include "irc_res.h"
-<
+#include "irc_reslib.h"
->
+#include "res.h"
->
+#include "reslib.h"
+#if (CHAR_BIT != 8)
+#error this code needs to be able to address individual octets
+static PF res_readreply;
+#define MAXPACKET      1024  /* rfc sez 512 but we expand names so ... */
-–
+#define RES_MAXALIASES 35    /* maximum aliases allowed */
-–
+#define RES_MAXADDRS   35    /* maximum addresses allowed */
+#define AR_TTL         600   /* TTL in seconds for dns cache entries */
+/* RFC 1104/1105 wasn't very helpful about what these fields
+  time_t ttl;
+  char type;
+  char retries;            /* retry counter */
-<
+  char sends;              /* number of sends (>1 means resent) */
->
+  unsigned int sends;      /* number of sends (>1 means resent) */
+  char resend;             /* send flag. 0 == dont resend */
+  time_t sentat;
+  time_t timeout;
+                            const struct irc_ssaddr *,
+                            struct reslist *);
+static void query_name(const char *, int, int, struct reslist *);
-<
+static int send_res_msg(const char *, int, int);
->
+static int send_res_msg(const char *, int, unsigned int);
+static void resend_query(struct reslist *);
+static int proc_answer(struct reslist *, HEADER *, char *, char *);
+static struct reslist *find_id(int);
+  const struct sockaddr_in *v4;
+  const struct sockaddr_in *v4in = (const struct sockaddr_in *)inp;
-<
+  for (int i = 0; i < irc_nscount; ++i)
->
+  for (unsigned int i = 0; i < irc_nscount; ++i)
+    const struct irc_ssaddr *srv = &irc_nsaddr_list[i];
+#ifdef IPV6
+ * there too long without being resolved.
+ */
+static time_t
-<
+timeout_query_list(time_t now)
->
+timeout_query_list(void)
+  dlink_node *ptr = NULL, *ptr_next = NULL;
-<
+  struct reslist *request;
->
+  struct reslist *request = NULL;
+  time_t next_time = 0;
+  time_t timeout   = 0;
+    request = ptr->data;
+    timeout = request->sentat + request->timeout;
-<
+    if (now >= timeout)
->
+    if (CurrentTime >= timeout)
+      if (--request->retries <= 0)
+      else
-<
+        request->sentat = now;
->
+        request->sentat = CurrentTime;
+        request->timeout += request->timeout;
+        resend_query(request);
+      next_time = timeout;
-<
+  return (next_time > now) ? next_time : (now + AR_TTL);
->
+  return (next_time > CurrentTime) ? next_time : (CurrentTime + AR_TTL);
+/*
+static void
+timeout_resolver(void *notused)
-<
+  timeout_query_list(CurrentTime);
->
+  timeout_query_list();
+/*
+      return;
+    /* At the moment, the resolver FD data is global .. */
-<
+    comm_setselect(&ResolverFileDescriptor, COMM_SELECT_READ,
-<
+        res_readreply, NULL, 0);
-<
+    eventAdd("timeout_resolver", timeout_resolver, NULL, 1);
->
+    comm_setselect(&ResolverFileDescriptor, COMM_SELECT_READ, res_readreply, NULL, 0);
+void
+init_resolver(void)
-+
+  static struct event event_timeout_resolver =
-+
+  {
-+
+    .name = "timeout_resolver",
-+
+    .handler = timeout_resolver,
-+
+    .when = 1
-+
+  };
-+
+  dns_pool = mp_pool_new(sizeof(struct reslist), MP_CHUNK_SIZE_DNS);
+  memset(&ResolverFileDescriptor, 0, sizeof(fde_t));
+  start_resolver();
-+
-+
+  event_add(&event_timeout_resolver, NULL);
+/*
+restart_resolver(void)
+  fd_close(&ResolverFileDescriptor);
-–
+  eventDelete(timeout_resolver, NULL); /* -ddosen */
+  start_resolver();
+  struct reslist *request = mp_pool_get(dns_pool);
-–
+  memset(request, 0, sizeof(*request));
+  request->sentat       = CurrentTime;
+  request->retries      = 2;
+  request->resend       = 1;
-<
+  request->timeout      = 4;    /* start at 4 and exponential inc. */
->
+  request->timeout      = 4;  /* Start at 4 and exponential inc. */
+  request->state        = REQ_IDLE;
+  request->callback     = callback;
+  request->callback_ctx = ctx;
+ * nameservers or -1 if no successful sends.
+ */
+static int
-<
+send_res_msg(const char *msg, int len, int rcount)
->
+send_res_msg(const char *msg, int len, unsigned int rcount)
+  int sent = 0;
-<
+  int max_queries = IRCD_MIN(irc_nscount, rcount);
->
+  unsigned int max_queries = IRCD_MIN(irc_nscount, rcount);
+  /* RES_PRIMARY option is not implemented
+   * if (res.options & RES_PRIMARY || 0 == max_queries)
+  if (max_queries == 0)
+    max_queries = 1;
-<
+  for (int i = 0; i < max_queries; ++i)
->
+  for (unsigned int i = 0; i < max_queries; ++i)
+    if (sendto(ResolverFileDescriptor.fd, msg, len, 0,
+        (struct sockaddr*)&(irc_nsaddr_list[i]),
+  if (request == NULL)
+    request       = make_request(callback, ctx);
-<
+    request->name = MyMalloc(strlen(host_name) + 1);
->
+    request->name = MyCalloc(strlen(host_name) + 1);
+    request->type = type;
+    strcpy(request->name, host_name);
+#ifdef IPV6
+                const struct irc_ssaddr *addr,
+                struct reslist *request)
-<
+  char ipbuf[128];
-<
+  const unsigned char *cp;
->
+  char ipbuf[128] = "";
+  if (addr->ss.ss_family == AF_INET)
+    const struct sockaddr_in *v4 = (const struct sockaddr_in *)addr;
-<
+    cp = (const unsigned char *)&v4->sin_addr.s_addr;
->
+    const unsigned char *cp = (const unsigned char *)&v4->sin_addr.s_addr;
+    snprintf(ipbuf, sizeof(ipbuf), "%u.%u.%u.%u.in-addr.arpa.",
+             (unsigned int)(cp[3]), (unsigned int)(cp[2]),
+  else if (addr->ss.ss_family == AF_INET6)
+    const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)addr;
-<
+    cp = (const unsigned char *)&v6->sin6_addr.s6_addr;
->
+    const unsigned char *cp = (const unsigned char *)&v6->sin6_addr.s6_addr;
+    snprintf(ipbuf, sizeof(ipbuf),
+             "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
+    request       = make_request(callback, ctx);
+    request->type = T_PTR;
+    memcpy(&request->addr, addr, sizeof(struct irc_ssaddr));
-<
+    request->name = MyMalloc(HOSTLEN + 1);
->
+    request->name = MyCalloc(HOSTLEN + 1);
+  query_name(ipbuf, C_IN, T_PTR, request);
+    n = irc_dn_expand((unsigned char *)buf, (unsigned char *)eob, current,
+        hostbuf, sizeof(hostbuf));
-<
+    if (n < 0 /* broken message */ || n == 0 /* no more answers left */)
->
+    if (n < 0 /* Broken message */ || n == 0 /* No more answers left */)
+      return 0;
+    hostbuf[HOSTLEN] = '\0';
+     * this code was not working on alpha due to that
+     * (spotted by rodder/jailbird/dianora)
+     */
-<
+    current += (size_t) n;
->
+    current += (size_t)n;
+    if (!(((char *)current + ANSWER_FIXED_SIZE) < eob))
+      break;
+          return 0;
+        /*
-<
+         * check for invalid rd_length or too many addresses
->
+         * Check for invalid rd_length or too many addresses
+         */
+        if (rd_length != sizeof(struct in_addr))
+          return 0;
+          return 0;
+        n = irc_dn_expand((unsigned char *)buf, (unsigned char *)eob,
-<
+            current, hostbuf, sizeof(hostbuf));
-<
+        if (n < 0 /* broken message */ || n == 0 /* no more answers left */)
->
+                          current, hostbuf, sizeof(hostbuf));
->
+        if (n < 0 /* Broken message */ || n == 0 /* No more answers left */)
+          return 0;
+        strlcpy(request->name, hostbuf, HOSTLEN + 1);
+    return;
+  /*
-<
+   * convert DNS reply reader from Network byte order to CPU byte order.
->
+   * Convert DNS reply reader from Network byte order to CPU byte order.
+   */
+  header = (HEADER *)buf;
+  header->ancount = ntohs(header->ancount);
+  header->arcount = ntohs(header->arcount);
+  /*
-<
+   * check against possibly fake replies
->
+   * Check against possibly fake replies
+   */
+  if (!res_ourserver(&lsin))
+    return;
+  /*
-<
+   * response for an id which we have already received an answer for
->
+   * Response for an id which we have already received an answer for
+   * just ignore this response.
+   */
+  if (!(request = find_id(header->id)))
+      if (request->name == NULL)
+        /*
-<
+         * got a PTR response with no name, something bogus is happening
->
+         * Got a PTR response with no name, something bogus is happening
+         * don't bother trying again, the client address doesn't resolve
+         */
+        (*request->callback)(request->callback_ctx, NULL, NULL);
+      /*
-<
+       * Lookup the 'authoritative' name that we were given for the
-<
+       * ip#.
-<
+       *
->
+       * Lookup the 'authoritative' name that we were given for the ip#.
+       */
+#ifdef IPV6
+      if (request->addr.ss.ss_family == AF_INET6)
+    else
+      /*
-<
+       * got a name and address response, client resolved
->
+       * Got a name and address response, client resolved
+       */
+      (*request->callback)(request->callback_ctx, &request->addr, request->name);
+      rem_request(request);
+     */
+    assert(0);
-+
+    (*request->callback)(request->callback_ctx, NULL, NULL);
+    /* XXX don't leak it */
+    rem_request(request);
+  char ipaddr[HOSTIPLEN + 1] = "";
-<
+  for (int i = 0; i < irc_nscount; ++i)
->
+  for (unsigned int i = 0; i < irc_nscount; ++i)
+    getnameinfo((struct sockaddr *)&(irc_nsaddr_list[i]),
+                irc_nsaddr_list[i].ss_len, ipaddr,

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)

Comparing: ircd-hybrid/trunk/src/irc_res.c (file contents), Revision 3268 by michael, Sat Apr 5 19:21:55 2014 UTC vs. ircd-hybrid/branches/8.2.x/src/res.c (file contents), Revision 4235 by michael, Tue Jul 15 17:32:14 2014 UTC

Diff Legend

Comparing:
ircd-hybrid/trunk/src/irc_res.c (file contents), Revision 3268 by michael, Sat Apr 5 19:21:55 2014 UTC vs.
ircd-hybrid/branches/8.2.x/src/res.c (file contents), Revision 4235 by michael, Tue Jul 15 17:32:14 2014 UTC