/*
*
- * Copyright (c) 1998-2009 by the citadel.org team
+ * Copyright (c) 1998-2012 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "event_client.h"
-static void IO_abort_shutdown_callback(struct ev_loop *loop, ev_cleanup *watcher, int revents)
+static void IO_abort_shutdown_callback(struct ev_loop *loop,
+ ev_cleanup *watcher,
+ int revents)
{
AsyncIO *IO = watcher->data;
EV_syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
}
-/*--------------------------------------------------------------------------------
- * Server DB IO
- */
+/*------------------------------------------------------------------------------
+ * Server DB IO
+ *----------------------------------------------------------------------------*/
extern int evdb_count;
extern pthread_mutex_t DBEventQueueMutex;
extern HashList *DBInboundEventQueue;
extern struct ev_loop *event_db;
-extern ev_async DBAddJob;
+extern ev_async DBAddJob;
extern ev_async DBExitEventLoop;
eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
h->IO = IO;
h->EvAttch = CB;
- ev_cleanup_init(&IO->db_abort_by_shutdown,
+ ev_cleanup_init(&IO->db_abort_by_shutdown,
IO_abort_shutdown_callback);
IO->db_abort_by_shutdown.data = IO;
ev_cleanup_start(event_db, &IO->db_abort_by_shutdown);
ev_cleanup_stop(event_db, &IO->db_abort_by_shutdown);
assert(IO->Terminate);
- IO->Terminate(IO);
-
- Ctx->state = CON_IDLE;
- Ctx->kill_me = 1;
+ IO->Terminate(IO);
}
void
AsyncIO *IO = watcher->data;
EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
become_session(IO->CitContext);
-
+
ev_idle_stop(event_db, &IO->db_unwind_stack);
assert(IO->NextDBOperation);
case eSendDNSQuery:
case eReadDNSReply:
case eConnect:
- case eSendReply:
+ case eSendReply:
case eSendMore:
case eSendFile:
- case eReadMessage:
+ case eReadMessage:
case eReadMore:
case eReadPayload:
case eReadFile:
return eDBQuery;
}
-/*--------------------------------------------------------------------------------
- * Client IO
- */
+/*------------------------------------------------------------------------------
+ * Client IO
+ *----------------------------------------------------------------------------*/
extern int evbase_count;
extern pthread_mutex_t EventQueueMutex;
extern HashList *InboundEventQueue;
extern struct ev_loop *event_base;
-extern ev_async AddJob;
+extern ev_async AddJob;
extern ev_async ExitEventLoop;
h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
h->IO = IO;
h->EvAttch = CB;
- ev_cleanup_init(&IO->abort_by_shutdown,
+ ev_cleanup_init(&IO->abort_by_shutdown,
IO_abort_shutdown_callback);
IO->abort_by_shutdown.data = IO;
ev_cleanup_start(event_base, &IO->abort_by_shutdown);
return eSendReply;
}
-int ShutDownEventQueue(void)
-{
- pthread_mutex_lock(&DBEventQueueMutex);
- ev_async_send (event_db, &DBExitEventLoop);
- pthread_mutex_unlock(&DBEventQueueMutex);
-
- pthread_mutex_lock(&EventQueueMutex);
- ev_async_send (EV_DEFAULT_ &ExitEventLoop);
- pthread_mutex_unlock(&EventQueueMutex);
- return 0;
-}
-
+void DestructCAres(AsyncIO *IO);
void FreeAsyncIOContents(AsyncIO *IO)
{
+ CitContext *Ctx = IO->CitContext;
+
FreeStrBuf(&IO->IOBuf);
FreeStrBuf(&IO->SendBuf.Buf);
FreeStrBuf(&IO->RecvBuf.Buf);
+
+ DestructCAres(IO);
+
+ FreeURL(&IO->ConnectMe);
+ FreeStrBuf(&IO->HttpReq.ReplyData);
+
+ Ctx->state = CON_IDLE;
+ Ctx->kill_me = 1;
}
void StopClientWatchers(AsyncIO *IO)
{
+ ev_timer_stop (event_base, &IO->rw_timeout);
ev_timer_stop(event_base, &IO->conn_fail);
- ev_io_stop(event_base, &IO->conn_event);
ev_idle_stop(event_base, &IO->unwind_stack);
+ ev_io_stop(event_base, &IO->conn_event);
ev_io_stop(event_base, &IO->send_event);
ev_io_stop(event_base, &IO->recv_event);
- ev_timer_stop (event_base, &IO->rw_timeout);
close(IO->SendBuf.fd);
IO->SendBuf.fd = 0;
IO->RecvBuf.fd = 0;
ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
StopClientWatchers(IO);
- if (IO->DNSChannel != NULL) {
- ares_destroy(IO->DNSChannel);
- ev_io_stop(event_base, &IO->dns_recv_event);
- ev_io_stop(event_base, &IO->dns_send_event);
- IO->DNSChannel = NULL;
+ if (IO->DNS.Channel != NULL) {
+ ares_destroy(IO->DNS.Channel);
+ ev_io_stop(event_base, &IO->DNS.recv_event);
+ ev_io_stop(event_base, &IO->DNS.send_event);
+ IO->DNS.Channel = NULL;
}
assert(IO->Terminate);
IO->Terminate(IO);
- Ctx->state = CON_IDLE;
- Ctx->kill_me = 1;
}
{
const char *Err = NULL;
eReadState Finished = eBufferNotEmpty;
-
+
become_session(IO->CitContext);
- while ((Finished == eBufferNotEmpty) &&
+ while ((Finished == eBufferNotEmpty) &&
((IO->NextState == eReadMessage)||
(IO->NextState == eReadMore)||
(IO->NextState == eReadFile)||
(IO->NextState == eReadPayload)))
{
- if (IO->RecvBuf.nBlobBytesWanted != 0) {
-
- }
- else { /* Reading lines... */
-//// lex line reply in callback, or do it ourselves. as nnn-blabla means continue reading in SMTP
- if ((IO->NextState == eReadFile) &&
- (Finished == eBufferNotEmpty))
+ /* Reading lines...
+ * lex line reply in callback,
+ * or do it ourselves.
+ * i.e. as nnn-blabla means continue reading in SMTP
+ */
+ if ((IO->NextState == eReadFile) &&
+ (Finished == eBufferNotEmpty))
+ {
+ Finished = WriteIOBAlreadyRead(&IO->IOB, &Err);
+ if (Finished == eReadSuccess)
{
- Finished = WriteIOBAlreadyRead(&IO->IOB, &Err);
- if (Finished == eReadSuccess)
- {
- IO->NextState = eSendReply;
- }
- }
- else if (IO->LineReader)
- Finished = IO->LineReader(IO);
- else
- Finished = StrBufChunkSipLine(IO->IOBuf, &IO->RecvBuf);
-
- switch (Finished) {
- case eMustReadMore: /// read new from socket...
- break;
- case eBufferNotEmpty: /* shouldn't happen... */
- case eReadSuccess: /// done for now...
- break;
- case eReadFail: /// WHUT?
- ///todo: shut down!
- break;
+ IO->NextState = eSendReply;
}
-
}
-
+ else if (IO->LineReader)
+ Finished = IO->LineReader(IO);
+ else
+ Finished = StrBufChunkSipLine(IO->IOBuf,
+ &IO->RecvBuf);
+
+ switch (Finished) {
+ case eMustReadMore: /// read new from socket...
+ break;
+ case eBufferNotEmpty: /* shouldn't happen... */
+ case eReadSuccess: /// done for now...
+ break;
+ case eReadFail: /// WHUT?
+ ///todo: shut down!
+ break;
+ }
+
if (Finished != eMustReadMore) {
assert(IO->ReadDone);
ev_io_stop(event_base, &IO->recv_event);
const char *pch = ChrPtr(IO->SendBuf.Buf);
const char *pchh = IO->SendBuf.ReadWritePointer;
long nbytes;
-
+
if (pchh == NULL)
pchh = pch;
-
+
nbytes = StrLength(IO->SendBuf.Buf) - (pchh - pch);
snprintf(fn, SIZ, "/tmp/foolog_ev_%s.%d",
((CitContext*)(IO->CitContext))->ServiceName,
IO->SendBuf.fd);
-
+
fd = fopen(fn, "a+");
fprintf(fd, "Send: BufSize: %ld BufContent: [",
nbytes);
StrBufPlain(IO->ErrMsg, errmsg, -1);
break;
default:
- rc = StrBuf_write_one_chunk_callback(watcher->fd, 0/*TODO*/, &IO->SendBuf);
+ rc = StrBuf_write_one_chunk_callback(watcher->fd,
+ 0/*TODO*/,
+ &IO->SendBuf);
}
#ifdef BIGBAD_IODBG
case eDBQuery:
case eConnect:
break;
- case eSendReply:
+ case eSendReply:
case eSendMore:
case eSendFile:
- ev_io_start(event_base, &IO->send_event);
+ ev_io_start(event_base,
+ &IO->send_event);
break;
- case eReadMessage:
+ case eReadMessage:
case eReadMore:
case eReadPayload:
case eReadFile:
}
break;
case eSendReply:
- if (StrBufCheckBuffer(&IO->SendBuf) != eReadSuccess)
+ if (StrBufCheckBuffer(&IO->SendBuf) != eReadSuccess)
break;
IO->NextState = eReadMore;
case eReadMore:
case eReadMessage:
case eReadPayload:
case eReadFile:
- if (StrBufCheckBuffer(&IO->RecvBuf) == eBufferNotEmpty) {
+ if (StrBufCheckBuffer(&IO->RecvBuf) == eBufferNotEmpty)
+ {
HandleInbound(IO);
}
else {
break;
case eDBQuery:
- /* we now live in another queue, so we have to unregister. */
+ /*
+ * we now live in another queue,
+ * so we have to unregister.
+ */
ev_cleanup_stop(loop, &IO->abort_by_shutdown);
break;
case eSendDNSQuery:
static void
set_start_callback(struct ev_loop *loop, AsyncIO *IO, int revents)
{
-
switch(IO->NextState) {
case eReadMore:
case eReadMessage:
}
assert(IO->Timeout);
- switch (IO->Timeout(IO))
+ switch (IO->Timeout(IO))
{
case eAbort:
ShutDownCLient(IO);
become_session(IO->CitContext);
assert(IO->ConnFail);
- switch (IO->ConnFail(IO))
+ switch (IO->ConnFail(IO))
{
case eAbort:
ShutDownCLient(IO);
}
static void
-IO_connfailimmediate_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
+IO_connfailimmediate_callback(struct ev_loop *loop,
+ ev_idle *watcher,
+ int revents)
{
AsyncIO *IO = watcher->data;
become_session(IO->CitContext);
assert(IO->ConnFail);
- switch (IO->ConnFail(IO))
+ switch (IO->ConnFail(IO))
{
case eAbort:
ShutDownCLient(IO);
nbytes = FileRecvChunked(&IO->IOB, &errmsg);
if (nbytes < 0)
StrBufPlain(IO->ErrMsg, errmsg, -1);
- else
+ else
{
if (IO->IOB.ChunkSendRemain == 0)
{
}
break;
default:
- nbytes = StrBuf_read_one_chunk_callback(watcher->fd, 0 /*TODO */, &IO->RecvBuf);
+ nbytes = StrBuf_read_one_chunk_callback(watcher->fd,
+ 0 /*TODO */,
+ &IO->RecvBuf);
break;
}
#ifdef BIGBAD_IODBG
{
+ long nbytes;
int rv = 0;
char fn [SIZ];
FILE *fd;
const char *pch = ChrPtr(IO->RecvBuf.Buf);
const char *pchh = IO->RecvBuf.ReadWritePointer;
- long nbytes;
-
+
if (pchh == NULL)
pchh = pch;
-
+
nbytes = StrLength(IO->RecvBuf.Buf) - (pchh - pch);
snprintf(fn, SIZ, "/tmp/foolog_ev_%s.%d",
- ((CitContext*)(IO->CitContext))->ServiceName,
+ ((CitContext*)(IO->CitContext))->ServiceName,
IO->SendBuf.fd);
-
+
fd = fopen(fn, "a+");
fprintf(fd, "Read: BufSize: %ld BufContent: [",
nbytes);
rv = fwrite(pchh, nbytes, 1, fd);
if (!rv) printf("failed to write debug to %s!\n", fn);
fprintf(fd, "]\n");
-
-
fclose(fd);
}
#endif
return;
} else if (nbytes == -1) {
/// TODO: FD is gone. kick it. sock_buff_invoke_free(sb, errno);
- EV_syslog(LOG_DEBUG,
+ EV_syslog(LOG_DEBUG,
"EVENT: Socket Invalid! %s \n",
strerror(errno));
ShutDownCLient(IO);
AsyncIO *IO = watcher->data;
EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
become_session(IO->CitContext);
- assert(IO->DNSFail);
- assert(IO->DNSQuery->PostDNS);
- switch (IO->DNSQuery->PostDNS(IO))
+ assert(IO->DNS.Fail);
+ assert(IO->DNS.Query->PostDNS);
+ switch (IO->DNS.Query->PostDNS(IO))
{
case eAbort:
- switch (IO->DNSFail(IO)) {
+ switch (IO->DNS.Fail(IO)) {
case eAbort:
ShutDownCLient(IO);
default:
break;
-
}
default:
break;
}
}
-eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_rw_timeout)
+
+eNextState EvConnectSock(AsyncIO *IO,
+ double conn_timeout,
+ double first_rw_timeout,
+ int ReadFirst)
{
- int fdflags;
+ int fdflags;
int rc = -1;
- IO->SendBuf.fd = IO->RecvBuf.fd =
+ become_session(IO->CitContext);
+
+ if (ReadFirst) {
+ IO->NextState = eReadMessage;
+ }
+ else {
+ IO->NextState = eSendReply;
+ }
+
+ IO->SendBuf.fd = IO->RecvBuf.fd =
socket(
- (IO->ConnectMe->IPv6)?PF_INET6:PF_INET,
- SOCK_STREAM,
+ (IO->ConnectMe->IPv6)?PF_INET6:PF_INET,
+ SOCK_STREAM,
IPPROTO_TCP);
if (IO->SendBuf.fd < 0) {
- EV_syslog(LOG_ERR, "EVENT: socket() failed: %s\n", strerror(errno));
- StrBufPrintf(IO->ErrMsg, "Failed to create socket: %s", strerror(errno));
+ EV_syslog(LOG_ERR,
+ "EVENT: socket() failed: %s\n",
+ strerror(errno));
+
+ StrBufPrintf(IO->ErrMsg,
+ "Failed to create socket: %s",
+ strerror(errno));
return eAbort;
}
fdflags = fcntl(IO->SendBuf.fd, F_GETFL);
if (fdflags < 0) {
- EV_syslog(LOG_DEBUG,
+ EV_syslog(LOG_DEBUG,
"EVENT: unable to get socket flags! %s \n",
strerror(errno));
- StrBufPrintf(IO->ErrMsg, "Failed to get socket flags: %s", strerror(errno));
+ StrBufPrintf(IO->ErrMsg,
+ "Failed to get socket flags: %s",
+ strerror(errno));
return eAbort;
}
fdflags = fdflags | O_NONBLOCK;
if (fcntl(IO->SendBuf.fd, F_SETFL, fdflags) < 0) {
- EV_syslog(LOG_DEBUG,
- "EVENT: unable to set socket nonblocking flags! %s \n",
- strerror(errno));
- StrBufPrintf(IO->ErrMsg, "Failed to set socket flags: %s", strerror(errno));
+ EV_syslog(
+ LOG_DEBUG,
+ "EVENT: unable to set socket nonblocking flags! %s \n",
+ strerror(errno));
+ StrBufPrintf(IO->ErrMsg,
+ "Failed to set socket flags: %s",
+ strerror(errno));
close(IO->SendBuf.fd);
IO->SendBuf.fd = IO->RecvBuf.fd = -1;
return eAbort;
}
-/* TODO: maye we could use offsetof() to calc the position of data...
+/* TODO: maye we could use offsetof() to calc the position of data...
* http://doc.dvgu.ru/devel/ev.html#associating_custom_data_with_a_watcher
*/
ev_io_init(&IO->recv_event, IO_recv_callback, IO->RecvBuf.fd, EV_READ);
ev_timer_init(&IO->conn_fail, IO_connfail_callback, conn_timeout, 0);
IO->conn_fail.data = IO;
- ev_timer_init(&IO->rw_timeout, IO_Timeout_callback, first_rw_timeout, 0);
+ ev_timer_init(&IO->rw_timeout, IO_Timeout_callback, first_rw_timeout,0);
IO->rw_timeout.data = IO;
- /* Bypass it like this: IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1"); */
-/// ((struct sockaddr_in)IO->ConnectMe->Addr).sin_addr.s_addr = inet_addr("127.0.0.1");
+ /* for debugging you may bypass it like this:
+ * IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1");
+ * ((struct sockaddr_in)IO->ConnectMe->Addr).sin_addr.s_addr =
+ * inet_addr("127.0.0.1");
+ */
if (IO->ConnectMe->IPv6)
- rc = connect(IO->SendBuf.fd, &IO->ConnectMe->Addr, sizeof(struct sockaddr_in6));
+ rc = connect(IO->SendBuf.fd,
+ &IO->ConnectMe->Addr,
+ sizeof(struct sockaddr_in6));
else
- rc = connect(IO->SendBuf.fd, (struct sockaddr_in *)&IO->ConnectMe->Addr, sizeof(struct sockaddr_in));
+ rc = connect(IO->SendBuf.fd,
+ (struct sockaddr_in *)&IO->ConnectMe->Addr,
+ sizeof(struct sockaddr_in));
if (rc >= 0){
EVM_syslog(LOG_DEBUG, "connect() immediate success.\n");
else if (errno == EINPROGRESS) {
EVM_syslog(LOG_DEBUG, "connect() have to wait now.\n");
- ev_io_init(&IO->conn_event, IO_connestd_callback, IO->SendBuf.fd, EV_READ|EV_WRITE);
+ ev_io_init(&IO->conn_event,
+ IO_connestd_callback,
+ IO->SendBuf.fd,
+ EV_READ|EV_WRITE);
+
IO->conn_event.data = IO;
ev_io_start(event_base, &IO->conn_event);
IO_connfailimmediate_callback);
IO->conn_fail_immediate.data = IO;
ev_idle_start(event_base, &IO->conn_fail_immediate);
-
+
EV_syslog(LOG_ERR, "connect() failed: %s\n", strerror(errno));
- StrBufPrintf(IO->ErrMsg, "Failed to connect: %s", strerror(errno));
+ StrBufPrintf(IO->ErrMsg,
+ "Failed to connect: %s",
+ strerror(errno));
return IO->NextState;
}
return IO->NextState;
ev_timer_again (event_base, &IO->rw_timeout);
}
-eNextState InitEventIO(AsyncIO *IO,
- void *pData,
- double conn_timeout,
- double first_rw_timeout,
- int ReadFirst)
-{
- IO->Data = pData;
- become_session(IO->CitContext);
-
- if (ReadFirst) {
- IO->NextState = eReadMessage;
- }
- else {
- IO->NextState = eSendReply;
- }
- return event_connect_socket(IO, conn_timeout, first_rw_timeout);
-}
-eNextState ReAttachIO(AsyncIO *IO,
- void *pData,
+eNextState ReAttachIO(AsyncIO *IO,
+ void *pData,
int ReadFirst)
{
IO->Data = pData;
return IO->NextState;
}
+
+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)
+{
+ IO->Data = Data;
+
+ IO->CitContext = CloneContext(CC);
+ ((CitContext *)IO->CitContext)->session_specific_data = (char*) Data;
+
+ IO->NextState = NextState;
+
+ IO->SendDone = SendDone;
+ IO->ReadDone = ReadDone;
+ IO->Terminate = Terminate;
+ IO->LineReader = LineReader;
+ IO->ConnFail = ConnFail;
+ IO->Timeout = Timeout;
+ IO->ShutdownAbort = ShutdownAbort;
+
+ IO->DNS.Fail = DNS_Fail;
+
+ IO->SendBuf.Buf = NewStrBufPlain(NULL, 1024);
+ IO->RecvBuf.Buf = NewStrBufPlain(NULL, 1024);
+ IO->IOBuf = NewStrBuf();
+
+}
+
+extern int evcurl_init(AsyncIO *IO);
+
+int InitcURLIOStruct(AsyncIO *IO,
+ void *Data,
+ const char* Desc,
+ IO_CallBack SendDone,
+ IO_CallBack Terminate,
+ IO_CallBack ShutdownAbort)
+{
+ IO->Data = Data;
+
+ IO->CitContext = CloneContext(CC);
+ ((CitContext *)IO->CitContext)->session_specific_data = (char*) Data;
+
+ IO->SendDone = SendDone;
+ IO->Terminate = Terminate;
+ IO->ShutdownAbort = ShutdownAbort;
+
+ strcpy(IO->HttpReq.errdesc, Desc);
+
+
+ return evcurl_init(IO);
+
+}
projects / citadel.git / blobdiff