Straightn http client generation

[citadel.git] / citadel / event_client.h

diff --git a/citadel/event_client.h b/citadel/event_client.h
index 0b71c743e02833f1ed4becc4812498ea88a8aed4..9c4fd2ba143806ce50bc529f6f94e8048e4d4c38 100644 (file)
--- a/citadel/event_client.h
+++ b/citadel/event_client.h
@@ -165,11 +165,10 @@ eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB);
 eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB);
 eNextState QueueCurlContext(AsyncIO *IO);
 
-eNextState InitEventIO(AsyncIO *IO, 
-                      void *pData, 
-                      double conn_timeout, 
-                      double first_rw_timeout,
-                      int ReadFirst);
+eNextState EvConnectSock(AsyncIO *IO, 
+                        double conn_timeout, 
+                        double first_rw_timeout,
+                        int ReadFirst);
 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);
@@ -194,12 +193,24 @@ void InitC_ares_dns(AsyncIO *IO);
                        syslog(LOG_ERR, "error setting option " #s " on curl handle: %s", curl_easy_strerror(sta)); \
        } } while (0)
 
-int evcurl_init(AsyncIO *IO,
-                void *CustomData,
-                const char* Desc,
-                IO_CallBack CallBack,
-                IO_CallBack Terminate, 
-               IO_CallBack ShutdownAbort);
+void InitIOStruct(AsyncIO *IO,
+                 void *Data,
+                 eNextState NextState,
+                 IO_LineReaderCallback LineReader,
+                 IO_CallBack DNS_Fail,
+                 IO_CallBack SendDone,
+                 IO_CallBack ReadDone,
+                 IO_CallBack Terminate,
+                 IO_CallBack ConnFail,
+                 IO_CallBack Timeout,
+                 IO_CallBack ShutdownAbort);
+
+int InitcURLIOStruct(AsyncIO *IO,
+                    void *Data,
+                    const char* Desc,
+                    IO_CallBack SendDone,
+                    IO_CallBack Terminate,
+                    IO_CallBack ShutdownAbort);
 
 eNextState ReAttachIO(AsyncIO *IO, 
                      void *pData,