}
-void ShutDownCLient(AsyncIO *IO)
+void StopClientWatchers(AsyncIO *IO)
{
- CtdlLogPrintf(CTDL_DEBUG, "EVENT x %d\n", IO->sock);
-
- ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
+ ev_timer_stop(event_base, &IO->conn_fail);
+ ev_io_stop(event_base, &IO->conn_event);
+ ev_idle_stop(event_base, &IO->unwind_stack);
- if (IO->sock != 0)
+ if (IO->SendBuf.fd != 0)
{
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->sock);
- IO->sock = 0;
+ close(IO->SendBuf.fd);
IO->SendBuf.fd = 0;
IO->RecvBuf.fd = 0;
}
+}
+
+void ShutDownCLient(AsyncIO *IO)
+{
+ CtdlLogPrintf(CTDL_DEBUG, "EVENT x %d\n", IO->SendBuf.fd);
+ 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);
IO->DNSChannel = NULL;
}
assert(IO->Terminate);
+ become_session(IO->CitContext);
IO->Terminate(IO);
}
{
eReadState Finished = eBufferNotEmpty;
+ become_session(IO->CitContext);
+
while ((Finished == eBufferNotEmpty) && (IO->NextState == eReadMessage)){
if (IO->RecvBuf.nBlobBytesWanted != 0) {
int rc;
AsyncIO *IO = watcher->data;
+ become_session(IO->CitContext);
rc = StrBuf_write_one_chunk_callback(watcher->fd, 0/*TODO*/, &IO->SendBuf);
if (rc == 0)
pchh = pch;
nbytes = StrLength(IO->SendBuf.Buf) - (pchh - pch);
- snprintf(fn, SIZ, "/tmp/foolog_ev_%s.%d", "smtpev", IO->sock);
+ snprintf(fn, SIZ, "/tmp/foolog_ev_%s.%d", "smtpev", IO->SendBuf.fd);
fd = fopen(fn, "a+");
fprintf(fd, "Read: BufSize: %ld BufContent: [",
}
break;
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eConnect:
case eTerminateConnection:
case eAbort:
break;
break;
case eSendReply:
case eSendMore:
+ become_session(IO->CitContext);
IO_send_callback(loop, &IO->send_event, revents);
break;
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eConnect:
case eTerminateConnection:
case eAbort:
/// TODO: WHUT?
}
static void
-IO_Timout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
+IO_Timeout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
{
AsyncIO *IO = watcher->data;
ev_timer_stop (event_base, &IO->rw_timeout);
+ become_session(IO->CitContext);
+
+ if (IO->SendBuf.fd != 0)
+ {
+ 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 = IO->RecvBuf.fd = 0;
+ }
+
assert(IO->Timeout);
- IO->Timeout(IO);
+ switch (IO->Timeout(IO))
+ {
+ case eAbort:
+ ShutDownCLient(IO);
+ default:
+ break;
+ }
}
+
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);
+
+ if (IO->SendBuf.fd != 0)
+ {
+ ev_io_stop(loop, &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 = IO->RecvBuf.fd = 0;
+ }
+ become_session(IO->CitContext);
+
assert(IO->ConnFail);
- IO->ConnFail(IO);
+ switch (IO->ConnFail(IO))
+ {
+ case eAbort:
+ ShutDownCLient(IO);
+ default:
+ break;
+
+ }
}
+
+static void
+IO_connfailimmediate_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
+{
+ AsyncIO *IO = watcher->data;
+
+ ev_idle_stop (event_base, &IO->conn_fail_immediate);
+
+ if (IO->SendBuf.fd != 0)
+ {
+ close(IO->SendBuf.fd);
+ IO->SendBuf.fd = IO->RecvBuf.fd = 0;
+ }
+ become_session(IO->CitContext);
+
+ assert(IO->ConnFail);
+ switch (IO->ConnFail(IO))
+ {
+ case eAbort:
+ ShutDownCLient(IO);
+ default:
+ break;
+
+ }
+}
+
static void
IO_connestd_callback(struct ev_loop *loop, ev_io *watcher, int revents)
{
HandleInbound(IO);
} else if (nbytes == 0) {
assert(IO->Timeout);
- IO->Timeout(IO); /* this is a timeout... */
+
+ switch (IO->Timeout(IO))
+ {
+ case eAbort:
+ ShutDownCLient(IO);
+ default:
+ break;
+ }
return;
} else if (nbytes == -1) {
/// TODO: FD is gone. kick it. sock_buff_invoke_free(sb, errno);
{
AsyncIO *IO = watcher->data;
CtdlLogPrintf(CTDL_DEBUG, "event: %s\n", __FUNCTION__);
+ become_session(IO->CitContext);
- IO->DNSQuery->PostDNS(IO);
+ switch (IO->DNSQuery->PostDNS(IO))
+ {
+ case eAbort:
+ ShutDownCLient(IO);
+ default:
+ break;
+ }
}
eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_rw_timeout)
int rc = -1;
IO->SendBuf.fd = IO->RecvBuf.fd =
- IO->sock = socket(
+ socket(
(IO->ConnectMe->IPv6)?PF_INET6:PF_INET,
SOCK_STREAM,
IPPROTO_TCP);
- if (IO->sock < 0) {
+ if (IO->SendBuf.fd < 0) {
CtdlLogPrintf(CTDL_ERR, "EVENT: socket() failed: %s\n", strerror(errno));
StrBufPrintf(IO->ErrMsg, "Failed to create socket: %s", strerror(errno));
// freeaddrinfo(res);
return eAbort;
}
- fdflags = fcntl(IO->sock, F_GETFL);
+ fdflags = fcntl(IO->SendBuf.fd, F_GETFL);
if (fdflags < 0) {
CtdlLogPrintf(CTDL_DEBUG,
"EVENT: unable to get socket flags! %s \n",
return eAbort;
}
fdflags = fdflags | O_NONBLOCK;
- if (fcntl(IO->sock, F_SETFL, fdflags) < 0) {
+ if (fcntl(IO->SendBuf.fd, 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);
+ 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...
* 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);
+ ev_io_init(&IO->recv_event, IO_recv_callback, IO->RecvBuf.fd, EV_READ);
IO->recv_event.data = IO;
- ev_io_init(&IO->send_event, IO_send_callback, IO->sock, EV_WRITE);
+ ev_io_init(&IO->send_event, IO_send_callback, IO->SendBuf.fd, 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);
+ ev_timer_init(&IO->rw_timeout, IO_Timeout_callback, first_rw_timeout, 0);
IO->rw_timeout.data = IO;
if (IO->ConnectMe->IPv6)
- rc = connect(IO->sock, &IO->ConnectMe->Addr, sizeof(struct sockaddr_in6));
+ rc = connect(IO->SendBuf.fd, &IO->ConnectMe->Addr, sizeof(struct sockaddr_in6));
else
- rc = connect(IO->sock, (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){
+ CtdlLogPrintf(CTDL_DEBUG, "connect() immediate success.\n");
//// freeaddrinfo(res);
set_start_callback(event_base, IO, 0);
ev_timer_start(event_base, &IO->rw_timeout);
return IO->NextState;
}
else if (errno == EINPROGRESS) {
+ CtdlLogPrintf(CTDL_DEBUG, "connect() have to wait now.\n");
- ev_io_init(&IO->conn_event, IO_connestd_callback, IO->sock, 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);
return IO->NextState;
}
else {
+ ev_idle_init(&IO->conn_fail_immediate,
+ IO_connfailimmediate_callback);
+ IO->conn_fail_immediate.data = IO;
+ ev_idle_start(event_base, &IO->conn_fail_immediate);
+
CtdlLogPrintf(CTDL_ERR, "connect() failed: %s\n", strerror(errno));
StrBufPrintf(IO->ErrMsg, "Failed to connect: %s", strerror(errno));
- assert(IO->ConnFail);
- IO->ConnFail(IO);
- return eAbort;
+ return IO->NextState;
}
return IO->NextState;
}
int ReadFirst)
{
IO->Data = pData;
+ become_session(IO->CitContext);
if (ReadFirst) {
IO->NextState = eReadMessage;
projects / citadel.git / blobdiff