evcurl_global_data global;
static void
-gotstatus(evcurl_global_data *global, int nnrun)
+gotstatus(int nnrun)
{
CURLM *mhnd;
CURLMsg *msg;
int nmsg;
- global->nrun = nnrun;
- mhnd = global->mhnd;
+ global.nrun = nnrun;
+ mhnd = global.mhnd;
syslog(LOG_DEBUG, "CURLEV: gotstatus(): about to call curl_multi_info_read\n");
while ((msg = curl_multi_info_read(mhnd, &nmsg))) {
syslog(LOG_ERR, "EVCURL: error asking curl for private cookie of curl handle: %s\n", curl_easy_strerror(sta));
IO = (AsyncIO *)chandle;
-///// ev_io_stop(event_base, &IO->recv_event);
+ ev_io_stop(event_base, &IO->recv_event);
+ ev_io_stop(event_base, &IO->send_event);
sta = msg->data.result;
if (sta) {
if (sta)
syslog(LOG_ERR, "EVCURL: error asking curl for response code from request: %s\n", curl_easy_strerror(sta));
syslog(LOG_ERR, "EVCURL: http response code was %ld\n", (long)IO->HttpReq.httpcode);
-/// syslog(LOG_ERR, "EVCURL: disconnecting [%s]\nn", ChrPtr(IO->ConnectMe->URL));
+
+
+ curl_slist_free_all(IO->HttpReq.headers);
msta = curl_multi_remove_handle(mhnd, chnd);
if (msta)
syslog(LOG_ERR, "EVCURL: warning problem detaching completed handle from curl multi: %s\n", curl_multi_strerror(msta));
-/// syslog(LOG_ERR, "EVCURL: disconnection done [%s]\nn", ChrPtr(IO->ConnectMe->URL));
+
+ curl_easy_cleanup(IO->HttpReq.chnd);
+ IO->HttpReq.chnd = NULL;
IO->HttpReq.attached = 0;
IO->SendDone(IO);
-//// syslog(LOG_ERR, "EVCURL: done with [%s]\nn", ChrPtr(IO->ConnectMe->URL));
-
- curl_easy_cleanup(IO->HttpReq.chnd);
- curl_slist_free_all(IO->HttpReq.headers);
-/*
FreeStrBuf(&IO->HttpReq.ReplyData);
FreeURL(&IO->ConnectMe);
RemoveContext(IO->CitContext);
IO->Terminate(IO);
-*/
}
}
}
static void
-stepmulti(evcurl_global_data *global, curl_socket_t fd) {
- int nnrun;
+stepmulti(void *data, curl_socket_t fd, int which)
+{
+ int running_handles = 0;
CURLMcode msta;
- if (global == NULL) {
- syslog(LOG_DEBUG, "EVCURL: stepmulti(NULL): wtf?\n");
- return;
- }
- msta = curl_multi_socket_action(global->mhnd, fd, 0, &nnrun);
+ msta = curl_multi_socket_action(global.mhnd, fd, which, &running_handles);
syslog(LOG_DEBUG, "EVCURL: stepmulti(): calling gotstatus()\n");
if (msta)
syslog(LOG_ERR, "EVCURL: error in curl processing events on multi handle, fd %d: %s\n", (int)fd, curl_multi_strerror(msta));
- if (global->nrun != nnrun)
- gotstatus(global, nnrun);
+ if (global.nrun != running_handles)
+ gotstatus(running_handles);
}
static void
gottime(struct ev_loop *loop, ev_timer *timeev, int events) {
syslog(LOG_DEBUG, "EVCURL: waking up curl for timeout\n");
- evcurl_global_data *global = (void *)timeev->data;
- stepmulti(global, CURL_SOCKET_TIMEOUT);
+ stepmulti(NULL, CURL_SOCKET_TIMEOUT, 0);
}
static void
-gotio(struct ev_loop *loop, ev_io *ioev, int events) {
+got_in(struct ev_loop *loop, ev_io *ioev, int events) {
syslog(LOG_DEBUG, "EVCURL: waking up curl for io on fd %d\n", (int)ioev->fd);
- stepmulti(&global, ioev->fd);
+ stepmulti(ioev->data, ioev->fd, CURL_CSELECT_IN);
+}
+
+static void
+got_out(struct ev_loop *loop, ev_io *ioev, int events) {
+ syslog(LOG_DEBUG, "EVCURL: waking up curl for io on fd %d\n", (int)ioev->fd);
+ stepmulti(ioev->data, ioev->fd, CURL_CSELECT_OUT);
}
static size_t
gotdata(void *data, size_t size, size_t nmemb, void *cglobal) {
AsyncIO *IO = (AsyncIO*) cglobal;
- //evcurl_request_data *D = (evcurl_request_data*) data;
-/// syslog(LOG_DEBUG, "EVCURL: gotdata(): calling CurlFillStrBuf_callback()\n");
if (IO->HttpReq.ReplyData == NULL)
{
}
static int
-gotwatchsock(CURL *easy, curl_socket_t fd, int action, void *cglobal, void *vio) {
+gotwatchsock(CURL *easy, curl_socket_t fd, int action, void *cglobal, void *vIO) {
evcurl_global_data *global = cglobal;
CURLM *mhnd = global->mhnd;
char *f;
- AsyncIO *IO = (AsyncIO*) vio;
+ AsyncIO *IO = (AsyncIO*) vIO;
CURLcode sta;
syslog(LOG_DEBUG, "EVCURL: gotwatchsock called fd=%d action=%d\n", (int)fd, action);
-
- if (IO == NULL) {
- syslog(LOG_ERR,"EVCURL: called first time to register this sockwatcker\n");
+ if (IO == NULL) {
sta = curl_easy_getinfo(easy, CURLINFO_PRIVATE, &f);
if (sta) {
syslog(LOG_ERR, "EVCURL: error asking curl for private cookie of curl handle: %s\n", curl_easy_strerror(sta));
return -1;
}
IO = (AsyncIO *) f;
- ev_init(&IO->recv_event, &gotio);
- curl_multi_assign(mhnd, fd, IO);
- }
- if (action == CURL_POLL_REMOVE) {
+ if (IO->SendBuf.fd != 0)
+ {
+ ev_io_stop(event_base, &IO->recv_event);
+ ev_io_stop(event_base, &IO->send_event);
+ }
+ IO->SendBuf.fd = fd;
+ ev_io_init(&IO->recv_event, &got_in, fd, EV_READ);
+ ev_io_init(&IO->send_event, &got_out, fd, EV_WRITE);
+ curl_multi_assign(mhnd, fd, IO);
+
+ }
+
+ switch (action)
+ {
+ case CURL_POLL_NONE:
+ syslog(LOG_ERR,"EVCURL: called first time to register this sockwatcker\n");
+ break;
+ case CURL_POLL_REMOVE:
syslog(LOG_ERR,"EVCURL: called last time to unregister this sockwatcher\n");
ev_io_stop(event_base, &IO->recv_event);
- FreeStrBuf(&IO->HttpReq.ReplyData);
- FreeURL(&IO->ConnectMe);
- RemoveContext(IO->CitContext);
- IO->Terminate(IO);
- } else {
- int events = (action & CURL_POLL_IN ? EV_READ : 0) | (action & CURL_POLL_OUT ? EV_WRITE : 0);
+ ev_io_stop(event_base, &IO->send_event);
+ break;
+ case CURL_POLL_IN:
ev_io_stop(event_base, &IO->recv_event);
- if (events) {
- ev_io_set(&IO->recv_event, fd, events);
- ev_io_start(event_base, &IO->recv_event);
- }
+ ev_io_start(event_base, &IO->send_event);
+ break;
+ case CURL_POLL_OUT:
+ ev_io_stop(event_base, &IO->send_event);
+ ev_io_start(event_base, &IO->recv_event);
+ break;
+ case CURL_POLL_INOUT:
+ ev_io_start(event_base, &IO->send_event);
+ ev_io_start(event_base, &IO->recv_event);
+ break;
}
return 0;
}
evcurl_handle_start(AsyncIO *IO)
{
CURLMcode msta;
-
+ IO->NextState = eConnect;
syslog(LOG_DEBUG, "EVCURL: attaching to curl multi handle\n");
msta = curl_multi_add_handle(global.mhnd, IO->HttpReq.chnd);
if (msta)