* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-
#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <termios.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <pwd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <syslog.h>
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-#include <sys/wait.h>
-#include <ctype.h>
+#include <stdio.h>
#include <string.h>
-#include <limits.h>
+#include <syslog.h>
+#include <assert.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <assert.h>
#if HAVE_BACKTRACE
#include <execinfo.h>
#endif
#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
+
+#include "ctdl_module.h"
+#include "event_client.h"
#include "citserver.h"
-#include "support.h"
#include "config.h"
-#include "control.h"
-#include "user_ops.h"
-#include "database.h"
-#include "msgbase.h"
-#include "internet_addressing.h"
-#include "genstamp.h"
-#include "domain.h"
-#include "clientsocket.h"
-#include "locate_host.h"
-#include "citadel_dirs.h"
-#include "event_client.h"
-#include "ctdl_module.h"
+ConstStr IOStates[] = {
+ {HKEY("DB Queue")},
+ {HKEY("DB Q Next")},
+ {HKEY("DB Attach")},
+ {HKEY("DB Next")},
+ {HKEY("DB Stop")},
+ {HKEY("DB Exit")},
+ {HKEY("DB Terminate")},
+ {HKEY("IO Queue")},
+ {HKEY("IO Attach")},
+ {HKEY("IO Connect Socket")},
+ {HKEY("IO Abort")},
+ {HKEY("IO Timeout")},
+ {HKEY("IO ConnFail")},
+ {HKEY("IO ConnFail Now")},
+ {HKEY("IO Conn Now")},
+ {HKEY("IO Conn Wait")},
+ {HKEY("Curl Q")},
+ {HKEY("Curl Start")},
+ {HKEY("Curl Shotdown")},
+ {HKEY("Curl More IO")},
+ {HKEY("Curl Got IO")},
+ {HKEY("Curl Got Data")},
+ {HKEY("Curl Got Status")},
+ {HKEY("C-Ares Start")},
+ {HKEY("C-Ares IO Done")},
+ {HKEY("C-Ares Finished")},
+ {HKEY("C-Ares exit")},
+ {HKEY("Killing")},
+ {HKEY("Exit")}
+};
+
+void SetEVState(AsyncIO *IO, eIOState State)
+{
+
+ CitContext* CCC = IO->CitContext;
+ if (CCC != NULL)
+ memcpy(CCC->lastcmdname, IOStates[State].Key, IOStates[State].len + 1);
+}
+
+eNextState QueueAnEventContext(AsyncIO *IO);
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,
extern ev_async DBAddJob;
extern ev_async DBExitEventLoop;
-eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
+eNextState QueueAnDBOperation(AsyncIO *IO)
{
IOAddHandler *h;
int i;
+ SetEVState(IO, eDBQ);
h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
h->IO = IO;
- h->EvAttch = CB;
+
+ assert(IO->ReAttachCB != NULL);
+
+ h->EvAttch = IO->ReAttachCB;
ev_cleanup_init(&IO->db_abort_by_shutdown,
IO_abort_shutdown_callback);
IO->db_abort_by_shutdown.data = IO;
ev_async_send (event_db, &DBAddJob);
pthread_mutex_unlock(&DBEventExitQueueMutex);
- EVM_syslog(LOG_DEBUG, "DBEVENT Q Done.\n");
+ EVQM_syslog(LOG_DEBUG, "DBEVENT Q Done.\n");
return eDBQuery;
}
void StopDBWatchers(AsyncIO *IO)
{
+ SetEVState(IO, eDBStop);
ev_cleanup_stop(event_db, &IO->db_abort_by_shutdown);
ev_idle_stop(event_db, &IO->db_unwind_stack);
}
CitContext *Ctx =IO->CitContext;
become_session(Ctx);
+ SetEVState(IO, eDBTerm);
EVM_syslog(LOG_DEBUG, "DBEVENT Terminating.\n");
StopDBWatchers(IO);
DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
{
AsyncIO *IO = watcher->data;
- IO->Now = ev_now(event_db);
+
+ SetEVState(IO, eDBNext);
+ SET_EV_TIME(IO, event_db);
EV_syslog(LOG_DEBUG, "%s()", __FUNCTION__);
become_session(IO->CitContext);
assert(IO->NextDBOperation);
switch (IO->NextDBOperation(IO))
{
+ case eSendReply:
+ ev_cleanup_stop(loop, &IO->db_abort_by_shutdown);
+ QueueAnEventContext(IO);
+ break;
case eDBQuery:
break;
case eSendDNSQuery:
case eReadDNSReply:
case eConnect:
- case eSendReply:
case eSendMore:
case eSendFile:
case eReadMessage:
eNextState NextDBOperation(AsyncIO *IO, IO_CallBack CB)
{
+ SetEVState(IO, eQDBNext);
IO->NextDBOperation = CB;
ev_idle_init(&IO->db_unwind_stack,
DB_PerformNext);
int revents)
{
AsyncIO *IO = watcher->data;
+
+ SetEVState(IO, eIOAbort);
EV_syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
- IO->Now = ev_now(event_base);
+ SET_EV_TIME(IO, event_base);
assert(IO->ShutdownAbort);
IO->ShutdownAbort(IO);
}
-eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB)
+eNextState QueueAnEventContext(AsyncIO *IO)
{
IOAddHandler *h;
int i;
+ SetEVState(IO, eIOQ);
h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
h->IO = IO;
- h->EvAttch = CB;
+
+ assert(IO->ReAttachCB != NULL);
+
+ h->EvAttch = IO->ReAttachCB;
+
ev_cleanup_init(&IO->abort_by_shutdown,
IO_abort_shutdown_callback);
IO->abort_by_shutdown.data = IO;
return eSendReply;
}
+eNextState EventQueueDBOperation(AsyncIO *IO, IO_CallBack CB, int CloseFDs)
+{
+ StopClientWatchers(IO, CloseFDs);
+ IO->ReAttachCB = CB;
+ return eDBQuery;
+}
+eNextState DBQueueEventContext(AsyncIO *IO, IO_CallBack CB)
+{
+ StopDBWatchers(IO);
+ IO->ReAttachCB = CB;
+ return eSendReply;
+}
+
+eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB)
+{
+ IO->ReAttachCB = CB;
+ return QueueAnEventContext(IO);
+}
+
extern eNextState evcurl_handle_start(AsyncIO *IO);
eNextState QueueCurlContext(AsyncIO *IO)
IOAddHandler *h;
int i;
+ SetEVState(IO, eCurlQ);
h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
h->IO = IO;
h->EvAttch = evcurl_handle_start;
return eSendReply;
}
-void DestructCAres(AsyncIO *IO);
+eNextState CurlQueueDBOperation(AsyncIO *IO, IO_CallBack CB)
+{
+ StopCurlWatchers(IO);
+ IO->ReAttachCB = CB;
+ return eDBQuery;
+}
+
+
void FreeAsyncIOContents(AsyncIO *IO)
{
CitContext *Ctx = IO->CitContext;
FreeStrBuf(&IO->SendBuf.Buf);
FreeStrBuf(&IO->RecvBuf.Buf);
- DestructCAres(IO);
-
FreeURL(&IO->ConnectMe);
FreeStrBuf(&IO->HttpReq.ReplyData);
}
+void DestructCAres(AsyncIO *IO);
void StopClientWatchers(AsyncIO *IO, int CloseFD)
{
+ EVM_syslog(LOG_DEBUG, "EVENT StopClientWatchers");
+
+ DestructCAres(IO);
+
ev_timer_stop (event_base, &IO->rw_timeout);
ev_timer_stop(event_base, &IO->conn_fail);
ev_idle_stop(event_base, &IO->unwind_stack);
if (CloseFD && (IO->SendBuf.fd > 0)) {
close(IO->SendBuf.fd);
- IO->SendBuf.fd = -1;
- IO->RecvBuf.fd = -1;
+ IO->SendBuf.fd = 0;
+ IO->RecvBuf.fd = 0;
}
}
void StopCurlWatchers(AsyncIO *IO)
{
+ EVM_syslog(LOG_DEBUG, "EVENT StopCurlWatchers \n");
+
ev_timer_stop (event_base, &IO->rw_timeout);
ev_timer_stop(event_base, &IO->conn_fail);
ev_idle_stop(event_base, &IO->unwind_stack);
ev_io_stop(event_base, &IO->send_event);
ev_io_stop(event_base, &IO->recv_event);
+ curl_easy_cleanup(IO->HttpReq.chnd);
+ IO->HttpReq.chnd = NULL;
+
if (IO->SendBuf.fd != 0) {
close(IO->SendBuf.fd);
}
IO->RecvBuf.fd = 0;
}
-void ShutDownCLient(AsyncIO *IO)
+eNextState ShutDownCLient(AsyncIO *IO)
{
CitContext *Ctx =IO->CitContext;
+
+ SetEVState(IO, eExit);
become_session(Ctx);
EVM_syslog(LOG_DEBUG, "EVENT Terminating \n");
IO->DNS.Channel = NULL;
}
assert(IO->Terminate);
- IO->Terminate(IO);
+ return IO->Terminate(IO);
}
void PostInbound(AsyncIO *IO)
{
+
switch (IO->NextState) {
case eSendFile:
ev_io_start(event_base, &IO->send_event);
case eSendMore:
assert(IO->SendDone);
IO->NextState = IO->SendDone(IO);
- ev_io_start(event_base, &IO->send_event);
+ switch (IO->NextState)
+ {
+ case eSendFile:
+ case eSendReply:
+ case eSendMore:
+ case eReadMessage:
+ case eReadPayload:
+ case eReadMore:
+ case eReadFile:
+ ev_io_start(event_base, &IO->send_event);
+ break;
+ case eDBQuery:
+ StopClientWatchers(IO, 0);
+ QueueAnDBOperation(IO);
+ default:
+ break;
+ }
break;
case eReadPayload:
case eReadMore:
ev_io_start(event_base, &IO->recv_event);
break;
case eTerminateConnection:
- ShutDownCLient(IO);
- break;
case eAbort:
- ShutDownCLient(IO);
+ if (ShutDownCLient(IO) == eDBQuery) {
+ QueueAnDBOperation(IO);
+ }
break;
case eSendDNSQuery:
case eReadDNSReply:
- case eDBQuery:
case eConnect:
case eReadMessage:
break;
+ case eDBQuery:
+ QueueAnDBOperation(IO);
}
}
eReadState HandleInbound(AsyncIO *IO)
}
if (Finished != eMustReadMore) {
- assert(IO->ReadDone);
ev_io_stop(event_base, &IO->recv_event);
IO->NextState = IO->ReadDone(IO);
- Finished = StrBufCheckBuffer(&IO->RecvBuf);
+ if (IO->NextState == eDBQuery) {
+ if (QueueAnDBOperation(IO) == eAbort)
+ return eReadFail;
+ else
+ return eReadSuccess;
+ }
+ else {
+ Finished = StrBufCheckBuffer(&IO->RecvBuf);
+ }
}
}
AsyncIO *IO = watcher->data;
const char *errmsg = NULL;
- IO->Now = ev_now(event_base);
+ SET_EV_TIME(IO, event_base);
become_session(IO->CitContext);
#ifdef BIGBAD_IODBG
{
IO->SendBuf.fd);
fd = fopen(fn, "a+");
+ if (fd == NULL) {
+ syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno));
+ cit_backtrace();
+ exit(1);
+ }
fprintf(fd, "Send: BufSize: %ld BufContent: [",
nbytes);
rv = fwrite(pchh, nbytes, 1, fd);
if (errno != EAGAIN) {
StopClientWatchers(IO, 1);
EV_syslog(LOG_DEBUG,
- "EVENT: Socket Invalid! [%d] [%s] [%d]\n",
+ "IO_send_callback(): Socket Invalid! [%d] [%s] [%d]\n",
errno, strerror(errno), IO->SendBuf.fd);
StrBufPrintf(IO->ErrMsg,
"Socket Invalid! [%s]",
strerror(errno));
- SetNextTimeout(IO, 0.0);
+ SetNextTimeout(IO, 0.01);
}
}
/* else : must write more. */
{
AsyncIO *IO = watcher->data;
- IO->Now = ev_now(event_base);
+ SetEVState(IO, eIOTimeout);
+ SET_EV_TIME(IO, event_base);
ev_timer_stop (event_base, &IO->rw_timeout);
become_session(IO->CitContext);
{
AsyncIO *IO = watcher->data;
- IO->Now = ev_now(event_base);
+ SetEVState(IO, eIOConnfail);
+ SET_EV_TIME(IO, 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);
+ SetEVState(IO, eIOConnfailNow);
+ SET_EV_TIME(IO, event_base);
ev_idle_stop (event_base, &IO->conn_fail_immediate);
if (IO->SendBuf.fd != 0)
socklen_t lon = sizeof(so_err);
int err;
- IO->Now = ev_now(event_base);
+ SetEVState(IO, eIOConnNow);
+ SET_EV_TIME(IO, event_base);
EVM_syslog(LOG_DEBUG, "connect() succeeded.\n");
ev_io_stop(loop, &IO->conn_event);
ssize_t nbytes;
AsyncIO *IO = watcher->data;
- IO->Now = ev_now(event_base);
+ SET_EV_TIME(IO, event_base);
switch (IO->NextState) {
case eReadFile:
nbytes = FileRecvChunked(&IO->IOB, &errmsg);
IO->SendBuf.fd);
fd = fopen(fn, "a+");
+ if (fd == NULL) {
+ syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno));
+ cit_backtrace();
+ exit(1);
+ }
fprintf(fd, "Read: BufSize: %ld BufContent: [",
nbytes);
rv = fwrite(pchh, nbytes, 1, fd);
// FD is gone. kick it.
StopClientWatchers(IO, 1);
EV_syslog(LOG_DEBUG,
- "EVENT: Socket Invalid! [%d] [%s] [%d]\n",
+ "IO_recv_callback(): Socket Invalid! [%d] [%s] [%d]\n",
errno, strerror(errno), IO->SendBuf.fd);
StrBufPrintf(IO->ErrMsg,
"Socket Invalid! [%s]",
strerror(errno));
- SetNextTimeout(IO, 0.0);
+ SetNextTimeout(IO, 0.01);
}
return;
}
IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
{
AsyncIO *IO = watcher->data;
- IO->Now = ev_now(event_base);
+
+ SetEVState(IO, eCaresFinished);
+ SET_EV_TIME(IO, event_base);
EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
become_session(IO->CitContext);
assert(IO->DNS.Query->PostDNS);
case eAbort:
//// StopClientWatchers(IO);
ShutDownCLient(IO);
+ break;
+ case eDBQuery:
+ StopClientWatchers(IO, 0);
+ QueueAnDBOperation(IO);
+ break;
default:
break;
}
+ case eDBQuery:
+ StopClientWatchers(IO, 0);
+ QueueAnDBOperation(IO);
+ break;
default:
break;
}
int fdflags;
int rc = -1;
+ SetEVState(IO, eIOConnectSock);
become_session(IO->CitContext);
if (ReadFirst) {
fdflags = fcntl(IO->SendBuf.fd, F_GETFL);
if (fdflags < 0) {
EV_syslog(LOG_ERR,
- "EVENT: unable to get socket flags! %s \n",
+ "EVENT: unable to get socket %d flags! %s \n",
+ IO->SendBuf.fd,
strerror(errno));
StrBufPrintf(IO->ErrMsg,
- "Failed to get socket flags: %s",
+ "Failed to get socket %d flags: %s",
+ IO->SendBuf.fd,
strerror(errno));
close(IO->SendBuf.fd);
IO->SendBuf.fd = IO->RecvBuf.fd = 0;
if (fcntl(IO->SendBuf.fd, F_SETFL, fdflags) < 0) {
EV_syslog(
LOG_ERR,
- "EVENT: unable to set socket nonblocking flags! %s \n",
+ "EVENT: unable to set socket %d nonblocking flags! %s \n",
+ IO->SendBuf.fd,
strerror(errno));
StrBufPrintf(IO->ErrMsg,
"Failed to set socket flags: %s",
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 (!IsEmptyStr(CtdlGetConfigStr("c_ip_addr"))) {
+ egress_sin.sin_addr.s_addr = inet_addr(CtdlGetConfigStr("c_ip_addr"));
if (egress_sin.sin_addr.s_addr == !INADDR_ANY) {
egress_sin.sin_addr.s_addr = INADDR_ANY;
}
}
if (rc >= 0){
- EVM_syslog(LOG_DEBUG, "connect() immediate success.\n");
+ SetEVState(IO, eIOConnNow);
+ EV_syslog(LOG_DEBUG, "connect() = %d immediate success.\n", IO->SendBuf.fd);
set_start_callback(event_base, IO, 0);
return IO->NextState;
}
else if (errno == EINPROGRESS) {
- EVM_syslog(LOG_DEBUG, "connect() have to wait now.\n");
+ SetEVState(IO, eIOConnWait);
+ EV_syslog(LOG_DEBUG, "connect() = %d have to wait now.\n", IO->SendBuf.fd);
ev_io_init(&IO->conn_event,
IO_connestd_callback,
return IO->NextState;
}
else {
+ SetEVState(IO, eIOConnfail);
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);
- EV_syslog(LOG_ERR, "connect() failed: %s\n", strerror(errno));
+ EV_syslog(LOG_ERR,
+ "connect() = %d failed: %s\n",
+ IO->SendBuf.fd,
+ strerror(errno));
+
StrBufPrintf(IO->ErrMsg,
"Failed to connect: %s",
strerror(errno));
void *pData,
int ReadFirst)
{
+ SetEVState(IO, eIOAttach);
IO->Data = pData;
become_session(IO->CitContext);
ev_cleanup_start(event_base, &IO->abort_by_shutdown);
IO->Data = Data;
IO->CitContext = CloneContext(CC);
- IO->CitContext->session_specific_data = (char*) Data;
+ IO->CitContext->session_specific_data = Data;
IO->CitContext->IO = IO;
IO->NextState = NextState;
IO->Data = Data;
IO->CitContext = CloneContext(CC);
- IO->CitContext->session_specific_data = (char*) Data;
+ IO->CitContext->session_specific_data = Data;
IO->CitContext->IO = IO;
IO->SendDone = SendDone;
eNextState KillTerminate(AsyncIO *IO)
{
+ long id;
KillOtherSessionContext *Ctx = (KillOtherSessionContext*)IO->Data;
EV_syslog(LOG_DEBUG, "%s Exit\n", __FUNCTION__);
+ id = IO->ID;
FreeAsyncIOContents(IO);
memset(Ctx, 0, sizeof(KillOtherSessionContext));
+ IO->ID = id; /* just for the case we want to analyze it in a coredump */
free(Ctx);
return eAbort;
{
KillOtherSessionContext *Ctx = IO->Data;
- if (Ctx->OtherOne->ShutdownAbort != NULL)
- Ctx->OtherOne->ShutdownAbort(Ctx->OtherOne);
+ SetEVState(IO, eKill);
+
+ if (Ctx->OtherOne->ShutdownAbort != NULL) {
+ Ctx->OtherOne->NextState = eAbort;
+ if (Ctx->OtherOne->ShutdownAbort(Ctx->OtherOne) == eDBQuery) {
+ StopClientWatchers(Ctx->OtherOne, 0);
+ QueueAnDBOperation(Ctx->OtherOne);
+ }
+ }
return eTerminateConnection;
}
case eReadMore:
case eReadPayload:
case eReadFile:
- QueueEventContext(&Ctx->IO, KillOtherContextNow);
+ Ctx->IO.ReAttachCB = KillOtherContextNow;
+ QueueAnEventContext(&Ctx->IO);
break;
case eDBQuery:
- QueueDBOperation(&Ctx->IO, KillOtherContextNow);
+ Ctx->IO.ReAttachCB = KillOtherContextNow;
+ QueueAnDBOperation(&Ctx->IO);
break;
case eTerminateConnection:
case eAbort:
projects / citadel.git / blobdiff