#include "citadel_dirs.h"
#include "event_client.h"
+#include "ctdl_module.h"
+static void IO_Timeout_callback(struct ev_loop *loop, ev_timer *watcher, int revents);
static void IO_abort_shutdown_callback(struct ev_loop *loop,
ev_cleanup *watcher,
- int revents)
-{
- AsyncIO *IO = watcher->data;
- EV_syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
-
- assert(IO->ShutdownAbort);
- IO->ShutdownAbort(IO);
-}
+ int revents);
/*------------------------------------------------------------------------------
EVM_syslog(LOG_DEBUG, "DBEVENT Terminating.\n");
ev_cleanup_stop(event_db, &IO->db_abort_by_shutdown);
- assert(IO->Terminate);
- IO->Terminate(IO);
+ assert(IO->DBTerminate);
+ IO->DBTerminate(IO);
}
void
DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
{
AsyncIO *IO = watcher->data;
- EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
+ IO->Now = ev_now(event_db);
+ EV_syslog(LOG_DEBUG, "%s()", __FUNCTION__);
become_session(IO->CitContext);
ev_idle_stop(event_db, &IO->db_unwind_stack);
extern ev_async AddJob;
extern ev_async ExitEventLoop;
+static void IO_abort_shutdown_callback(struct ev_loop *loop,
+ ev_cleanup *watcher,
+ int revents)
+{
+ AsyncIO *IO = watcher->data;
+ EV_syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
+ IO->Now = ev_now(event_base);
+ assert(IO->ShutdownAbort);
+ IO->ShutdownAbort(IO);
+}
+
eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB)
{
IO->Terminate(IO);
}
+void PostInbound(AsyncIO *IO)
+{
+ switch (IO->NextState) {
+ case eSendFile:
+ ev_io_start(event_base, &IO->send_event);
+ break;
+ case eSendReply:
+ case eSendMore:
+ assert(IO->SendDone);
+ IO->NextState = IO->SendDone(IO);
+ ev_io_start(event_base, &IO->send_event);
+ break;
+ case eReadPayload:
+ case eReadMore:
+ case eReadFile:
+ ev_io_start(event_base, &IO->recv_event);
+ break;
+ case eTerminateConnection:
+ ShutDownCLient(IO);
+ break;
+ case eAbort:
+ ShutDownCLient(IO);
+ break;
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eDBQuery:
+ case eConnect:
+ case eReadMessage:
+ break;
+ }
+}
eReadState HandleInbound(AsyncIO *IO)
{
const char *Err = NULL;
}
}
- switch (IO->NextState) {
- case eSendFile:
- ev_io_start(event_base, &IO->send_event);
- break;
- case eSendReply:
- case eSendMore:
- assert(IO->SendDone);
- IO->NextState = IO->SendDone(IO);
- ev_io_start(event_base, &IO->send_event);
- break;
- case eReadPayload:
- case eReadMore:
- case eReadFile:
- ev_io_start(event_base, &IO->recv_event);
- break;
- case eTerminateConnection:
- ShutDownCLient(IO);
- break;
- case eAbort:
- ShutDownCLient(IO);
- break;
- case eSendDNSQuery:
- case eReadDNSReply:
- case eDBQuery:
- case eConnect:
- case eReadMessage:
- break;
- }
+ PostInbound(IO);
+
return Finished;
}
AsyncIO *IO = watcher->data;
const char *errmsg = NULL;
+ IO->Now = ev_now(event_base);
become_session(IO->CitContext);
#ifdef BIGBAD_IODBG
{
case eSendFile:
if (IO->IOB.ChunkSendRemain > 0) {
ev_io_start(event_base, &IO->recv_event);
+ SetNextTimeout(IO, 100.0);
+
} else {
assert(IO->ReadDone);
IO->NextState = IO->ReadDone(IO);
}
}
else if (rc < 0) {
- assert(IO->Timeout);
- IO->Timeout(IO);
+ IO_Timeout_callback(loop, &IO->rw_timeout, revents);
}
/* else : must write more. */
}
{
AsyncIO *IO = watcher->data;
+ IO->Now = ev_now(event_base);
ev_timer_stop (event_base, &IO->rw_timeout);
become_session(IO->CitContext);
{
AsyncIO *IO = watcher->data;
+ IO->Now = ev_now(event_base);
ev_timer_stop (event_base, &IO->conn_fail);
if (IO->SendBuf.fd != 0)
{
AsyncIO *IO = watcher->data;
+ IO->Now = ev_now(event_base);
ev_idle_stop (event_base, &IO->conn_fail_immediate);
if (IO->SendBuf.fd != 0)
{
AsyncIO *IO = watcher->data;
+ IO->Now = ev_now(event_base);
ev_io_stop(loop, &IO->conn_event);
ev_timer_stop (event_base, &IO->conn_fail);
set_start_callback(loop, IO, revents);
ssize_t nbytes;
AsyncIO *IO = watcher->data;
+ IO->Now = ev_now(event_base);
switch (IO->NextState) {
case eReadFile:
nbytes = FileRecvChunked(&IO->IOB, &errmsg);
if (IO->IOB.ChunkSendRemain == 0)
{
IO->NextState = eSendReply;
+ assert(IO->ReadDone);
+ ev_io_stop(event_base, &IO->recv_event);
+ PostInbound(IO);
+ return;
}
else
return;
if (nbytes > 0) {
HandleInbound(IO);
} else if (nbytes == 0) {
- assert(IO->Timeout);
-
- switch (IO->Timeout(IO))
- {
- case eAbort:
- ShutDownCLient(IO);
- default:
- break;
- }
+ IO_Timeout_callback(loop, &IO->rw_timeout, revents);
return;
} else if (nbytes == -1) {
// FD is gone. kick it.
IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
{
AsyncIO *IO = watcher->data;
+ IO->Now = ev_now(event_base);
EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
become_session(IO->CitContext);
- assert(IO->DNS.Fail);
assert(IO->DNS.Query->PostDNS);
switch (IO->DNS.Query->PostDNS(IO))
{
case eAbort:
+ assert(IO->DNS.Fail);
switch (IO->DNS.Fail(IO)) {
case eAbort:
//// StopClientWatchers(IO);
double first_rw_timeout,
int ReadFirst)
{
+ struct sockaddr_in egress_sin;
int fdflags;
int rc = -1;
IO->rw_timeout.data = IO;
+
+
/* for debugging you may bypass it like this:
* IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1");
* ((struct sockaddr_in)IO->ConnectMe->Addr).sin_addr.s_addr =
* inet_addr("127.0.0.1");
*/
- if (IO->ConnectMe->IPv6)
+ if (IO->ConnectMe->IPv6) {
rc = connect(IO->SendBuf.fd,
&IO->ConnectMe->Addr,
sizeof(struct sockaddr_in6));
- else
+ }
+ else {
+ /* If citserver is bound to a specific IP address on the host, make
+ * sure we use that address for outbound connections.
+ */
+
+ memset(&egress_sin, 0, sizeof(egress_sin));
+ egress_sin.sin_family = AF_INET;
+ if (!IsEmptyStr(config.c_ip_addr)) {
+ egress_sin.sin_addr.s_addr = inet_addr(config.c_ip_addr);
+ if (egress_sin.sin_addr.s_addr == !INADDR_ANY) {
+ egress_sin.sin_addr.s_addr = INADDR_ANY;
+ }
+
+ /* If this bind fails, no problem; we can still use INADDR_ANY */
+ bind(IO->SendBuf.fd, (struct sockaddr *)&egress_sin, sizeof(egress_sin));
+ }
rc = connect(IO->SendBuf.fd,
(struct sockaddr_in *)&IO->ConnectMe->Addr,
sizeof(struct sockaddr_in));
+ }
if (rc >= 0){
EVM_syslog(LOG_DEBUG, "connect() immediate success.\n");
IO_CallBack SendDone,
IO_CallBack ReadDone,
IO_CallBack Terminate,
+ IO_CallBack DBTerminate,
IO_CallBack ConnFail,
IO_CallBack Timeout,
IO_CallBack ShutdownAbort)
IO->SendDone = SendDone;
IO->ReadDone = ReadDone;
IO->Terminate = Terminate;
+ IO->DBTerminate = DBTerminate;
IO->LineReader = LineReader;
IO->ConnFail = ConnFail;
IO->Timeout = Timeout;
const char* Desc,
IO_CallBack SendDone,
IO_CallBack Terminate,
+ IO_CallBack DBTerminate,
IO_CallBack ShutdownAbort)
{
IO->Data = Data;
IO->CitContext = CloneContext(CC);
((CitContext *)IO->CitContext)->session_specific_data = (char*) Data;
- IO->SendDone = SendDone;
- IO->Terminate = Terminate;
+ IO->SendDone = SendDone;
+ IO->Terminate = Terminate;
+ IO->DBTerminate = DBTerminate;
IO->ShutdownAbort = ShutdownAbort;
strcpy(IO->HttpReq.errdesc, Desc);
free(strings);
#endif
}
+
+
+ev_tstamp ctdl_ev_now (void)
+{
+ return ev_now(event_base);
+}
projects / citadel.git / blobdiff