X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fpop3client%2Fserv_pop3client.c;h=8a0d23c38f6c64537d9d2f44573082169509a43a;hb=cf7cb2463d47a4a9ed36c8d1c13f188418389437;hp=331a4d7c6de390d542b02f87a4e697bab4571d47;hpb=d406f030612c8793672a4172ae5d6d64a47dd5df;p=citadel.git

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index 331a4d7c6..8a0d23c38 100644
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -136,6 +136,8 @@ void DeletePOP3Aggregator(void *vptr)
 	FreeStrBuf(&ptr->IO.SendBuf.Buf);
 	FreeStrBuf(&ptr->IO.RecvBuf.Buf);
 	DeleteAsyncMsg(&ptr->IO.ReadMsg);
+	((struct CitContext*)ptr->IO.CitContext)->state = CON_IDLE;
+	((struct CitContext*)ptr->IO.CitContext)->kill_me = 1;
 	FreeAsyncIOContents(&ptr->IO);
 	free(ptr);
 }
@@ -163,8 +165,8 @@ eNextState FinalizePOP3AggrRun(AsyncIO *IO)
 	It = GetNewHashPos(POP3FetchUrls, 0);
 	pthread_mutex_lock(&POP3QueueMutex);
 	{
-		GetHashPosFromKey(POP3FetchUrls, SKEY(cptr->Url), It);
-		DeleteEntryFromHash(POP3FetchUrls, It);
+		if (GetHashPosFromKey(POP3FetchUrls, SKEY(cptr->Url), It))
+			DeleteEntryFromHash(POP3FetchUrls, It);
 	}
 	pthread_mutex_unlock(&POP3QueueMutex);
 	DeleteHashPos(&It);
@@ -594,6 +596,7 @@ void POP3SetTimeout(eNextState NextTCPState, pop3aggr *pMsg)
 	syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
 
 	switch (NextTCPState) {
+	case eSendFile:
 	case eSendReply:
 	case eSendMore:
 		Timeout = POP3_C_SendTimeouts[pMsg->State];
@@ -604,6 +607,7 @@ void POP3SetTimeout(eNextState NextTCPState, pop3aggr *pMsg)
   }
 */
 		break;
+	case eReadFile:
 	case eReadMessage:
 		Timeout = POP3_C_ReadTimeouts[pMsg->State];
 /*
@@ -718,12 +722,14 @@ eReadState POP3_C_ReadServerStatus(AsyncIO *IO)
 	case eAbort:
 		Finished = eReadFail;
 		break;
+	case eSendFile:
 	case eSendReply: 
 	case eSendMore:
 	case eReadMore:
 	case eReadMessage: 
 		Finished = StrBufChunkSipLine(IO->IOBuf, &IO->RecvBuf);
 		break;
+	case eReadFile:
 	case eReadPayload:
 		Finished = CtdlReadMessageBodyAsync(IO);
 		break;
@@ -760,10 +766,10 @@ eNextState pop3_connect_ip(AsyncIO *IO)
 
 	/////// SetConnectStatus(IO);
 
-	return InitEventIO(IO, cpptr, 
-			   POP3_C_ConnTimeout, 
-			   POP3_C_ReadTimeouts[0],
-			   1);
+	return EvConnectSock(IO, cpptr, 
+			     POP3_C_ConnTimeout, 
+			     POP3_C_ReadTimeouts[0],
+			     1);
 }
 
 eNextState pop3_get_one_host_ip_done(AsyncIO *IO)
@@ -846,7 +852,7 @@ int pop3_do_fetching(pop3aggr *cpptr)
 	cpptr->IO.Terminate     = POP3_C_Terminate;
 	cpptr->IO.LineReader    = POP3_C_ReadServerStatus;
 	cpptr->IO.ConnFail      = POP3_C_ConnFail;
-	cpptr->IO.DNSFail       = POP3_C_DNSFail;
+	cpptr->IO.DNS.Fail      = POP3_C_DNSFail;
 	cpptr->IO.Timeout       = POP3_C_Timeout;
 	cpptr->IO.ShutdownAbort = POP3_C_Shutdown;
 	
@@ -863,6 +869,9 @@ int pop3_do_fetching(pop3aggr *cpptr)
 	SubC = CloneContext (&pop3_client_CC);
 	SubC->session_specific_data = (char*) cpptr;
 	cpptr->IO.CitContext = SubC;
+	safestrncpy(SubC->cs_host, 
+		    ChrPtr(cpptr->Url),
+		    sizeof(SubC->cs_host)); 
 
 	if (cpptr->IO.ConnectMe->IsIP) {
 		QueueEventContext(&cpptr->IO,
@@ -1040,10 +1049,10 @@ void pop3client_scan_room(struct ctdlroom *qrbuf, void *data)
 	FreeStrBuf(&CfgData);
 }
 
+static int doing_pop3client = 0;
 
 void pop3client_scan(void) {
 	static time_t last_run = 0L;
-	static int doing_pop3client = 0;
 ///	struct pop3aggr *pptr;
 	time_t fastest_scan;
 	HashPos *it;
@@ -1108,7 +1117,8 @@ void pop3client_scan(void) {
 void pop3_cleanup(void)
 {
 	/* citthread_mutex_destroy(&POP3QueueMutex); TODO */
-//	DeleteHash(&POP3FetchUrls);
+	while (doing_pop3client != 0) ;
+	DeleteHash(&POP3FetchUrls);
 	DeleteHash(&POP3QueueRooms);
 }