/*****************************************************************************
* libevent / curl integration *
*****************************************************************************/
+typedef struct _evcurl_global_data {
+ int magic;
+ CURLM *mhnd;
+ ev_timer timeev;
+ int nrun;
+} evcurl_global_data;
+typedef struct _sockwatcher_data
+{
+ evcurl_global_data *global;
+ ev_io ioev;
+} sockwatcher_data;
evcurl_global_data global;
while ((msg = curl_multi_info_read(mhnd, &nmsg))) {
CtdlLogPrintf(CTDL_ERR, "EVCURL: got curl multi_info message msg=%d\n", msg->msg);
if (CURLMSG_DONE == msg->msg) {
+ CURL *chnd;
+ char *chandle;
+ CURLcode sta;
+ CURLMcode msta;
+ AsyncIO *IO;
+
+ chandle = NULL;;
+ chnd = msg->easy_handle;
+ sta = curl_easy_getinfo(chnd, CURLINFO_PRIVATE, &chandle);
CtdlLogPrintf(CTDL_ERR, "EVCURL: request complete\n");
- CURL *chnd = msg->easy_handle;
- char *chandle = NULL;;
- CURLcode sta = curl_easy_getinfo(chnd, CURLINFO_PRIVATE, &chandle);
if (sta)
CtdlLogPrintf(CTDL_ERR, "EVCURL: error asking curl for private cookie of curl handle: %s\n", curl_easy_strerror(sta));
- evcurl_request_data *handle = (void *)chandle;
- if (global != handle->global || chnd != handle->chnd)
- CtdlLogPrintf(CTDL_ERR, "EVCURL: internal evcurl error: unknown curl handle completed\n");
+ IO = (AsyncIO *)chandle;
+
sta = msg->data.result;
if (sta) {
- CtdlLogPrintf(CTDL_ERR, "EVCURL: error description: %s\n", handle->errdesc);
+ CtdlLogPrintf(CTDL_ERR, "EVCURL: error description: %s\n", IO->HttpReq.errdesc);
CtdlLogPrintf(CTDL_ERR, "EVCURL: error performing request: %s\n", curl_easy_strerror(sta));
}
- long httpcode;
- sta = curl_easy_getinfo(chnd, CURLINFO_RESPONSE_CODE, &httpcode);
+ sta = curl_easy_getinfo(chnd, CURLINFO_RESPONSE_CODE, &IO->HttpReq.httpcode);
if (sta)
CtdlLogPrintf(CTDL_ERR, "EVCURL: error asking curl for response code from request: %s\n", curl_easy_strerror(sta));
- CtdlLogPrintf(CTDL_ERR, "EVCURL: http response code was %ld\n", (long)httpcode);
- CURLMcode msta = curl_multi_remove_handle(mhnd, chnd);
+ CtdlLogPrintf(CTDL_ERR, "EVCURL: http response code was %ld\n", (long)IO->HttpReq.httpcode);
+ msta = curl_multi_remove_handle(mhnd, chnd);
if (msta)
CtdlLogPrintf(CTDL_ERR, "EVCURL: warning problem detaching completed handle from curl multi: %s\n", curl_multi_strerror(msta));
- handle->attached = 0;
+
+ IO->HttpReq.attached = 0;
+ IO->SendDone(IO);
+ curl_easy_cleanup(IO->HttpReq.chnd);
+ curl_slist_free_all(IO->HttpReq.headers);
+ FreeStrBuf(&IO->HttpReq.ReplyData);
+ FreeURL(&IO->ConnectMe);
+ RemoveContext(IO->CitContext);
+ free(IO);
}
}
}
static void
stepmulti(evcurl_global_data *global, curl_socket_t fd) {
int nnrun;
- CURLMcode msta = curl_multi_socket_action(global->mhnd, fd, 0, &nnrun);
+ CURLMcode msta;
+
+ if (global == NULL) {
+ CtdlLogPrintf(CTDL_DEBUG, "EVCURL: stepmulti(NULL): wtf?\n");
+ return;
+ }
+ msta = curl_multi_socket_action(global->mhnd, fd, 0, &nnrun);
CtdlLogPrintf(CTDL_DEBUG, "EVCURL: stepmulti(): calling gotstatus()\n");
if (msta)
CtdlLogPrintf(CTDL_ERR, "EVCURL: error in curl processing events on multi handle, fd %d: %s\n", (int)fd, curl_multi_strerror(msta));
static size_t
gotdata(void *data, size_t size, size_t nmemb, void *cglobal) {
- evcurl_request_data *D = (evcurl_request_data*) data;
+ AsyncIO *IO = (AsyncIO*) cglobal;
+ //evcurl_request_data *D = (evcurl_request_data*) data;
CtdlLogPrintf(CTDL_DEBUG, "EVCURL: gotdata(): calling CurlFillStrBuf_callback()\n");
- return CurlFillStrBuf_callback(D->ReplyData, size, nmemb, cglobal);
+
+ if (IO->HttpReq.ReplyData == NULL)
+ {
+ IO->HttpReq.ReplyData = NewStrBufPlain(NULL, SIZ);
+ }
+ return CurlFillStrBuf_callback(data, size, nmemb, IO->HttpReq.ReplyData);
}
static int
}
if (CURL_POLL_REMOVE == action) {
CtdlLogPrintf(CTDL_ERR,"EVCURL: called last time to unregister this sockwatcher\n");
+ ev_io_stop(event_base, &sockwatcher->ioev);
free(sockwatcher);
} else {
int events = (action & CURL_POLL_IN ? EV_READ : 0) | (action & CURL_POLL_OUT ? EV_WRITE : 0);
-int evcurl_init(evcurl_request_data *handle,
+int evcurl_init(AsyncIO *IO,
void *CustomData,
const char* Desc,
- int CallBack)
+ IO_CallBack CallBack)
{
CURLcode sta;
CURL *chnd;
CtdlLogPrintf(CTDL_DEBUG,"EVCURL: evcurl_init called ms\n");
- handle->global = &global;
- handle->attached = 0;
- chnd = handle->chnd = curl_easy_init();
+ IO->HttpReq.attached = 0;
+ IO->SendDone = CallBack;
+ chnd = IO->HttpReq.chnd = curl_easy_init();
if (!chnd)
{
CtdlLogPrintf(CTDL_ERR, "EVCURL: error initializing curl handle\n");
return 1;
}
- strcpy(handle->errdesc, Desc);
+ strcpy(IO->HttpReq.errdesc, Desc);
OPT(VERBOSE, (long)1);
/* unset in production */
OPT(LOW_SPEED_LIMIT, (long)64);
OPT(LOW_SPEED_TIME, (long)600);
OPT(CONNECTTIMEOUT, (long)600);
- OPT(PRIVATE, (void *)handle);
+ OPT(PRIVATE, (void *)IO);
OPT(WRITEFUNCTION, &gotdata);
- OPT(WRITEDATA, (void *)handle);
- OPT(ERRORBUFFER, handle->errdesc);
+ OPT(WRITEDATA, (void *)IO);
+ OPT(ERRORBUFFER, IO->HttpReq.errdesc);
/* point to a structure that points back to the perl structure and stuff */
- CtdlLogPrintf(CTDL_DEBUG, "EVCURL: Loading URL: %s\n", handle->URL->PlainUrl);
- OPT(URL, handle->URL->PlainUrl);
- if (StrLength(handle->URL->CurlCreds))
+ CtdlLogPrintf(CTDL_DEBUG, "EVCURL: Loading URL: %s\n", IO->ConnectMe->PlainUrl);
+ OPT(URL, IO->ConnectMe->PlainUrl);
+ if (StrLength(IO->ConnectMe->CurlCreds))
{
OPT(HTTPAUTH, (long)CURLAUTH_BASIC);
- OPT(USERPWD, ChrPtr(handle->URL->CurlCreds));
+ OPT(USERPWD, ChrPtr(IO->ConnectMe->CurlCreds));
}
#ifdef CURLOPT_HTTP_CONTENT_DECODING
OPT(HTTP_CONTENT_DECODING, 1);
OPT(ENCODING, "");
#endif
- if (StrLength(handle->PostData) > 0)
+ if (StrLength(IO->HttpReq.PostData) > 0)
{
- OPT(POSTFIELDS, ChrPtr(handle->PostData));
- OPT(POSTFIELDSIZE, StrLength(handle->PostData));
+ OPT(POSTFIELDS, ChrPtr(IO->HttpReq.PostData));
+ OPT(POSTFIELDSIZE, StrLength(IO->HttpReq.PostData));
}
- else if ((handle->PlainPostDataLen != 0) && (handle->PlainPostData != NULL))
+ else if ((IO->HttpReq.PlainPostDataLen != 0) && (IO->HttpReq.PlainPostData != NULL))
{
- OPT(POSTFIELDS, handle->PlainPostData);
- OPT(POSTFIELDSIZE, handle->PlainPostDataLen);
+ OPT(POSTFIELDS, IO->HttpReq.PlainPostData);
+ OPT(POSTFIELDSIZE, IO->HttpReq.PlainPostDataLen);
}
- if (handle->headers != NULL)
- OPT(HTTPHEADER, handle->headers);
+ if (IO->HttpReq.headers != NULL)
+ OPT(HTTPHEADER, IO->HttpReq.headers);
return 1;
}
void
-evcurl_handle_start(evcurl_request_data *handle)
+evcurl_handle_start(AsyncIO *IO)
{
CURLMcode msta;
CtdlLogPrintf(CTDL_DEBUG, "EVCURL: attaching to curl multi handle\n");
- msta = curl_multi_add_handle(handle->global->mhnd, handle->chnd);
+ msta = curl_multi_add_handle(global.mhnd, IO->HttpReq.chnd);
if (msta)
CtdlLogPrintf(CTDL_ERR, "EVCURL: error attaching to curl multi handle: %s\n", curl_multi_strerror(msta));
- handle->attached = 1;
+ IO->HttpReq.attached = 1;
// ev_timer_start(EV_DEFAULT, &global.timeev);
ev_async_send (event_base, &WakeupCurl);
}
curl_multi_perform(&global, CURL_POLL_NONE);
}
+static void evcurl_shutdown (void)
+{
+ curl_multi_cleanup(global.mhnd);
+}
/*****************************************************************************
* libevent integration *
*****************************************************************************/
DeleteHash(&InboundEventQueues[0]);
DeleteHash(&InboundEventQueues[1]);
citthread_mutex_destroy(&EventQueueMutex);
-
+ evcurl_shutdown();
return(NULL);
}
projects / citadel.git / blobdiff