Libev / libc-ares Migration

[citadel.git] / citadel / modules / c-ares-dns / serv_c-ares-dns.c

diff --git a/citadel/modules/c-ares-dns/serv_c-ares-dns.c b/citadel/modules/c-ares-dns/serv_c-ares-dns.c
index ec55ed9e0c1cc4150e5a32fb138312534475547b..6c1be1f167a9ed3bb701a5c0b2fac9c98579352c 100644 (file)
--- a/citadel/modules/c-ares-dns/serv_c-ares-dns.c
+++ b/citadel/modules/c-ares-dns/serv_c-ares-dns.c
@@ -59,8 +59,6 @@
 
 
 extern struct ev_loop *event_base;
-struct ares_options options;
-ares_channel Channel;
 
 void SockStateCb(void *data, int sock, int read, int write);
 
@@ -292,30 +290,54 @@ int QueueQuery(ns_type Type, char *name, AsyncIO *IO, IO_CallBack PostDNS)
        return 1;
 }
 
-static void DNS_io_callback(struct ev_loop *loop, ev_io *watcher, int revents)
+static void DNS_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 {
        AsyncIO *IO = watcher->data;
        
-       ares_process_fd(IO->DNSChannel, IO->dns_io_event.fd, 0);
+       ares_process_fd(IO->DNSChannel, ARES_SOCKET_BAD, IO->dns_send_event.fd);
+}
+static void DNS_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
+{
+       AsyncIO *IO = watcher->data;
+       
+       ares_process_fd(IO->DNSChannel, IO->dns_recv_event.fd, ARES_SOCKET_BAD);
 }
 
 void SockStateCb(void *data, int sock, int read, int write) 
 {
+/*
        struct timeval tvbuf, maxtv, *ret;
        
        int64_t time = 10;
+*/
        AsyncIO *IO = data;
 /* already inside of the event queue. */       
 
-       if ((read == 0) && (write == 0)) {
-//             ev_io_stop(event_base, &IO->dns_io_event);
-       } else if (IO->dns_io_event.fd != sock) {
-               if (IO->dns_io_event.fd != 0) {
-                       ev_io_stop(event_base, &IO->dns_io_event);
+       if (read) {
+               if ((IO->dns_recv_event.fd != sock) &&
+                   (IO->dns_recv_event.fd != 0) && 
+                   ((IO->active_dns_event & EV_READ) != 0)) {
+                       ev_io_stop(event_base, &IO->dns_recv_event);
+               }
+               IO->dns_recv_event.fd = sock;
+               ev_io_init(&IO->dns_recv_event, DNS_recv_callback, IO->dns_recv_event.fd, EV_READ);
+               IO->dns_recv_event.data = IO;
+               ev_io_start(event_base, &IO->dns_recv_event);
+               IO->active_dns_event = IO->active_dns_event | EV_READ;
+       } 
+       if (write) {
+               if ((IO->dns_send_event.fd != sock) &&
+                   (IO->dns_send_event.fd != 0) && 
+                   ((IO->active_dns_event & EV_WRITE) != 0)) {
+                       ev_io_stop(event_base, &IO->dns_send_event);
                }
-               IO->dns_io_event.fd = sock;
-               ev_io_init(&IO->dns_io_event, DNS_io_callback, IO->dns_io_event.fd, EV_READ|EV_WRITE);
-               IO->dns_io_event.data = IO;
+               IO->dns_send_event.fd = sock;
+               ev_io_init(&IO->dns_send_event, DNS_send_callback, IO->dns_send_event.fd, EV_WRITE);
+               IO->dns_send_event.data = IO;
+               ev_io_start(event_base, &IO->dns_send_event);
+               IO->active_dns_event = IO->active_dns_event | EV_WRITE;
+       }
+/*
 
                ev_io_start(event_base, &IO->dns_io_event);
        
@@ -324,28 +346,26 @@ void SockStateCb(void *data, int sock, int read, int write)
                
                ret = ares_timeout(IO->DNSChannel, &maxtv, &tvbuf);
        }
+*/
+       if ((read == 0) && (write == 0)) {
+               if ((IO->active_dns_event & EV_READ) != 0)
+                       ev_io_stop(event_base, &IO->dns_recv_event);
+               if ((IO->active_dns_event & EV_WRITE) != 0)
+                       ev_io_stop(event_base, &IO->dns_send_event);
+               IO->active_dns_event = 0;
+       }
 }
 
 CTDL_MODULE_INIT(c_ares_client)
 {
        if (!threading)
        {
-               int optmask = 0;
-               
-
                int r = ares_library_init(ARES_LIB_INIT_ALL);
                if (0 != r) {
                        // TODO
                        // ThrowException(Exception::Error(String::New(ares_strerror(r))));
 ////                   assert(r == 0);
                }
-
-               optmask |= ARES_OPT_SOCK_STATE_CB;
-               memset(&options, 0, sizeof(struct ares_options));
-               options.sock_state_cb = SockStateCb;
-               
-               ares_init_options(&Channel, &options, optmask);
-
        }
        return "c-ares";
 }