#include "locate_host.h"
#include "citadel_dirs.h"
-#ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT
-
#include "event_client.h"
extern int event_add_pipe[2];
extern struct ev_loop *event_base;
-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);
{
ev_io_stop(event_base, &IO->send_event);
ev_io_stop(event_base, &IO->recv_event);
- ev_timer_stop (event_base, &IO->conn_fail);
- ev_timer_stop (event_base, &IO->conn_timeout);
+ ev_timer_stop (event_base, &IO->rw_timeout);
close(IO->sock);
IO->sock = 0;
IO->SendBuf.fd = 0;
}
+
eReadState HandleInbound(AsyncIO *IO)
{
eReadState Finished = eBufferNotEmpty;
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;
}
-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;
- }
-}
-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;
+
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;
- memset( (struct sockaddr_in *)&saddr, '\0', sizeof( saddr ) );
-
- memcpy(&saddr.sin_addr,
- IO->HEnt->h_addr_list[0],
- sizeof(struct in_addr));
-
- saddr.sin_family = AF_INET;
- saddr.sin_port = htons(IO->dport);
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);
- ev_timer_init(&IO->conn_timeout, IO_Timout_callback, first_rw_timeout, 0);
- IO->conn_timeout.data = IO;
set_start_callback(event_base, IO, 0);
- ev_timer_start(event_base, &IO->conn_timeout);
+ ev_timer_start(event_base, &IO->rw_timeout);
return 0;
}
else if (errno == EINPROGRESS) {
- set_start_callback(event_base, IO, 0);
- ev_timer_init(&IO->conn_timeout,
- IO_Timout_callback,
- conn_timeout + first_rw_timeout, 0);
+
+ 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);
- ev_timer_start(event_base, &IO->conn_timeout);
-
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, int timeout)
+void SetNextTimeout(AsyncIO *IO, double timeout)
{
- ev_timer_init(&IO->conn_timeout,
- IO_Timout_callback,
- timeout, 0);
- ev_timer_again (event_base, &IO->conn_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;
- IO->ConnFail = ConnFail;
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