#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
-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);
- FreeStrBuf(&IO->ErrMsg);
ares_destroy(IO->DNSChannel);
-
}
-/*
- 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 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);
+ IO->Terminate(IO);
}
+
eReadState HandleInbound(AsyncIO *IO)
{
eReadState Finished = eBufferNotEmpty;
if (Finished != eMustReadMore) {
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);
+ 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)
}
#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);
+ 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;
IO->Timeout(IO);
/* else : must write more. */
}
+static void
+set_start_callback(struct ev_loop *loop, AsyncIO *IO, int revents)
+{
+
+ switch(IO->NextState) {
+ case eReadMessage:
+ ev_io_start(event_base, &IO->recv_event);
+ break;
+ case eSendReply:
+ case eSendMore:
+ IO_send_callback(loop, &IO->send_event, revents);
+ break;
+ case eTerminateConnection:
+ case eAbort:
+ /// TODO: WHUT?
+ break;
+ }
+}
static void
IO_Timout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
{
AsyncIO *IO = watcher->data;
+ ev_timer_stop (event_base, &IO->rw_timeout);
IO->Timeout(IO);
}
static void
{
AsyncIO *IO = watcher->data;
+ ev_timer_stop (event_base, &IO->conn_fail);
+ ev_io_stop(loop, &IO->conn_event);
IO->ConnFail(IO);
}
static void
+IO_connestd_callback(struct ev_loop *loop, ev_io *watcher, int revents)
+{
+ AsyncIO *IO = watcher->data;
+
+ 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;
-// 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) {
- IO->Timeout(IO);
-/// TODO: this is a timeout??? sock_buff_invoke_free(sb, 0); seems as if socket is gone then?
+ IO->Timeout(IO); /* this is a timeout... */
return;
} else if (nbytes == -1) {
/// TODO: FD is gone. kick it. sock_buff_invoke_free(sb, errno);
}
-static void
-set_start_callback(struct ev_loop *loop, AsyncIO *IO, int revents, int first_rw_timeout)
-{
- ev_timer_init(&IO->conn_timeout,
- IO_Timout_callback,
- first_rw_timeout, 0);
- IO->conn_timeout.data = IO;
-
- 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, &IO->send_event, revents);
- break;
- case eTerminateConnection:
- case eAbort:
- /// TODO: WHUT?
- break;
- }
-}
-int event_connect_socket(AsyncIO *IO, int conn_timeout, int first_rw_timeout)
+int event_connect_socket(AsyncIO *IO, double conn_timeout, double first_rw_timeout)
{
- struct sockaddr_in saddr;
int fdflags;
int rc = -1;
IO->SendBuf.fd = IO->RecvBuf.fd =
- IO->sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-/*
-IO->curr_ai->ai_family,
- IO->curr_ai->ai_socktype,
- IO->curr_ai->ai_protocol);
-*/
+ 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));
IO->recv_event.data = IO;
ev_io_init(&IO->send_event, IO_send_callback, IO->sock, EV_WRITE);
IO->send_event.data = IO;
-
- memset( (struct sockaddr_in *)&saddr, '\0', sizeof( saddr ) );
-
- memcpy(&saddr.sin_addr,
- IO->HEnt->h_addr_list[0],
- sizeof(struct in_addr));
-// saddr.sin_addr.s_addr = inet_addr("85.88.5.80");
- saddr.sin_family = AF_INET;
- saddr.sin_port = htons(IO->dport);
+ 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;
+
rc = connect(IO->sock,
- (struct sockaddr *) &saddr,
-/// TODO: ipv6?? (IO->HEnt->h_addrtype == AF_INET6)?
- /* sizeof(in6_addr):*/
+ (struct sockaddr *) &IO->Addr,
+ (IO->IP6)? ///HEnt->h_addrtype == AF_INET6)?
+ sizeof(struct in6_addr):
sizeof(struct sockaddr_in));
if (rc >= 0){
//// freeaddrinfo(res);
- set_start_callback(event_base, IO, 0, first_rw_timeout);
+ set_start_callback(event_base, IO, 0);
+ ev_timer_start(event_base, &IO->rw_timeout);
return 0;
}
else if (errno == EINPROGRESS) {
- set_start_callback(event_base, IO, 0, first_rw_timeout);
- ev_timer_init(&IO->conn_fail,
- IO_connfail_callback,
- conn_timeout, 0);
- IO->conn_fail.data = IO;
-
+
+ ev_io_init(&IO->conn_event, IO_connestd_callback, IO->sock, EV_READ|EV_WRITE);
+ IO->conn_event.data = IO;
+
+ ev_io_start(event_base, &IO->conn_event);
+ ev_timer_start(event_base, &IO->conn_fail);
return 0;
}
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;
+ IO->ConnFail(IO);
+ return -1;
}
}
+void SetNextTimeout(AsyncIO *IO, double timeout)
+{
+ IO->rw_timeout.repeat = timeout;
+ ev_timer_again (event_base, &IO->rw_timeout);
+}
+
void InitEventIO(AsyncIO *IO,
void *pData,
- IO_CallBack ReadDone,
- IO_CallBack SendDone,
- IO_CallBack Terminate,
- IO_CallBack Timeout,
- IO_CallBack ConnFail,
- IO_LineReaderCallback LineReader,
- int conn_timeout,
- int first_rw_timeout,
+ double conn_timeout,
+ double first_rw_timeout,
int ReadFirst)
{
IO->Data = pData;
- IO->SendDone = SendDone;
- IO->ReadDone = ReadDone;
- IO->Terminate = Terminate;
- IO->LineReader = LineReader;
if (ReadFirst) {
IO->NextState = eReadMessage;
// IO->res = HEnt->h_addr_list[0];
event_connect_socket(IO, conn_timeout, first_rw_timeout);
}
-
-
-#endif
projects / citadel.git / blobdiff