X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fevent_client.c;h=c633f5357a1e845520eec5d9eee2a8f86439e696;hb=149b7a41b77a3cc0752fe88090e60ce7dae90a85;hp=7122ffc720035fe0102995cccfbe405346b34f8e;hpb=2e23d932ea71382aac3644619df7c6b69287aea5;p=citadel.git

diff --git a/citadel/event_client.c b/citadel/event_client.c
index 7122ffc72..c633f5357 100644
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -316,8 +316,8 @@ void StopClientWatchers(AsyncIO *IO, int CloseFD)
 
 	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;
 	}
 }
 
@@ -370,7 +370,22 @@ void PostInbound(AsyncIO *IO)
 	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);
+		default:
+			break;
+		}
 		break;
 	case eReadPayload:
 	case eReadMore:
@@ -581,12 +596,12 @@ IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 		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. */
@@ -814,12 +829,12 @@ IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 			// 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;
 	}
@@ -1039,7 +1054,7 @@ void InitIOStruct(AsyncIO *IO,
 	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;
@@ -1077,7 +1092,7 @@ int InitcURLIOStruct(AsyncIO *IO,
 	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;