ares.h: there is no ares_free_soa function

[platform/upstream/c-ares.git] / ares_getsock.c

diff --git a/ares_getsock.c b/ares_getsock.c
index 99419ae..07d2854 100644 (file)
--- a/ares_getsock.c
+++ b/ares_getsock.c
@@ -1,6 +1,5 @@
-/* $Id$ */
 
-/* Copyright (C) 2005 - 2007, Daniel Stenberg
+/* Copyright (C) 2005 - 2010, Daniel Stenberg
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose and without fee is hereby granted, provided
@@ -13,17 +12,13 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
+#include "ares_setup.h"
 
 #include "ares.h"
 #include "ares_private.h"
 
 int ares_getsock(ares_channel channel,
-                 int *s,
+                 ares_socket_t *socks,
                  int numsocks) /* size of the 'socks' array */
 {
   struct server_state *server;
@@ -32,18 +27,18 @@ int ares_getsock(ares_channel channel,
   int bitmap = 0;
   unsigned int setbits = 0xffffffff;
 
-  ares_socket_t *socks = (ares_socket_t *)s;
-
-  /* No queries, no file descriptors. */
-  if (ares__is_list_empty(&(channel->all_queries)))
-    return 0;
+  /* Are there any active queries? */
+  int active_queries = !ares__is_list_empty(&(channel->all_queries));
 
   for (i = 0;
        (i < channel->nservers) && (sockindex < ARES_GETSOCK_MAXNUM);
        i++)
     {
       server = &channel->servers[i];
-      if (server->udp_socket != ARES_SOCKET_BAD)
+      /* We only need to register interest in UDP sockets if we have
+       * outstanding queries.
+       */
+      if (active_queries && server->udp_socket != ARES_SOCKET_BAD)
         {
           if(sockindex >= numsocks)
             break;
@@ -51,6 +46,10 @@ int ares_getsock(ares_channel channel,
           bitmap |= ARES_GETSOCK_READABLE(setbits, sockindex);
           sockindex++;
         }
+      /* We always register for TCP events, because we want to know
+       * when the other side closes the connection, so we don't waste
+       * time trying to use a broken connection.
+       */
       if (server->tcp_socket != ARES_SOCKET_BAD)
        {
          if(sockindex >= numsocks)
@@ -58,7 +57,7 @@ int ares_getsock(ares_channel channel,
          socks[sockindex] = server->tcp_socket;
          bitmap |= ARES_GETSOCK_READABLE(setbits, sockindex);
 
-         if (server->qhead)
+         if (server->qhead && active_queries)
            /* then the tcp socket is also writable! */
            bitmap |= ARES_GETSOCK_WRITABLE(setbits, sockindex);