X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fpop3client%2Fserv_pop3client.c;h=2d4c02530adc6470a0b9ed460abfc766c5ed0b8d;hb=66f09fdd7c3f58e13ed01431dd5148302327ca6e;hp=ec744849f8af80e4d6aa4ff34015027349702995;hpb=ff7f36e7a7ad88d75d1201a78cb60dc6b2cce299;p=citadel.git

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index ec744849f..2d4c02530 100644
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -332,6 +332,17 @@ eNextState POP3C_GetListOneLine(pop3aggr *RecvMsg)
 		return eSendReply;
 
 	}
+
+	/*
+	 * work around buggy pop3 servers which send
+	 * empty lines in their listings.
+	*/
+	if ((StrLength(RecvMsg->IO.IOBuf) == 0) ||
+	    !isdigit(ChrPtr(RecvMsg->IO.IOBuf)[0]))
+	{
+		return eReadMore;
+	}
+
 	OneMsg = (FetchItem*) malloc(sizeof(FetchItem));
 	memset(OneMsg, 0, sizeof(FetchItem));
 	OneMsg->MSGID = atol(ChrPtr(RecvMsg->IO.IOBuf));
@@ -362,7 +373,6 @@ eNextState POP3_FetchNetworkUsetableEntry(AsyncIO *IO)
 	long HKLen;
 	const char *HKey;
 	void *vData;
-	struct cdbdata *cdbut;
 	pop3aggr *RecvMsg = (pop3aggr *) IO->Data;
 
 	if((RecvMsg->Pos != NULL) &&
@@ -372,32 +382,19 @@ eNextState POP3_FetchNetworkUsetableEntry(AsyncIO *IO)
 			  &HKey,
 			  &vData))
 	{
-		struct UseTable ut;
 		if (server_shutting_down)
 			return eAbort;
 
-		RecvMsg->CurrMsg = (FetchItem*) vData;
-		EVP3CCS_syslog(LOG_DEBUG,
-			       "CHECKING: whether %s has already been seen: ",
-			       ChrPtr(RecvMsg->CurrMsg->MsgUID));
-
-		/* Find out if we've already seen this item */
-		safestrncpy(ut.ut_msgid,
-			    ChrPtr(RecvMsg->CurrMsg->MsgUID),
-			    sizeof(ut.ut_msgid));
-		ut.ut_timestamp = time(NULL);/// TODO: libev timestamp!
-
-		cdbut = cdb_fetch(CDB_USETABLE, SKEY(RecvMsg->CurrMsg->MsgUID));
-		if (cdbut != NULL) {
+		if (CheckIfAlreadySeen("POP3 Item Seen",
+				       RecvMsg->CurrMsg->MsgUID,
+				       IO->Now,
+				       IO->Now, //// todo
+				       eCheckUpdate,
+				       IO->ID, CCID)
+		    != 0)
+		{
 			/* Item has already been seen */
-			EVP3CCSM_syslog(LOG_DEBUG, "YES\n");
-			cdb_free(cdbut);
-
-			/* rewrite the record anyway, to update the timestamp */
-			cdb_store(CDB_USETABLE,
-				  SKEY(RecvMsg->CurrMsg->MsgUID),
-				  &ut, sizeof(struct UseTable) );
-			RecvMsg->CurrMsg->NeedFetch = 0; ////TODO0;
+			RecvMsg->CurrMsg->NeedFetch = 0;
 		}
 		else
 		{
@@ -537,21 +534,17 @@ eNextState POP3C_ReadMessageBodyFollowing(pop3aggr *RecvMsg)
 eNextState POP3C_StoreMsgRead(AsyncIO *IO)
 {
 	pop3aggr *RecvMsg = (pop3aggr *) IO->Data;
-	struct UseTable ut;
 
 	EVP3CCS_syslog(LOG_DEBUG,
 		       "MARKING: %s as seen: ",
 		       ChrPtr(RecvMsg->CurrMsg->MsgUID));
+	CheckIfAlreadySeen("POP3 Item Seen",
+			   RecvMsg->CurrMsg->MsgUID,
+			   IO->Now,
+			   IO->Now, //// todo
+			   eWrite,
+			   IO->ID, CCID);
 
-	safestrncpy(ut.ut_msgid,
-		    ChrPtr(RecvMsg->CurrMsg->MsgUID),
-		    sizeof(ut.ut_msgid));
-	ut.ut_timestamp = time(NULL); /* TODO: use libev time */
-	cdb_store(CDB_USETABLE,
-		  ChrPtr(RecvMsg->CurrMsg->MsgUID),
-		  StrLength(RecvMsg->CurrMsg->MsgUID),
-		  &ut,
-		  sizeof(struct UseTable) );
 	StopDBWatchers(IO);
 	return QueueEventContext(&RecvMsg->IO, POP3_C_ReAttachToFetchMessages);
 }
@@ -1083,6 +1076,7 @@ void pop3client_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *One
 		    DeletePOP3Aggregator);
 
 		pthread_mutex_unlock(&POP3QueueMutex);
+		pLine = pLine->next;
 
 	}
 }