move URL parsing / struct over into libcitadel

[citadel.git] / citadel / event_client.h

diff --git a/citadel/event_client.h b/citadel/event_client.h
index 79eda639b7726060b997d3ec43eaf23c661711c8..e98a13a8d574a1acddbc248a64633f8fdca83d45 100644 (file)
--- a/citadel/event_client.h
+++ b/citadel/event_client.h
@@ -20,26 +20,39 @@ typedef eReadState (*IO_LineReaderCallback)(AsyncIO *IO);
 typedef void (*ParseDNSAnswerCb)(AsyncIO*, unsigned char*, int);
 typedef void (*FreeDNSReply)(void *DNSData);
 
+typedef struct _DNSQueryParts {
+       ParseDNSAnswerCb DNS_CB;
+       IO_CallBack PostDNS;
+
+       int DNSStatus;
+       void *VParsedDNSReply;
+       FreeDNSReply DNSReplyFree;
+       void *Data;
+} DNSQueryParts;
+
+
 struct AsyncIO {
        StrBuf *Host;
        char service[32];
 
-       /* To cycle through several possible services... */
+       /* To cycle through several possible services... * /
        struct addrinfo *res;
        struct addrinfo *curr_ai;
+       */
 
        /* connection related */
        int IP6;
-       struct hostent *HEnt;
        struct sockaddr_in6 Addr;
 
        int sock;
        unsigned short dport;
                eNextState NextState;
+       
+       ev_cleanup abort_by_shutdown;
 
        ev_timer conn_fail, 
-               rw_timeout,
-               unwind_stack_timeout;
+               rw_timeout;
+       ev_idle unwind_stack;
        ev_io recv_event, 
                send_event, 
                conn_event;
@@ -55,23 +68,16 @@ 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? */
+               ConnFail,     /* What to do when one connection failed? */
+               ShutdownAbort;/* we're going down. make your piece. */ 
 
        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;
+       DNSQueryParts *DNSQuery;
 
        /* Custom data; its expected to contain  AsyncIO so we can save malloc()s... */
        DeleteHashDataFunc DeleteData; /* so if we have to destroy you, what to do... */
@@ -93,9 +99,11 @@ eNextState InitEventIO(AsyncIO *IO,
                       double conn_timeout, 
                       double first_rw_timeout,
                       int ReadFirst);
-void IO_postdns_callback(struct ev_loop *loop, ev_timer *watcher, int revents);
+void IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents);
+
+int QueueQuery(ns_type Type, const char *name, AsyncIO *IO, DNSQueryParts *QueryParts, IO_CallBack PostDNS);
+void QueueGetHostByName(AsyncIO *IO, const char *Hostname, DNSQueryParts *QueryParts, IO_CallBack PostDNS);
 
-int QueueQuery(ns_type Type, char *name, AsyncIO *IO, IO_CallBack PostDNS);
 void QueryCbDone(AsyncIO *IO);
 
 void StopClient(AsyncIO *IO);