From 5b56007828f20c763df3f36ceed809188880663e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Fri, 6 Jan 2017 22:58:18 +0100
Subject: Use udns instead of c-ares

fix #3226
---
 louloulibs/network/dns_socket_handler.cpp | 32 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

(limited to 'louloulibs/network/dns_socket_handler.cpp')

diff --git a/louloulibs/network/dns_socket_handler.cpp b/louloulibs/network/dns_socket_handler.cpp
index a69f59b..ad744a9 100644
--- a/louloulibs/network/dns_socket_handler.cpp
+++ b/louloulibs/network/dns_socket_handler.cpp
@@ -1,34 +1,27 @@
 #include <louloulibs.h>
-#ifdef CARES_FOUND
+#ifdef UDNS_FOUND
 
 #include <network/dns_socket_handler.hpp>
 #include <network/dns_handler.hpp>
 #include <network/poller.hpp>
 
-#include <ares.h>
+#include <udns.h>
 
 DNSSocketHandler::DNSSocketHandler(std::shared_ptr<Poller> poller,
-                                   DNSHandler& handler,
                                    const socket_t socket):
-  SocketHandler(poller, socket),
-  handler(handler)
+  SocketHandler(poller, socket)
 {
+  poller->add_socket_handler(this);
 }
 
-void DNSSocketHandler::on_recv()
+DNSSocketHandler::~DNSSocketHandler()
 {
-  // always stop watching send and read events. We will re-watch them if the
-  // next call to ares_fds tell us to
-  this->handler.remove_all_sockets_from_poller();
-  ::ares_process_fd(DNSHandler::instance.get_channel(), this->socket, ARES_SOCKET_BAD);
+  this->unwatch();
 }
 
-void DNSSocketHandler::on_send()
+void DNSSocketHandler::on_recv()
 {
-  // always stop watching send and read events. We will re-watch them if the
-  // next call to ares_fds tell us to
-  this->handler.remove_all_sockets_from_poller();
-  ::ares_process_fd(DNSHandler::instance.get_channel(), ARES_SOCKET_BAD, this->socket);
+  dns_ioevent(nullptr, 0);
 }
 
 bool DNSSocketHandler::is_connected() const
@@ -36,10 +29,15 @@ bool DNSSocketHandler::is_connected() const
   return true;
 }
 
-void DNSSocketHandler::remove_from_poller()
+void DNSSocketHandler::unwatch()
 {
   if (this->poller->is_managing_socket(this->socket))
     this->poller->remove_socket_handler(this->socket);
 }
 
-#endif /* CARES_FOUND */
+void DNSSocketHandler::watch()
+{
+  this->poller->add_socket_handler(this);
+}
+
+#endif /* UDNS_FOUND */
-- 
cgit v1.2.3