libev migration; relaying implementation

[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 9cd52b9afb9daa1ea468e7519990161b21ab12d0..5f8426f9894731910675c94ff78c99ce3ddd537c 100644 (file)
--- a/citadel/modules/c-ares-dns/serv_c-ares-dns.c
+++ b/citadel/modules/c-ares-dns/serv_c-ares-dns.c
@@ -223,19 +223,23 @@ void QueryCb(void *arg,
        IO->PostDNS(IO);
 }
 
-int QueueQuery(ns_type Type, char *name, AsyncIO *IO, IO_CallBack PostDNS)
+
+void InitC_ares_dns(AsyncIO *IO)
 {
-       int length, family;
-       char address_b[sizeof(struct in6_addr)];
        int optmask = 0;
-
        if (IO->DNSChannel == NULL) {
                optmask |= ARES_OPT_SOCK_STATE_CB;
                IO->DNSOptions.sock_state_cb = SockStateCb;
                IO->DNSOptions.sock_state_cb_data = IO;
                ares_init_options(&IO->DNSChannel, &IO->DNSOptions, optmask);
        }
+}
+int QueueQuery(ns_type Type, char *name, AsyncIO *IO, IO_CallBack PostDNS)
+{
+       int length, family;
+       char address_b[sizeof(struct in6_addr)];
 
+       InitC_ares_dns(IO);
        IO->PostDNS = PostDNS;
        switch(Type) {
        case ns_t_a:
@@ -315,21 +319,27 @@ void SockStateCb(void *data, int sock, int read, int write)
 
        if (read) {
                if ((IO->dns_recv_event.fd != sock) &&
-                   (IO->dns_recv_event.fd != 0)) {
+                   (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;
-
-       } else if (write) {
+               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->dns_send_event.fd != 0) && 
+                   ((IO->active_dns_event & EV_WRITE) != 0)) {
                        ev_io_stop(event_base, &IO->dns_send_event);
                }
                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;
        }
 /*
 
@@ -340,9 +350,14 @@ void SockStateCb(void *data, int sock, int read, int write)
                
                ret = ares_timeout(IO->DNSChannel, &maxtv, &tvbuf);
        }
-       if ((read == 0) && (write == 0)) {
-//             ev_io_stop(event_base, &IO->dns_io_event);
 */
+       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)