Libev Migration; fix aborting on connection establishing problems

[citadel.git] / citadel / event_client.h

diff --git a/citadel/event_client.h b/citadel/event_client.h
index f9cf037b5967fe907b08ef3449724a4d950dbe88..e6b41f3bd97401ccbc041b538874dd772ca082f6 100644 (file)
--- a/citadel/event_client.h
+++ b/citadel/event_client.h
@@ -34,12 +34,12 @@ struct AsyncIO {
        struct hostent *HEnt;
        int sock;
        unsigned short dport;
-       int active_event;
                eNextState NextState;
+
+       ev_timer conn_fail, 
+               conn_timeout;
        ev_io recv_event, 
-               send_event, 
-               dns_recv_event, 
-               dns_send_event;
+               send_event;
        StrBuf *ErrMsg; /* if we fail to connect, or lookup, error goes here. */
 
        /* read/send related... */
@@ -56,10 +56,16 @@ struct AsyncIO {
 
        IO_LineReaderCallback LineReader; /* if we have linereaders, maybe we want to read more lines before the real application logic is called? */
 
+
+       int active_dns_event;
+       ev_io dns_recv_event, 
+               dns_send_event;
        struct ares_options DNSOptions;
        ares_channel DNSChannel;
+
        ParseDNSAnswerCb DNS_CB;
        IO_CallBack PostDNS;
+
        int DNSStatus;
        void *VParsedDNSReply;
        FreeDNSReply DNSReplyFree;
@@ -87,6 +93,9 @@ void InitEventIO(AsyncIO *IO,
                 IO_CallBack Timeout, 
                 IO_CallBack ConnFail, 
                 IO_LineReaderCallback LineReader,
+                int conn_timeout, int first_rw_timeout,
                 int ReadFirst);
 
 int QueueQuery(ns_type Type, char *name, AsyncIO *IO, IO_CallBack PostDNS);
+
+void StopClient(AsyncIO *IO);