#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <assert.h>
+
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "locate_host.h"
#include "citadel_dirs.h"
-#ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT
-
#include "event_client.h"
extern int event_add_pipe[2];
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)
+int QueueEventContext(AsyncIO *IO, IO_CallBack CB)
{
IOAddHandler *h;
int i;
h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
- h->Ctx = Ctx;
+ h->IO = IO;
h->EvAttch = CB;
citthread_mutex_lock(&EventQueueMutex);
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);
-
- 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);
- }
-*/
void ShutDownCLient(AsyncIO *IO)
{
CtdlLogPrintf(CTDL_DEBUG, "EVENT x %d\n", IO->sock);
- switch (IO->active_event) {
- case SEND_EVENT:
+
+ if (IO->sock != 0)
+ {
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;
+ ev_timer_stop (event_base, &IO->rw_timeout);
+ close(IO->sock);
+ IO->sock = 0;
+ IO->SendBuf.fd = 0;
+ IO->RecvBuf.fd = 0;
}
-
- IO->active_event = 0;
- IO->Terminate(IO->Data);
+ 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;
+ }
+ assert(IO->Terminate);
+ IO->Terminate(IO);
}
+
eReadState HandleInbound(AsyncIO *IO)
{
eReadState Finished = eBufferNotEmpty;
-
+
while ((Finished == eBufferNotEmpty) && (IO->NextState == eReadMessage)){
if (IO->RecvBuf.nBlobBytesWanted != 0) {
}
if (Finished != eMustReadMore) {
+ assert(IO->ReadDone);
ev_io_stop(event_base, &IO->recv_event);
- IO->active_event = 0;
- IO->NextState = IO->ReadDone(IO->Data);
+ IO->NextState = IO->ReadDone(IO);
Finished = StrBufCheckBuffer(&IO->RecvBuf);
}
}
if ((IO->NextState == eSendReply) ||
(IO->NextState == eSendMore))
{
- IO->NextState = IO->SendDone(IO->Data);
+ assert(IO->SendDone);
+ IO->NextState = IO->SendDone(IO);
ev_io_start(event_base, &IO->send_event);
-
- IO->active_event = SEND_EVENT;
-
}
else if ((IO->NextState == eTerminateConnection) ||
(IO->NextState == eAbort) )
{
int rc;
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(watcher->fd, 0/*TODO*/, &IO->SendBuf);
if (rc == 0)
- {
-
+ {
#ifdef BIGBAD_IODBG
{
int rv = 0;
}
#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);
+ assert(IO->SendDone);
+ IO->NextState = IO->SendDone(IO);
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:
}
else {
ev_io_start(event_base, &IO->recv_event);
-
- IO->active_event = RECV_EVENT;
}
break;
break;
}
}
- else if (rc > 0)
- ShutDownCLient(IO);
-// else
- ///abort!
-}
-
-
-static void
-IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
-{
- ssize_t nbytes;
- AsyncIO *IO = watcher->data;
-
-// assert(fd == IO->sock);
-
-// assert(fd == sb->fd);
-/*
- 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) {
- 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);
- return;
+ else if (rc < 0) {
+ assert(IO->Timeout);
+ IO->Timeout(IO);
}
+ /* else : must write more. */
}
-
-
static void
-set_start_callback(struct ev_loop *loop, ev_io *watcher, int revents)
+set_start_callback(struct ev_loop *loop, AsyncIO *IO, 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);
+ IO_send_callback(loop, &IO->send_event, revents);
break;
case eTerminateConnection:
case eAbort:
}
static void
-IO_connect_callback(struct ev_loop *loop, ev_io *watcher, int revents)
+IO_Timout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
+{
+ AsyncIO *IO = watcher->data;
+
+ ev_timer_stop (event_base, &IO->rw_timeout);
+ assert(IO->Timeout);
+ IO->Timeout(IO);
+}
+static void
+IO_connfail_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
+{
+ AsyncIO *IO = watcher->data;
+
+ ev_timer_stop (event_base, &IO->conn_fail);
+ ev_io_stop(loop, &IO->conn_event);
+ assert(IO->ConnFail);
+ IO->ConnFail(IO);
+}
+static void
+IO_connestd_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);
+ ev_io_stop(loop, &IO->conn_event);
+ ev_timer_stop (event_base, &IO->conn_fail);
+ set_start_callback(loop, IO, revents);
+}
+static void
+IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
+{
+ ssize_t nbytes;
+ AsyncIO *IO = watcher->data;
+
+ nbytes = StrBuf_read_one_chunk_callback(watcher->fd, 0 /*TODO */, &IO->RecvBuf);
+ if (nbytes > 0) {
+ HandleInbound(IO);
+ } else if (nbytes == 0) {
+ assert(IO->Timeout);
+ IO->Timeout(IO); /* this is a timeout... */
+ return;
+ } else if (nbytes == -1) {
+/// TODO: FD is gone. kick it. sock_buff_invoke_free(sb, errno);
+ return;
+ }
}
-int event_connect_socket(AsyncIO *IO)
+void
+IO_postdns_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
+{
+ AsyncIO *IO = watcher->data;
+ IO->PostDNS(IO);
+}
+
+eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_rw_timeout)
{
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);
+ IO->SendBuf.fd = IO->RecvBuf.fd =
+ IO->sock = socket(
+ (IO->IP6)?PF_INET6:PF_INET,
+ SOCK_STREAM,
+ IPPROTO_TCP);
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;
+ return eAbort;
}
fdflags = fcntl(IO->sock, F_GETFL);
if (fdflags < 0) {
"EVENT: unable to get socket flags! %s \n",
strerror(errno));
StrBufPrintf(IO->ErrMsg, "Failed to get socket flags: %s", strerror(errno));
- return -1;
+ return eAbort;
}
fdflags = fdflags | O_NONBLOCK;
if (fcntl(IO->sock, F_SETFL, fdflags) < 0) {
strerror(errno));
StrBufPrintf(IO->ErrMsg, "Failed to set socket flags: %s", strerror(errno));
close(IO->sock);
- return -1;
+ return eAbort;
}
/* 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
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) {
+
+ ev_timer_init(&IO->conn_fail, IO_connfail_callback, conn_timeout, 0);
+ IO->conn_fail.data = IO;
+ ev_timer_init(&IO->rw_timeout, IO_Timout_callback, first_rw_timeout, 0);
+ IO->rw_timeout.data = IO;
+
+ if (IO->IP6)
+ rc = connect(IO->sock, &IO->Addr, sizeof(struct sockaddr_in6));
+ else
+ rc = connect(IO->sock, (struct sockaddr_in *)&IO->Addr, sizeof(struct sockaddr_in));
+
+ 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;
+ set_start_callback(event_base, IO, 0);
+ ev_timer_start(event_base, &IO->rw_timeout);
+ return IO->NextState;
}
else if (errno == EINPROGRESS) {
- ev_io_init(&IO->conn_event, IO_connect_callback, IO->sock, EV_READ|EV_WRITE);
+
+ ev_io_init(&IO->conn_event, IO_connestd_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;
+ ev_io_start(event_base, &IO->conn_event);
+ ev_timer_start(event_base, &IO->conn_fail);
+ return IO->NextState;
}
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;
+ assert(IO->ConnFail);
+ IO->ConnFail(IO);
+ return eAbort;
}
+ return IO->NextState;
}
-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)
+void SetNextTimeout(AsyncIO *IO, double timeout)
{
- IO->Data = pData;
- IO->SendDone = SendDone;
- IO->ReadDone = ReadDone;
- IO->Terminate = Terminate;
- IO->LineReader = LineReader;
+ IO->rw_timeout.repeat = timeout;
+ 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;
+
if (ReadFirst) {
IO->NextState = eReadMessage;
}
else {
IO->NextState = eSendReply;
}
-
- event_connect_socket(IO);
+ return event_connect_socket(IO, conn_timeout, first_rw_timeout);
}
-
-
-#endif
projects / citadel.git / blobdiff