Libev/libc-ares migration: cleanup

[citadel.git] / citadel / event_client.h

diff --git a/citadel/event_client.h b/citadel/event_client.h
index 39a9c11bebc57294fce34681e22484c6755a25aa..cfb8d031beb42c1d36ac6759c75000ce9a84c6de 100644 (file)
--- a/citadel/event_client.h
+++ b/citadel/event_client.h
@@ -30,12 +30,15 @@ struct AsyncIO {
        struct addrinfo *curr_ai;
 
        /* connection related */
+       int IP6;
+       struct hostent *HEnt;
        int sock;
+       unsigned short dport;
        int active_event;
                eNextState NextState;
        ev_io recv_event, 
                send_event, 
-               conn_event;
+               dns_io_event;
        StrBuf *ErrMsg; /* if we fail to connect, or lookup, error goes here. */
 
        /* read/send related... */
@@ -48,8 +51,7 @@ struct AsyncIO {
                SendDone,     /* we may send more data */
                Terminate,    /* shutting down... */
                Timeout,      /* Timeout handler; may also be connection timeout */
-               ConnFail,     /* What to do when one connection failed? */
-               CustomDNS;    /* If the application wants to do custom dns functionality like cycle through different MX-Records */
+               ConnFail;     /* What to do when one connection failed? */
 
        IO_LineReaderCallback LineReader; /* if we have linereaders, maybe we want to read more lines before the real application logic is called? */
 
@@ -83,7 +85,6 @@ void InitEventIO(AsyncIO *IO,
                 IO_CallBack Terminate, 
                 IO_CallBack Timeout, 
                 IO_CallBack ConnFail, 
-                IO_CallBack CustomDNS,
                 IO_LineReaderCallback LineReader,
                 int ReadFirst);