1 files changed, 49 insertions, 50 deletions

diff --git a/linden/indra/llcommon/llares.cpp b/linden/indra/llmessage/llares.cpp
index 4d054e4..5a310b3 100644
--- a/linden/indra/llcommon/llares.cpp
+++ b/linden/indra/llmessage/llares.cpp
@@ -31,17 +31,15 @@
  * $/LicenseInfo$
  */
 
-#ifdef LL_STANDALONE
-# include <ares_dns.h>
-#else
-# include <ares/ares_dns.h>
-#endif
+#include "linden_common.h"
 
-#include "apr-1/apr_portable.h"
-#include "apr-1/apr_network_io.h"
-#include "apr-1/apr_poll.h"
+#include <ares_dns.h>
+#include <ares_version.h>
+
+#include "apr_portable.h"
+#include "apr_network_io.h"
+#include "apr_poll.h"
 
-#include "linden_common.h"
 #include "llapr.h"
 #include "llares.h"
 
@@ -103,24 +101,22 @@ void LLAres::QueryResponder::queryError(int code)
 }
 
 LLAres::LLAres()
-        : chan_(NULL)
 {
         ares_init(&chan_);
 }
 
 LLAres::~LLAres()
 {
-        if (chan_)
-                ares_destroy(chan_);
+        ares_destroy(chan_);
 }
 
 void LLAres::cancel()
 {
-        if (chan_)
-                ares_cancel(chan_);
+        ares_cancel(chan_);
 }
 
-static void host_callback(void *arg, int status, struct hostent *ent)
+static void host_callback_1_5(void *arg, int status, int timeouts,
+                                                          struct hostent *ent)
 {
         LLPointer<LLAres::HostResponder> *resp =
                 (LLPointer<LLAres::HostResponder> *) arg;
@@ -135,14 +131,18 @@ static void host_callback(void *arg, int status, struct hostent *ent)
         delete resp;
 }
 
+#if ARES_VERSION_MAJOR == 1 && ARES_VERSION_MINOR == 4
+static void host_callback(void *arg, int status, struct hostent *ent)
+{
+        host_callback_1_5(arg, status, 0, ent);
+}
+#else
+# define host_callback host_callback_1_5
+#endif
+
 void LLAres::getHostByName(const char *name, HostResponder *resp,
                                                    int family)
 {
-        if (!chan_)
-        {
-                resp->hostError(ARES_EBADRESP);
-                return;
-        }
         ares_gethostbyname(chan_, name, family, host_callback,
                                            new LLPointer<LLAres::HostResponder>(resp));
 }
@@ -154,7 +154,7 @@ void LLAres::getSrvRecords(const std::string &name, SrvResponder *resp)
         
 void LLAres::rewriteURI(const std::string &uri, UriRewriteResponder *resp)
 {
-        LL_DEBUGS2("AppInit","Rewrite") << "Rewriting " << uri << LL_ENDL;
+        llinfos << "Rewriting " << uri << llendl;
 
         resp->mUri = LLURI(uri);
         search("_" + resp->mUri.scheme() + "._tcp." + resp->mUri.hostName(),
@@ -163,8 +163,7 @@ void LLAres::rewriteURI(const std::string &uri, UriRewriteResponder *resp)
 
 LLQueryResponder::LLQueryResponder()
         : LLAres::QueryResponder(),
-          mResult(ARES_ENODATA),
-          mType(RES_INVALID)
+          mResult(ARES_ENODATA)
 {
 }
 
@@ -342,18 +341,18 @@ bail:
         mResult = ret;
         if (mResult == ARES_SUCCESS)
         {
-                queryResult();
+                querySuccess();
         } else {
                 queryError(mResult);
         }
 }
 
-void LLQueryResponder::queryResult()
+void LLQueryResponder::querySuccess()
 {
         llinfos << "LLQueryResponder::queryResult not implemented" << llendl;
 }
 
-void LLAres::SrvResponder::queryResult()
+void LLAres::SrvResponder::querySuccess()
 {
         if (mType == RES_SRV)
         {
@@ -389,7 +388,8 @@ void LLAres::SrvResponder::srvError(int code)
                         << LLAres::strerror(code) << llendl;
 }
 
-static void nameinfo_callback(void *arg, int status, char *node, char *service)
+static void nameinfo_callback_1_5(void *arg, int status, int timeouts,
+                                                                  char *node, char *service)
 {
         LLPointer<LLAres::NameInfoResponder> *resp =
                 (LLPointer<LLAres::NameInfoResponder> *) arg;
@@ -404,20 +404,24 @@ static void nameinfo_callback(void *arg, int status, char *node, char *service)
         delete resp;
 }
 
+#if ARES_VERSION_MAJOR == 1 && ARES_VERSION_MINOR == 4
+static void nameinfo_callback(void *arg, int status, char *node, char *service)
+{
+        nameinfo_callback_1_5(arg, status, 0, node, service);
+}
+#else
+# define nameinfo_callback nameinfo_callback_1_5
+#endif
+
 void LLAres::getNameInfo(const struct sockaddr &sa, socklen_t salen, int flags,
                                                  NameInfoResponder *resp)
 {
-        if (!chan_)
-        {
-                resp->nameInfoError(ARES_EBADRESP);
-                return;
-        }
         ares_getnameinfo(chan_, &sa, salen, flags, nameinfo_callback,
                                          new LLPointer<NameInfoResponder>(resp));
 }
 
-static void search_callback(void *arg, int status, unsigned char *abuf,
-                                                        int alen)
+static void search_callback_1_5(void *arg, int status, int timeouts,
+                                                                unsigned char *abuf, int alen)
 {
         LLPointer<LLAres::QueryResponder> *resp =
                 (LLPointer<LLAres::QueryResponder> *) arg;
@@ -432,14 +436,19 @@ static void search_callback(void *arg, int status, unsigned char *abuf,
         delete resp;
 }
 
+#if ARES_VERSION_MAJOR == 1 && ARES_VERSION_MINOR == 4
+static void search_callback(void *arg, int status, unsigned char *abuf,
+                                                        int alen)
+{
+        search_callback_1_5(arg, status, 0, abuf, alen);
+}
+#else
+# define search_callback search_callback_1_5
+#endif
+
 void LLAres::search(const std::string &query, LLResType type,
                                         QueryResponder *resp)
 {
-        if (!chan_)
-        {
-                resp->queryError(ARES_EBADRESP);
-                return;
-        }
         ares_search(chan_, query.c_str(), ns_c_in, type, search_callback,
                                 new LLPointer<QueryResponder>(resp));
 }
@@ -459,11 +468,6 @@ bool LLAres::process(U64 timeout)
         int nactive = 0;
         int bitmask;
 
-        if (!chan_)
-        {
-                goto bail;
-        }
-
         bitmask = ares_getsock(chan_, socks, ARES_GETSOCK_MAXNUM);
 
         if (bitmask == 0)
@@ -535,11 +539,6 @@ bail:
 
 bool LLAres::processAll()
 {
-        if (!chan_)
-        {
-                return false;
-        }
-        
         bool anyProcessed = false, ret;
 
         do {
@@ -735,7 +734,7 @@ void LLAres::UriRewriteResponder::queryError(int code)
         rewriteResult(uris);
 }
 
-void LLAres::UriRewriteResponder::queryResult()
+void LLAres::UriRewriteResponder::querySuccess()
 {
         std::vector<std::string> uris;