/*
- *
* Copyright (c) 1998-2012 by the citadel.org team
*
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include "sysdep.h"
if (Ctx) {
Ctx->state = CON_IDLE;
Ctx->kill_me = 1;
+ IO->CitContext = NULL;
}
}
-void StopClientWatchers(AsyncIO *IO)
+void StopClientWatchers(AsyncIO *IO, int CloseFD)
{
ev_timer_stop (event_base, &IO->rw_timeout);
ev_timer_stop(event_base, &IO->conn_fail);
ev_io_stop(event_base, &IO->send_event);
ev_io_stop(event_base, &IO->recv_event);
- if (IO->SendBuf.fd != 0) {
+ 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 Terminating \n");
- StopClientWatchers(IO);
+ StopClientWatchers(IO, 1);
if (IO->DNS.Channel != NULL) {
ares_destroy(IO->DNS.Channel);
}
else if (rc < 0) {
if (errno != EAGAIN) {
- StopClientWatchers(IO);
+ StopClientWatchers(IO, 1);
EV_syslog(LOG_DEBUG,
"EVENT: Socket Invalid! [%d] [%s] [%d]\n",
errno, strerror(errno), IO->SendBuf.fd);
if (nbytes > 0) {
HandleInbound(IO);
} else if (nbytes == 0) {
- SetNextTimeout(IO, 0.0);
+ StopClientWatchers(IO, 1);
+ SetNextTimeout(IO, 0.01);
return;
} else if (nbytes == -1) {
if (errno != EAGAIN) {
// FD is gone. kick it.
- StopClientWatchers(IO);
+ StopClientWatchers(IO, 1);
EV_syslog(LOG_DEBUG,
"EVENT: Socket Invalid! [%d] [%s] [%d]\n",
errno, strerror(errno), IO->SendBuf.fd);
IO->Data = Data;
IO->CitContext = CloneContext(CC);
- ((CitContext *)IO->CitContext)->session_specific_data = (char*) Data;
+ IO->CitContext->session_specific_data = (char*) Data;
+ IO->CitContext->IO = IO;
IO->NextState = NextState;
IO->Data = Data;
IO->CitContext = CloneContext(CC);
- ((CitContext *)IO->CitContext)->session_specific_data = (char*) Data;
+ IO->CitContext->session_specific_data = (char*) Data;
+ IO->CitContext->IO = IO;
IO->SendDone = SendDone;
IO->Terminate = Terminate;
}
+
+typedef struct KillOtherSessionContext {
+ AsyncIO IO;
+ AsyncIO *OtherOne;
+}KillOtherSessionContext;
+
+eNextState KillTerminate(AsyncIO *IO)
+{
+ KillOtherSessionContext *Ctx = (KillOtherSessionContext*)IO->Data;
+ EV_syslog(LOG_DEBUG, "%s Exit\n", __FUNCTION__);
+ FreeAsyncIOContents(IO);
+ memset(Ctx, 0, sizeof(KillOtherSessionContext));
+ free(Ctx);
+ return eAbort;
+
+}
+
+eNextState KillShutdown(AsyncIO *IO)
+{
+ return eTerminateConnection;
+}
+
+eNextState KillOtherContextNow(AsyncIO *IO)
+{
+ KillOtherSessionContext *Ctx = IO->Data;
+
+ if (Ctx->OtherOne->ShutdownAbort != NULL)
+ Ctx->OtherOne->ShutdownAbort(Ctx->OtherOne);
+ return eTerminateConnection;
+}
+
+void KillAsyncIOContext(AsyncIO *IO)
+{
+ KillOtherSessionContext *Ctx;
+
+ Ctx = (KillOtherSessionContext*) malloc(sizeof(KillOtherSessionContext));
+ memset(Ctx, 0, sizeof(KillOtherSessionContext));
+
+ InitIOStruct(&Ctx->IO,
+ Ctx,
+ eReadMessage,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ KillTerminate,
+ NULL,
+ NULL,
+ NULL,
+ KillShutdown);
+
+ Ctx->OtherOne = IO;
+
+ switch(IO->NextState) {
+ case eSendDNSQuery:
+ case eReadDNSReply:
+
+ case eConnect:
+ case eSendReply:
+ case eSendMore:
+ case eSendFile:
+
+ case eReadMessage:
+ case eReadMore:
+ case eReadPayload:
+ case eReadFile:
+ QueueEventContext(&Ctx->IO, KillOtherContextNow);
+ break;
+ case eDBQuery:
+ QueueDBOperation(&Ctx->IO, KillOtherContextNow);
+ break;
+ case eTerminateConnection:
+ case eAbort:
+ /*hm, its already dying, dunno which Queue its in... */
+ free(Ctx);
+ }
+
+}
+
extern int DebugEventLoopBacktrace;
void EV_backtrace(AsyncIO *IO)
{