#ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT
-#include <event.h>
#include "event_client.h"
extern int event_add_pipe[2];
extern citthread_mutex_t EventQueueMutex;
-extern void *QueueEventAddPtr;
-extern AsyncIO *QueueThisIO;
-extern EventContextAttach EventContextAttachPtr;
+extern HashList *InboundEventQueue;
+extern struct ev_loop *event_base;
+#define SEND_EVENT 1
+#define RECV_EVENT 2
+#define CONN_EVENT 3
+
int QueueEventContext(void *Ctx, AsyncIO *IO, EventContextAttach CB)
{
- citthread_mutex_lock(&EventQueueMutex);
+ IOAddHandler *h;
+ int i;
- QueueEventAddPtr = Ctx;
- EventContextAttachPtr = CB;
- QueueThisIO = IO;
+ h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
+ h->Ctx = Ctx;
+ h->EvAttch = CB;
- write(event_add_pipe[1], "+_", 1);
+ citthread_mutex_lock(&EventQueueMutex);
+ if (event_add_pipe[1] == -1) {
+ citthread_mutex_unlock(&EventQueueMutex);
+ free (h);
+ return -1;
+ }
+ CtdlLogPrintf(CTDL_DEBUG, "EVENT Q\n");
+ i = GetCount(InboundEventQueue);
+ Put(InboundEventQueue, IKEY(i), h, NULL);
citthread_mutex_unlock(&EventQueueMutex);
+
+ write(event_add_pipe[1], "+_", 1);
+ CtdlLogPrintf(CTDL_DEBUG, "EVENT Q Done.\n");
return 0;
}
int ShutDownEventQueue(void)
{
+ citthread_mutex_lock(&EventQueueMutex);
+ if (event_add_pipe[1] == -1) {
+ citthread_mutex_unlock(&EventQueueMutex);
+
+ return -1;
+ }
write(event_add_pipe[1], "x_", 1);
close(event_add_pipe[1]);
+ event_add_pipe[1] = -1;
+ citthread_mutex_unlock(&EventQueueMutex);
return 0;
}
+void FreeAsyncIOContents(AsyncIO *IO)
+{
+ FreeStrBuf(&IO->IOBuf);
+ FreeStrBuf(&IO->SendBuf.Buf);
+ FreeStrBuf(&IO->RecvBuf.Buf);
+}
/*
-static void
-setup_signal_handlers(struct instance *instance)
-{
- signal(SIGPIPE, SIG_IGN);
-
- event_set(&instance->sigterm_event, SIGTERM, EV_SIGNAL|EV_PERSIST,
- exit_event_callback, instance);
- event_add(&instance->sigterm_event, NULL);
+ static void
+ setup_signal_handlers(struct instance *instance)
+ {
+ signal(SIGPIPE, SIG_IGN);
+
+ event_set(&instance->sigterm_event, SIGTERM, EV_SIGNAL|EV_PERSIST,
+ exit_event_callback, instance);
+ event_add(&instance->sigterm_event, NULL);
+
+ event_set(&instance->sigint_event, SIGINT, EV_SIGNAL|EV_PERSIST,
+ exit_event_callback, instance);
+ event_add(&instance->sigint_event, NULL);
+
+ event_set(&instance->sigquit_event, SIGQUIT, EV_SIGNAL|EV_PERSIST,
+ exit_event_callback, instance);
+ event_add(&instance->sigquit_event, NULL);
+ }
+*/
- event_set(&instance->sigint_event, SIGINT, EV_SIGNAL|EV_PERSIST,
- exit_event_callback, instance);
- event_add(&instance->sigint_event, NULL);
+void ShutDownCLient(AsyncIO *IO)
+{
+ CtdlLogPrintf(CTDL_DEBUG, "EVENT x %d\n", IO->sock);
+ switch (IO->active_event) {
+ case SEND_EVENT:
+ ev_io_stop(event_base, &IO->send_event);
+ break;
+ case RECV_EVENT:
+ ev_io_stop(event_base, &IO->recv_event);
+ break;
+ case CONN_EVENT:
+ ev_io_stop(event_base, &IO->conn_event);
+ break;
+ case 0:
+ // no event active here; just bail out.
+ break;
+ }
- event_set(&instance->sigquit_event, SIGQUIT, EV_SIGNAL|EV_PERSIST,
- exit_event_callback, instance);
- event_add(&instance->sigquit_event, NULL);
+ IO->active_event = 0;
+ IO->Terminate(IO->Data);
+
}
-*/
eReadState HandleInbound(AsyncIO *IO)
{
}
if (Finished != eMustReadMore) {
- event_del(&IO->recv_event);
+ ev_io_stop(event_base, &IO->recv_event);
+ IO->active_event = 0;
IO->NextState = IO->ReadDone(IO->Data);
Finished = StrBufCheckBuffer(&IO->RecvBuf);
}
(IO->NextState == eSendMore))
{
IO->NextState = IO->SendDone(IO->Data);
- event_add(&IO->send_event, NULL);
+ ev_io_start(event_base, &IO->send_event);
+
+ IO->active_event = SEND_EVENT;
}
+ else if ((IO->NextState == eTerminateConnection) ||
+ (IO->NextState == eAbort) )
+ ShutDownCLient(IO);
return Finished;
}
static void
-IO_send_callback(int fd, short event, void *ctx)
+IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
{
int rc;
- AsyncIO *IO = ctx;
-
- (void)fd;
- (void)event;
-
+ AsyncIO *IO = watcher->data;
+/*
+ CtdlLogPrintf(CTDL_DEBUG, "EVENT -> %d : [%s%s%s%s]\n",
+ watcher->fd,
+ (event&EV_TIMEOUT) ? " timeout" : "",
+ (event&EV_READ) ? " read" : "",
+ (event&EV_WRITE) ? " write" : "",
+ (event&EV_SIGNAL) ? " signal" : "");
+*/
/// assert(fd == IO->sock);
- rc = StrBuf_write_one_chunk_callback(fd, event, &IO->SendBuf);
+ rc = StrBuf_write_one_chunk_callback(watcher->fd, 0/*TODO*/, &IO->SendBuf);
if (rc == 0)
{
- event_del(&IO->send_event);
- switch (IO->NextState) {
- case eSendReply:
- break;
- case eSendMore:
- IO->NextState = IO->SendDone(IO->Data);
- event_add(&IO->send_event, NULL);
- break;
- case eReadMessage:
- if (StrBufCheckBuffer(&IO->RecvBuf) == eBufferNotEmpty) {
- HandleInbound(IO);
- }
- else {
- event_add(&IO->recv_event, NULL);
- }
-
- break;
- case eAbort:
- break;
- }
+
+#ifdef BIGBAD_IODBG
+ {
+ int rv = 0;
+ char fn [SIZ];
+ FILE *fd;
+ 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", "smtpev", IO->sock);
+
+ fd = fopen(fn, "a+");
+ fprintf(fd, "Read: BufSize: %ld BufContent: [",
+ nbytes);
+ rv = fwrite(pchh, nbytes, 1, fd);
+ fprintf(fd, "]\n");
+
+
+ fclose(fd);
+ }
+#endif
+ ev_io_stop(event_base, &IO->send_event);
+ IO->active_event = 0;
+ switch (IO->NextState) {
+ case eSendReply:
+ break;
+ case eSendMore:
+ IO->NextState = IO->SendDone(IO->Data);
+
+ if ((IO->NextState == eTerminateConnection) ||
+ (IO->NextState == eAbort) )
+ ShutDownCLient(IO);
+ else {
+ ev_io_start(event_base, &IO->send_event);
+
+ IO->active_event = SEND_EVENT;
+ }
+ break;
+ case eReadMessage:
+ if (StrBufCheckBuffer(&IO->RecvBuf) == eBufferNotEmpty) {
+ HandleInbound(IO);
+ }
+ else {
+ ev_io_start(event_base, &IO->recv_event);
+
+ IO->active_event = RECV_EVENT;
+ }
+
+ break;
+ case eTerminateConnection:
+ case eAbort:
+ break;
+ }
}
else if (rc > 0)
- return;
+ ShutDownCLient(IO);
// else
///abort!
}
static void
-IO_recv_callback(int fd, short event, void *ctx)
+IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
{
ssize_t nbytes;
- AsyncIO *IO = ctx;
+ AsyncIO *IO = watcher->data;
// assert(fd == IO->sock);
// assert(fd == sb->fd);
-
- nbytes = StrBuf_read_one_chunk_callback(fd, event, &IO->RecvBuf);
+/*
+ CtdlLogPrintf(CTDL_DEBUG, "EVENT <- %d : [%s%s%s%s]\n",
+ (int) fd,
+ (event&EV_TIMEOUT) ? " timeout" : "",
+ (event&EV_READ) ? " read" : "",
+ (event&EV_WRITE) ? " write" : "",
+ (event&EV_SIGNAL) ? " signal" : "");
+*/
+ nbytes = StrBuf_read_one_chunk_callback(watcher->fd, 0 /*TODO */, &IO->RecvBuf);
if (nbytes > 0) {
HandleInbound(IO);
} else if (nbytes == 0) {
- /// TODO: this is a timeout??? sock_buff_invoke_free(sb, 0);
+ ShutDownCLient(IO);
+/// TODO: this is a timeout??? sock_buff_invoke_free(sb, 0); seems as if socket is gone then?
return;
} else if (nbytes == -1) {
/// TODO: FD is gone. kick it. sock_buff_invoke_free(sb, errno);
}
}
-void IOReadNextLine(AsyncIO *IO, int timeout)
+
+static void
+set_start_callback(struct ev_loop *loop, ev_io *watcher, int revents)
+{
+ AsyncIO *IO = watcher->data;
+
+ switch(IO->NextState) {
+ case eReadMessage:
+ ev_io_start(event_base, &IO->recv_event);
+ IO->active_event = RECV_EVENT;
+ break;
+ case eSendReply:
+ case eSendMore:
+ IO_send_callback(loop, watcher, revents);
+ break;
+ case eTerminateConnection:
+ case eAbort:
+ /// TODO: WHUT?
+ break;
+ }
+}
+
+static void
+IO_connect_callback(struct ev_loop *loop, ev_io *watcher, int revents)
{
+ AsyncIO *IO = watcher->data;
+ ev_io_stop(event_base, &IO->conn_event);
+ IO->active_event = 0;
+ set_start_callback(loop, watcher, revents);
}
-void IOReadNextBLOB(AsyncIO *IO, int timeout, long size)
+int event_connect_socket(AsyncIO *IO)
{
+ int fdflags;
+ int rc = -1;
+
+ IO->SendBuf.fd =
+ IO->RecvBuf.fd =
+ IO->sock = socket(IO->curr_ai->ai_family,
+ IO->curr_ai->ai_socktype,
+ IO->curr_ai->ai_protocol);
+
+ if (IO->sock < 0) {
+ CtdlLogPrintf(CTDL_ERR, "EVENT: socket() failed: %s\n", strerror(errno));
+ StrBufPrintf(IO->ErrMsg, "Failed to create socket: %s", strerror(errno));
+// freeaddrinfo(res);
+ return -1;
+ }
+ fdflags = fcntl(IO->sock, F_GETFL);
+ if (fdflags < 0) {
+ CtdlLogPrintf(CTDL_DEBUG,
+ "EVENT: unable to get socket flags! %s \n",
+ strerror(errno));
+ StrBufPrintf(IO->ErrMsg, "Failed to get socket flags: %s", strerror(errno));
+ return -1;
+ }
+ fdflags = fdflags | O_NONBLOCK;
+ if (fcntl(IO->sock, F_SETFL, fdflags) < 0) {
+ CtdlLogPrintf(CTDL_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->sock);
+ return -1;
+ }
+/* 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->sock, EV_READ);
+ IO->recv_event.data = IO;
+ ev_io_init(&IO->send_event, IO_send_callback, IO->sock, EV_WRITE);
+ IO->send_event.data = IO;
+
+ rc = connect(IO->sock, IO->curr_ai->ai_addr, IO->curr_ai->ai_addrlen);
+ if (rc >= 0) {
+//// freeaddrinfo(res);
+ ev_io_init(&IO->conn_event, IO_send_callback, IO->sock, EV_WRITE);
+ IO->conn_event.data = IO;
+ set_start_callback(event_base, &IO->conn_event, 0);
+
+ return 0;
+ }
+ else if (errno == EINPROGRESS) {
+ ev_io_init(&IO->conn_event, IO_connect_callback, IO->sock, EV_READ|EV_WRITE);
+ IO->conn_event.data = IO;
+/* TODO
+
+ event_set(&IO->conn_event,
+ IO->sock,
+ EV_READ|EV_WRITE|EV_PERSIST,
+ IO_connect_callback,
+ IO);
+*/
+ ev_io_start(event_base, &IO->conn_event);
+
+ IO->active_event = CONN_EVENT;
+ return 1;
+ }
+ else {
+ CtdlLogPrintf(CTDL_ERR, "connect() failed: %s\n", strerror(errno));
+ StrBufPrintf(IO->ErrMsg, "Failed to connect: %s", strerror(errno));
+ close(IO->sock);
+ IO->curr_ai = IO->curr_ai->ai_next;
+ if (IO->curr_ai != NULL)
+ return event_connect_socket(IO);
+ else
+ return -1;
+ }
}
void InitEventIO(AsyncIO *IO,
void *pData,
IO_CallBack ReadDone,
IO_CallBack SendDone,
+ IO_CallBack Terminate,
+ IO_CallBack Timeout,
+ IO_CallBack ConnFail,
+ IO_CallBack CustomDNS,
IO_LineReaderCallback LineReader,
int ReadFirst)
{
IO->Data = pData;
IO->SendDone = SendDone;
IO->ReadDone = ReadDone;
+ IO->Terminate = Terminate;
IO->LineReader = LineReader;
- event_set(&IO->recv_event,
- IO->sock,
- EV_READ|EV_PERSIST,
- IO_recv_callback,
- IO);
-
- event_set(&IO->send_event,
- IO->sock,
- EV_WRITE|EV_PERSIST,
- IO_send_callback,
- IO);
-
if (ReadFirst) {
IO->NextState = eReadMessage;
- event_add(&IO->recv_event, NULL);
}
else {
IO->NextState = eSendReply;
}
+
+ event_connect_socket(IO);
}
projects / citadel.git / blobdiff