libc-ares migration

  - call the ares read/write handlers in our registered read/write callbacks
  - set context appropriate.

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 2de80574df85bd3d6693459e10ad3cf1548278cf..07e44a11351a4e789a5bf16fe33261d41b45a44e 100644 (file)
--- a/citadel/modules/c-ares-dns/serv_c-ares-dns.c
+++ b/citadel/modules/c-ares-dns/serv_c-ares-dns.c
@@ -529,10 +529,16 @@ int QueueQuery(ns_type Type, char *name, AsyncIO *IO, IO_CallBack PostDNS)
 
 static void DNS_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 {
+       AsyncIO *IO = watcher->data;
+       
+       ares_process_fd(IO->DNSChannel, IO->sock, 0);
 }
 
 static void DNS_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 {
+       AsyncIO *IO = watcher->data;
+       
+       ares_process_fd(IO->DNSChannel, 0, IO->sock);
 }
 
 void SockStateCb(void *data, int sock, int read, int write) 

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index ffc18bc87c6d0a350f5b51de76ab7833559c7dbd..6c04fa5f2163c81389c7fdfa9f0c8c13eacce7d2 100644 (file)
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -936,7 +936,7 @@ eNextState smtp_resolve_one_smtpsrv_start(void *data)
 
 int resolve_mx_records(void *Ctx)
 {
-       SmtpOutMsg * SendMsg;
+       SmtpOutMsg * SendMsg = Ctx;
        if (!QueueQuery(ns_t_mx, 
                        SendMsg->node, 
                        &SendMsg->IO,