projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
[citadel.git]
/
citadel
/
event_client.c
diff --git
a/citadel/event_client.c
b/citadel/event_client.c
index 999c9e4546c1b989efc6fb93c6f6ab8df8394b8f..fad9eefeccaa5dea30651ba65cc482a1baa19d65 100644
(file)
--- a/
citadel/event_client.c
+++ b/
citadel/event_client.c
@@
-27,6
+27,7
@@
#include "ctdl_module.h"
#include "event_client.h"
#include "citserver.h"
#include "ctdl_module.h"
#include "event_client.h"
#include "citserver.h"
+#include "config.h"
ConstStr IOStates[] = {
{HKEY("DB Queue")},
ConstStr IOStates[] = {
{HKEY("DB Queue")},
@@
-156,7
+157,7
@@
DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
AsyncIO *IO = watcher->data;
SetEVState(IO, eDBNext);
AsyncIO *IO = watcher->data;
SetEVState(IO, eDBNext);
- IO->Now = ev_now(event_db);
+ IO->
CitContext->lastcmd = IO->
Now = ev_now(event_db);
EV_syslog(LOG_DEBUG, "%s()", __FUNCTION__);
become_session(IO->CitContext);
EV_syslog(LOG_DEBUG, "%s()", __FUNCTION__);
become_session(IO->CitContext);
@@
-220,7
+221,7
@@
static void IO_abort_shutdown_callback(struct ev_loop *loop,
SetEVState(IO, eIOAbort);
EV_syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
SetEVState(IO, eIOAbort);
EV_syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
- IO->Now = ev_now(event_base);
+ IO->
CitContext->lastcmd = IO->
Now = ev_now(event_base);
assert(IO->ShutdownAbort);
IO->ShutdownAbort(IO);
}
assert(IO->ShutdownAbort);
IO->ShutdownAbort(IO);
}
@@
-543,7
+544,7
@@
IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
AsyncIO *IO = watcher->data;
const char *errmsg = NULL;
AsyncIO *IO = watcher->data;
const char *errmsg = NULL;
- IO->Now = ev_now(event_base);
+ IO->
CitContext->lastcmd = IO->
Now = ev_now(event_base);
become_session(IO->CitContext);
#ifdef BIGBAD_IODBG
{
become_session(IO->CitContext);
#ifdef BIGBAD_IODBG
{
@@
-720,7
+721,7
@@
IO_Timeout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
AsyncIO *IO = watcher->data;
SetEVState(IO, eIOTimeout);
AsyncIO *IO = watcher->data;
SetEVState(IO, eIOTimeout);
- IO->Now = ev_now(event_base);
+ IO->
CitContext->lastcmd = IO->
Now = ev_now(event_base);
ev_timer_stop (event_base, &IO->rw_timeout);
become_session(IO->CitContext);
ev_timer_stop (event_base, &IO->rw_timeout);
become_session(IO->CitContext);
@@
-749,7
+750,7
@@
IO_connfail_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
AsyncIO *IO = watcher->data;
SetEVState(IO, eIOConnfail);
AsyncIO *IO = watcher->data;
SetEVState(IO, eIOConnfail);
- IO->Now = ev_now(event_base);
+ IO->
CitContext->lastcmd = IO->
Now = ev_now(event_base);
ev_timer_stop (event_base, &IO->conn_fail);
if (IO->SendBuf.fd != 0)
ev_timer_stop (event_base, &IO->conn_fail);
if (IO->SendBuf.fd != 0)
@@
-782,7
+783,7
@@
IO_connfailimmediate_callback(struct ev_loop *loop,
AsyncIO *IO = watcher->data;
SetEVState(IO, eIOConnfailNow);
AsyncIO *IO = watcher->data;
SetEVState(IO, eIOConnfailNow);
- IO->Now = ev_now(event_base);
+ IO->
CitContext->lastcmd = IO->
Now = ev_now(event_base);
ev_idle_stop (event_base, &IO->conn_fail_immediate);
if (IO->SendBuf.fd != 0)
ev_idle_stop (event_base, &IO->conn_fail_immediate);
if (IO->SendBuf.fd != 0)
@@
-812,7
+813,7
@@
IO_connestd_callback(struct ev_loop *loop, ev_io *watcher, int revents)
int err;
SetEVState(IO, eIOConnNow);
int err;
SetEVState(IO, eIOConnNow);
- IO->Now = ev_now(event_base);
+ IO->
CitContext->lastcmd = IO->
Now = ev_now(event_base);
EVM_syslog(LOG_DEBUG, "connect() succeeded.\n");
ev_io_stop(loop, &IO->conn_event);
EVM_syslog(LOG_DEBUG, "connect() succeeded.\n");
ev_io_stop(loop, &IO->conn_event);
@@
-846,7
+847,7
@@
IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
ssize_t nbytes;
AsyncIO *IO = watcher->data;
ssize_t nbytes;
AsyncIO *IO = watcher->data;
- IO->Now = ev_now(event_base);
+ IO->
CitContext->lastcmd = IO->
Now = ev_now(event_base);
switch (IO->NextState) {
case eReadFile:
nbytes = FileRecvChunked(&IO->IOB, &errmsg);
switch (IO->NextState) {
case eReadFile:
nbytes = FileRecvChunked(&IO->IOB, &errmsg);
@@
-932,7
+933,7
@@
IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
AsyncIO *IO = watcher->data;
SetEVState(IO, eCaresFinished);
AsyncIO *IO = watcher->data;
SetEVState(IO, eCaresFinished);
- IO->Now = ev_now(event_base);
+ IO->
CitContext->lastcmd = IO->
Now = ev_now(event_base);
EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
become_session(IO->CitContext);
assert(IO->DNS.Query->PostDNS);
EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
become_session(IO->CitContext);
assert(IO->DNS.Query->PostDNS);
@@
-1059,8
+1060,8
@@
eNextState EvConnectSock(AsyncIO *IO,
memset(&egress_sin, 0, sizeof(egress_sin));
egress_sin.sin_family = AF_INET;
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 (egress_sin.sin_addr.s_addr == !INADDR_ANY) {
egress_sin.sin_addr.s_addr = INADDR_ANY;
}