/*
* Consolidate mail from remote POP3 accounts.
*
- * Copyright (c) 2007-2015 by the citadel.org team
+ * Copyright (c) 2007-2017 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
#define POP3C_OK (strncasecmp(ChrPtr(RecvMsg->IO.IOBuf), "+OK", 3) == 0)
int Pop3ClientID = 0;
-int POP3ClientDebugEnabled = 0;
#define N ((pop3aggr*)IO->Data)->n
-#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (POP3ClientDebugEnabled != 0))
-
-#define EVP3C_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "%s[%ld]CC[%d][%ld]POP3: " FORMAT, \
- IOSTR, IO->ID, CCID, N, __VA_ARGS__)
-
-#define EVP3CM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "%s[%ld]CC[%d][%ld]POP3: " FORMAT, \
- IOSTR, IO->ID, CCID, N)
-
-#define EVP3CQ_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "%s P3Q:" FORMAT, \
- IOSTR, __VA_ARGS__)
-
-#define EVP3CQM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "%s P3Q" FORMAT, \
- IOSTR)
-
-#define EVP3CCS_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, "%s[%ld][%ld]POP3: " FORMAT, \
- IOSTR, IO->ID, N, __VA_ARGS__)
-
-#define EVP3CCSM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, "%s[%ld][%ld]POP3: " FORMAT, \
- IOSTR, IO->ID, N)
-
-#define POP3C_DBG_SEND() \
- EVP3C_syslog(LOG_DEBUG, \
- "%s[%ld]CC[%d][%ld]POP3: > %s\n", \
- IOSTR, IO->ID, CCID, N, \
- ChrPtr(RecvMsg->IO.SendBuf.Buf))
-
-#define POP3C_DBG_READ() \
- EVP3C_syslog(LOG_DEBUG, \
- "%s[%ld]CC[%d][%ld]POP3: < %s\n", \
- IOSTR, IO->ID, CCID, N, \
- ChrPtr(RecvMsg->IO.IOBuf))
-
-
struct CitContext pop3_client_CC;
pthread_mutex_t POP3QueueMutex; /* locks the access to the following vars: */
HashPos *It;
pop3aggr *cpptr = (pop3aggr *)IO->Data;
- EVP3C_syslog(LOG_INFO,
+ syslog(LOG_INFO,
"%s@%s: fetched %ld new of %d messages in %fs. bye.",
ChrPtr(cpptr->pop3user),
ChrPtr(cpptr->Host),
{
AsyncIO *IO = &RecvMsg->IO;
SetPOP3State(IO, eGreeting);
- POP3C_DBG_READ();
/* Read the server greeting */
if (!POP3C_OK) return eTerminateConnection;
else return eSendReply;
*/
StrBufPrintf(RecvMsg->IO.SendBuf.Buf,
"USER %s\r\n", ChrPtr(RecvMsg->pop3user));
- POP3C_DBG_SEND();
return eReadMessage;
}
eNextState POP3C_GetUserState(pop3aggr *RecvMsg)
{
- AsyncIO *IO = &RecvMsg->IO;
- POP3C_DBG_READ();
if (!POP3C_OK) return eTerminateConnection;
else return eSendReply;
}
/* Password */
StrBufPrintf(RecvMsg->IO.SendBuf.Buf,
"PASS %s\r\n", ChrPtr(RecvMsg->pop3pass));
- EVP3CM_syslog(LOG_DEBUG, "<PASS <password>\n");
-// POP3C_DBG_SEND(); No, we won't write the passvoid to syslog...
+ syslog(LOG_DEBUG, "<PASS <password>\n");
return eReadMessage;
}
eNextState POP3C_GetPassState(pop3aggr *RecvMsg)
{
- AsyncIO *IO = &RecvMsg->IO;
- POP3C_DBG_READ();
if (!POP3C_OK) return eTerminateConnection;
else return eSendReply;
}
/* Get the list of messages */
StrBufPlain(RecvMsg->IO.SendBuf.Buf, HKEY("LIST\r\n"));
- POP3C_DBG_SEND();
return eReadMessage;
}
eNextState POP3C_GetListCommandState(pop3aggr *RecvMsg)
{
- AsyncIO *IO = &RecvMsg->IO;
- POP3C_DBG_READ();
if (!POP3C_OK) return eTerminateConnection;
RecvMsg->MsgNumbers = NewHash(1, NULL);
RecvMsg->State++;
eNextState POP3C_GetListOneLine(pop3aggr *RecvMsg)
{
- AsyncIO *IO = &RecvMsg->IO;
#if 0
int rc;
#endif
const char *pch;
FetchItem *OneMsg = NULL;
- POP3C_DBG_READ();
if ((StrLength(RecvMsg->IO.IOBuf) == 1) &&
(ChrPtr(RecvMsg->IO.IOBuf)[0] == '.'))
#if 0
rc = TestValidateHash(RecvMsg->MsgNumbers);
if (rc != 0)
- EVP3CCS_syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
+ syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
#endif
Put(RecvMsg->MsgNumbers, LKEY(OneMsg->MSGID), OneMsg, HfreeFetchItem);
#if 0
rc = TestValidateHash(RecvMsg->MsgNumbers);
if (rc != 0)
- EVP3CCS_syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
+ syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
#endif
//RecvMsg->State --; /* read next Line */
return eReadMore;
const char *HKey;
void *vData;
pop3aggr *RecvMsg = (pop3aggr *) IO->Data;
+ time_t seenstamp = 0;
SetPOP3State(IO, eUseTable);
if (server_shutting_down)
return eAbort;
- if (CheckIfAlreadySeen("POP3 Item Seen",
- RecvMsg->CurrMsg->MsgUID,
- EvGetNow(IO),
- EvGetNow(IO) - USETABLE_ANTIEXPIRE,
- eCheckUpdate,
- IO->ID, CCID)
- != 0)
+ RecvMsg->CurrMsg = (FetchItem*)vData;
+
+ seenstamp = CheckIfAlreadySeen(RecvMsg->CurrMsg->MsgUID,
+ EvGetNow(IO),
+ EvGetNow(IO) - USETABLE_ANTIEXPIRE,
+ eCheckUpdate
+ );
+ if (seenstamp != 0)
{
/* Item has already been seen */
RecvMsg->CurrMsg->NeedFetch = 0;
}
else
{
- EVP3CCSM_syslog(LOG_DEBUG, "NO\n");
+ syslog(LOG_DEBUG, "NO\n");
RecvMsg->CurrMsg->NeedFetch = 1;
}
return NextDBOperation(&RecvMsg->IO,
int rc;
rc = TestValidateHash(RecvMsg->MsgNumbers);
if (rc != 0)
- EVP3CCS_syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
+ syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
#endif
if((RecvMsg->Pos != NULL) &&
GetNextHashPos(RecvMsg->MsgNumbers,
* to determine whether we've already downloaded it */
StrBufPrintf(RecvMsg->IO.SendBuf.Buf,
"UIDL %ld\r\n", RecvMsg->CurrMsg->MSGID);
- POP3C_DBG_SEND();
}
else
{
eNextState POP3C_GetOneMessageIDState(pop3aggr *RecvMsg)
{
- AsyncIO *IO = &RecvMsg->IO;
#if 0
int rc;
rc = TestValidateHash(RecvMsg->MsgNumbers);
if (rc != 0)
- EVP3CCS_syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
+ syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
#endif
- POP3C_DBG_READ();
if (!POP3C_OK) return eTerminateConnection;
- RecvMsg->CurrMsg->MsgUIDL =
- NewStrBufPlain(NULL, StrLength(RecvMsg->IO.IOBuf));
- RecvMsg->CurrMsg->MsgUID =
- NewStrBufPlain(NULL, StrLength(RecvMsg->IO.IOBuf) * 2);
+ RecvMsg->CurrMsg->MsgUIDL = NewStrBufPlain(NULL, StrLength(RecvMsg->IO.IOBuf));
+ RecvMsg->CurrMsg->MsgUID = NewStrBufPlain(NULL, StrLength(RecvMsg->IO.IOBuf) * 2);
- StrBufExtract_token(RecvMsg->CurrMsg->MsgUIDL,
- RecvMsg->IO.IOBuf, 2, ' ');
+ StrBufExtract_token(RecvMsg->CurrMsg->MsgUIDL, RecvMsg->IO.IOBuf, 2, ' ');
StrBufPrintf(RecvMsg->CurrMsg->MsgUID,
"pop3/%s/%s:%s@%s",
ChrPtr(RecvMsg->RoomName),
ChrPtr(RecvMsg->CurrMsg->MsgUIDL),
RecvMsg->IO.ConnectMe->User,
- RecvMsg->IO.ConnectMe->Host);
+ RecvMsg->IO.ConnectMe->Host
+ );
RecvMsg->State --;
return eSendReply;
}
SetPOP3State(IO, eGetMsg);
+ syslog(LOG_DEBUG, "fast forwarding to the next unknown message");
+
RecvMsg->CurrMsg = NULL;
while ((RecvMsg->Pos != NULL) &&
GetNextHashPos(RecvMsg->MsgNumbers,
if ((RecvMsg->CurrMsg != NULL ) && (RecvMsg->CurrMsg->NeedFetch == 1))
{
+ syslog(LOG_DEBUG, "fetching next");
/* Message has not been seen.
* Tell the server to fetch the message... */
- StrBufPrintf(RecvMsg->IO.SendBuf.Buf,
- "RETR %ld\r\n", RecvMsg->CurrMsg->MSGID);
- POP3C_DBG_SEND();
+ StrBufPrintf(RecvMsg->IO.SendBuf.Buf, "RETR %ld\r\n", RecvMsg->CurrMsg->MSGID);
return eReadMessage;
}
else {
+ syslog(LOG_DEBUG, "no more messages to fetch.");
RecvMsg->State = ReadQuitState;
return POP3_C_DispatchWriteDone(&RecvMsg->IO);
}
eNextState POP3C_ReadMessageBodyFollowing(pop3aggr *RecvMsg)
{
- AsyncIO *IO = &RecvMsg->IO;
- POP3C_DBG_READ();
if (!POP3C_OK) return eTerminateConnection;
RecvMsg->IO.ReadMsg = NewAsyncMsg(HKEY("."),
- RecvMsg->CurrMsg->MSGSize,
- CtdlGetConfigLong("c_maxmsglen"),
- NULL, -1,
- 1);
+ RecvMsg->CurrMsg->MSGSize,
+ CtdlGetConfigLong("c_maxmsglen"),
+ NULL, -1,
+ 1
+ );
return eReadPayload;
}
SetPOP3State(IO, eStoreMsg);
- EVP3CCS_syslog(LOG_DEBUG,
- "MARKING: %s as seen: ",
- ChrPtr(RecvMsg->CurrMsg->MsgUID));
- CheckIfAlreadySeen("POP3 Item Seen",
- RecvMsg->CurrMsg->MsgUID,
- EvGetNow(IO),
- EvGetNow(IO) - USETABLE_ANTIEXPIRE,
- eWrite,
- IO->ID, CCID);
+ syslog(LOG_DEBUG, "MARKING: %s as seen: ", ChrPtr(RecvMsg->CurrMsg->MsgUID));
+ CheckIfAlreadySeen(RecvMsg->CurrMsg->MsgUID, EvGetNow(IO), EvGetNow(IO) - USETABLE_ANTIEXPIRE, eWrite);
return DBQueueEventContext(&RecvMsg->IO, POP3_C_ReAttachToFetchMessages);
}
+
+
eNextState POP3C_SaveMsg(AsyncIO *IO)
{
long msgnum;
return NextDBOperation(&RecvMsg->IO, POP3C_StoreMsgRead);
}
+
eNextState POP3C_ReadMessageBody(pop3aggr *RecvMsg)
{
- AsyncIO *IO = &RecvMsg->IO;
- EVP3CM_syslog(LOG_DEBUG, "Converting message...");
- RecvMsg->CurrMsg->Msg =
- convert_internet_message_buf(&RecvMsg->IO.ReadMsg->MsgBuf);
+ syslog(LOG_DEBUG, "Converting message...");
+ RecvMsg->CurrMsg->Msg = convert_internet_message_buf(&RecvMsg->IO.ReadMsg->MsgBuf);
return EventQueueDBOperation(&RecvMsg->IO, POP3C_SaveMsg, 0);
}
+
eNextState POP3C_SendDelete(pop3aggr *RecvMsg)
{
AsyncIO *IO = &RecvMsg->IO;
SetPOP3State(IO, eDelete);
if (!RecvMsg->keep) {
- StrBufPrintf(RecvMsg->IO.SendBuf.Buf,
- "DELE %ld\r\n", RecvMsg->CurrMsg->MSGID);
- POP3C_DBG_SEND();
+ StrBufPrintf(RecvMsg->IO.SendBuf.Buf, "DELE %ld\r\n", RecvMsg->CurrMsg->MSGID);
return eReadMessage;
}
else {
return POP3_C_DispatchWriteDone(&RecvMsg->IO);
}
}
+
+
eNextState POP3C_ReadDeleteState(pop3aggr *RecvMsg)
{
- AsyncIO *IO = &RecvMsg->IO;
- POP3C_DBG_READ();
RecvMsg->State = GetOneMessageIDState;
- return eReadMessage;
+ return POP3_C_DispatchWriteDone(&RecvMsg->IO);
}
+
eNextState POP3C_SendQuit(pop3aggr *RecvMsg)
{
AsyncIO *IO = &RecvMsg->IO;
/* Log out */
StrBufPlain(RecvMsg->IO.SendBuf.Buf,
HKEY("QUIT\r\n3)"));
- POP3C_DBG_SEND();
return eReadMessage;
}
eNextState POP3C_ReadQuitState(pop3aggr *RecvMsg)
{
- AsyncIO *IO = &RecvMsg->IO;
- POP3C_DBG_READ();
return eTerminateConnection;
}
+
const long POP3_C_ConnTimeout = 1000;
const long DefaultPOP3Port = 110;
void POP3SetTimeout(eNextState NextTCPState, pop3aggr *pMsg)
{
- AsyncIO *IO = &pMsg->IO;
double Timeout = 0.0;
- EVP3C_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
switch (NextTCPState) {
case eSendFile:
}
eNextState POP3_C_DispatchReadDone(AsyncIO *IO)
{
-/* EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__); to noisy anyways. */
+/* syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__); to noisy anyways. */
pop3aggr *pMsg = IO->Data;
eNextState rc;
pop3aggr *pMsg = IO->Data;
eNextState rc;
-/* EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__); to noisy anyways. */
+/* syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__); to noisy anyways. */
rc = POP3C_SendHandlers[pMsg->State](pMsg);
POP3SetTimeout(rc, pMsg);
return rc;
/*****************************************************************************/
eNextState POP3_C_Terminate(AsyncIO *IO)
{
-/// pop3aggr *pMsg = (pop3aggr *)IO->Data;
-
- EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
FinalizePOP3AggrRun(IO);
return eAbort;
}
eNextState POP3_C_TerminateDB(AsyncIO *IO)
{
-/// pop3aggr *pMsg = (pop3aggr *)IO->Data;
-
- EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
FinalizePOP3AggrRun(IO);
return eAbort;
}
{
pop3aggr *pMsg = IO->Data;
- EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State]));
return FailAggregationRun(IO);
}
{
pop3aggr *pMsg = (pop3aggr *)IO->Data;
- EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State]));
return FailAggregationRun(IO);
}
{
pop3aggr *pMsg = (pop3aggr *)IO->Data;
- EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State]));
return FailAggregationRun(IO);
}
eNextState POP3_C_Shutdown(AsyncIO *IO)
{
- EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
-//// pop3aggr *pMsg = IO->Data;
-
-////pMsg->MyQEntry->Status = 3;
-///StrBufPlain(pMsg->MyQEntry->StatusMessage, HKEY("server shutdown during message retrieval."));
+ syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
FinalizePOP3AggrRun(IO);
return eAbort;
}
-/**
- * @brief lineread Handler; understands when to read more POP3 lines,
- * and when this is a one-lined reply.
+/*
+ * lineread Handler; understands when to read more POP3 lines, and when this is a one-lined reply.
*/
eReadState POP3_C_ReadServerStatus(AsyncIO *IO)
{
{
pop3aggr *cpptr = IO->Data;
- EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
////??? cpptr->State ++;
if (cpptr->Pos == NULL)
cpptr->Pos = GetNewHashPos(cpptr->MsgNumbers, 0);
if (cpptr->IOStart == 0.0) /* whith or without DNS? */
cpptr->IOStart = IO->Now;
- EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
return EvConnectSock(IO,
POP3_C_ConnTimeout,
cpptr->IOStart = IO->Now;
- EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
- EVP3CCS_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"POP3 client[%ld]: looking up %s-Record %s : %d ...\n",
cpptr->n,
(cpptr->IO.ConnectMe->IPv6)? "aaaa": "a",
if (GetHash(POP3QueueRooms, LKEY(qrbuf->QRnumber), &vptr))
{
pthread_mutex_unlock(&POP3QueueMutex);
- EVP3CQ_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"pop3client: [%ld] %s already in progress.",
qrbuf->QRnumber,
qrbuf->QRname);
ParseURL(&cptr->IO.ConnectMe, cptr->Url, 110);
-
-#if 0
-/* todo: we need to reunite the url to be shure. */
-
- pthread_mutex_lock(&POP3ueueMutex);
- GetHash(POP3FetchUrls, SKEY(ptr->Url), &vptr);
- use_this_cptr = (pop3aggr *)vptr;
-
- if (use_this_rncptr != NULL)
- {
- /* mustn't attach to an active session */
- if (use_this_cptr->RefCount > 0)
- {
- DeletePOP3Cfg(cptr);
-/// Count->count--;
- }
- else
- {
- long *QRnumber;
- StrBufAppendBufPlain(
- use_this_cptr->rooms,
- qrbuf->QRname,
- -1, 0);
- if (use_this_cptr->roomlist_parts == 1)
- {
- use_this_cptr->OtherQRnumbers
- = NewHash(1, lFlathash);
- }
- QRnumber = (long*)malloc(sizeof(long));
- *QRnumber = qrbuf->QRnumber;
- Put(use_this_cptr->OtherQRnumbers,
- LKEY(qrbuf->QRnumber),
- QRnumber,
- NULL);
-
- use_this_cptr->roomlist_parts++;
- }
- pthread_mutex_unlock(&POP3QueueMutex);
- continue;
- }
- pthread_mutex_unlock(&RSSQueueMutex);
-#endif
cptr->n = Pop3ClientID++;
pthread_mutex_lock(&POP3QueueMutex);
Put(POP3FetchUrls,
if (doing_pop3client) return;
doing_pop3client = 1;
- EVP3CQM_syslog(LOG_DEBUG, "pop3client started");
- CtdlForEachNetCfgRoom(pop3client_scan_room, NULL, pop3client);
+ syslog(LOG_DEBUG, "pop3client started");
+ CtdlForEachNetCfgRoom(pop3client_scan_room, NULL);
pthread_mutex_lock(&POP3QueueMutex);
it = GetNewHashPos(POP3FetchUrls, 0);
GetNextHashPos(POP3FetchUrls, it, &len, &Key, &vrptr) &&
(vrptr != NULL)) {
cptr = (pop3aggr *)vrptr;
- if (cptr->RefCount == 0)
- if (!pop3_do_fetching(cptr))
+ if (cptr->RefCount == 0) {
+ if (!pop3_do_fetching(cptr)) {
DeletePOP3Aggregator(cptr);////TODO
-
-/*
- if ((palist->interval && time(NULL) > (last_run + palist->interval))
- || (time(NULL) > last_run + CtdlGetConfigLong("c_pop3_fetch")))
- pop3_do_fetching(palist->roomname, palist->pop3host,
- palist->pop3user, palist->pop3pass, palist->keep);
- pptr = palist;
- palist = palist->next;
- free(pptr);
-*/
+ }
+ }
}
DeleteHashPos(&it);
pthread_mutex_unlock(&POP3QueueMutex);
- EVP3CQM_syslog(LOG_DEBUG, "pop3client ended");
+ syslog(LOG_DEBUG, "pop3client ended");
last_run = time(NULL);
doing_pop3client = 0;
}
-void LogDebugEnablePOP3Client(const int n)
-{
- POP3ClientDebugEnabled = n;
-}
-
CTDL_MODULE_INIT(pop3client)
{
if (!threading)
POP3FetchUrls = NewHash(1, NULL);
CtdlRegisterSessionHook(pop3client_scan, EVT_TIMER, PRIO_AGGR + 50);
CtdlRegisterEVCleanupHook(pop3_cleanup);
- CtdlRegisterDebugFlagHook(HKEY("pop3client"), LogDebugEnablePOP3Client, &POP3ClientDebugEnabled);
}
/* return our module id for the log */
projects / citadel.git / blobdiff