#define EVP3C_syslog(LEVEL, FORMAT, ...) \
DBGLOG(LEVEL) syslog(LEVEL, \
- "IO[%ld]CC[%d][%ld]" FORMAT, \
+ "IO[%ld]CC[%d][%ld]POP3: " FORMAT, \
IO->ID, CCID, N, __VA_ARGS__)
#define EVP3CM_syslog(LEVEL, FORMAT) \
DBGLOG(LEVEL) syslog(LEVEL, \
- "IO[%ld]CC[%d][%ld]" FORMAT, \
+ "IO[%ld]CC[%d][%ld]POP3: " FORMAT, \
IO->ID, CCID, N)
+#define EVP3CQ_syslog(LEVEL, FORMAT, ...) \
+ DBGLOG(LEVEL) syslog(LEVEL, \
+ "P3Q:" FORMAT, \
+ __VA_ARGS__)
+
+#define EVP3CQM_syslog(LEVEL, FORMAT) \
+ DBGLOG(LEVEL) syslog(LEVEL, \
+ "P3Q" FORMAT \
+ )
+
#define EVP3CCS_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]" FORMAT, \
+ DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]POP3: " FORMAT, \
IO->ID, N, __VA_ARGS__)
-#define EVP3CCSM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]" FORMAT, \
+#define EVP3CCSM_syslog(LEVEL, FORMAT) \
+ DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]POP3: " FORMAT, \
IO->ID, N)
#define POP3C_DBG_SEND() \
EVP3C_syslog(LOG_DEBUG, \
- "POP3: > %s\n", \
+ "IO[%ld]CC[%d][%ld]POP3: > %s\n", \
+ IO->ID, CCID, N, \
ChrPtr(RecvMsg->IO.SendBuf.Buf))
-#define POP3C_DBG_READ() \
- EVP3C_syslog(LOG_DEBUG, \
- "POP3: < %s\n", \
+#define POP3C_DBG_READ() \
+ EVP3C_syslog(LOG_DEBUG, \
+ "IO[%ld]CC[%d][%ld]POP3: < %s\n", \
+ IO->ID, CCID, N, \
ChrPtr(RecvMsg->IO.IOBuf))
AsyncIO IO;
long n;
+ double IOStart;
+ long count;
long RefCount;
DNSQueryParts HostLookup;
StrBuf *Url;
StrBuf *pop3user;
StrBuf *pop3pass;
+ StrBuf *Host;
StrBuf *RoomName; // TODO: fill me
int keep;
time_t interval;
// FreeStrBuf(&ptr->rooms);
FreeStrBuf(&ptr->pop3user);
FreeStrBuf(&ptr->pop3pass);
+ FreeStrBuf(&ptr->Host);
FreeStrBuf(&ptr->RoomName);
FreeURL(&ptr->IO.ConnectMe);
FreeStrBuf(&ptr->Url);
eNextState FinalizePOP3AggrRun(AsyncIO *IO)
{
HashPos *It;
- pop3aggr *cptr = (pop3aggr *)IO->Data;
+ pop3aggr *cpptr = (pop3aggr *)IO->Data;
- EVP3CM_syslog(LOG_DEBUG, "Terminating Aggregator; bye.\n");
+ EVP3C_syslog(LOG_INFO,
+ "%s@%s: fetched %ld new of %d messages in %fs. bye.",
+ ChrPtr(cpptr->pop3user),
+ ChrPtr(cpptr->Host),
+ cpptr->count,
+ GetCount(cpptr->MsgNumbers),
+ IO->Now - cpptr->IOStart
+ );
It = GetNewHashPos(POP3FetchUrls, 0);
pthread_mutex_lock(&POP3QueueMutex);
{
- if (GetHashPosFromKey(POP3FetchUrls, SKEY(cptr->Url), It))
+ if (GetHashPosFromKey(POP3FetchUrls, SKEY(cpptr->Url), It))
DeleteEntryFromHash(POP3FetchUrls, It);
}
pthread_mutex_unlock(&POP3QueueMutex);
#if 0
rc = TestValidateHash(RecvMsg->MsgNumbers);
if (rc != 0)
- syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
+ EVP3CCS_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)
- syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
+ EVP3CCS_syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
#endif
//RecvMsg->State --; /* read next Line */
return eReadMore;
struct cdbdata *cdbut;
pop3aggr *RecvMsg = (pop3aggr *) IO->Data;
- if(GetNextHashPos(RecvMsg->MsgNumbers,
+ if((RecvMsg->Pos != NULL) &&
+ GetNextHashPos(RecvMsg->MsgNumbers,
RecvMsg->Pos,
&HKLen,
&HKey,
return eAbort;
RecvMsg->CurrMsg = (FetchItem*) vData;
- syslog(LOG_DEBUG,
- "CHECKING: whether %s has already been seen: ",
- ChrPtr(RecvMsg->CurrMsg->MsgUID));
+ 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,
cdbut = cdb_fetch(CDB_USETABLE, SKEY(RecvMsg->CurrMsg->MsgUID));
if (cdbut != NULL) {
/* Item has already been seen */
- syslog(LOG_DEBUG, "YES\n");
+ EVP3CCSM_syslog(LOG_DEBUG, "YES\n");
cdb_free(cdbut);
/* rewrite the record anyway, to update the timestamp */
}
else
{
- syslog(LOG_DEBUG, "NO\n");
+ EVP3CCSM_syslog(LOG_DEBUG, "NO\n");
RecvMsg->CurrMsg->NeedFetch = 1;
}
return NextDBOperation(&RecvMsg->IO,
/* ok, now we know them all,
* continue with reading the actual messages. */
DeleteHashPos(&RecvMsg->Pos);
-
+ StopDBWatchers(IO);
return QueueEventContext(IO, POP3_C_ReAttachToFetchMessages);
}
}
int rc;
rc = TestValidateHash(RecvMsg->MsgNumbers);
if (rc != 0)
- syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
+ EVP3CCS_syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
#endif
- if(GetNextHashPos(RecvMsg->MsgNumbers,
+ if((RecvMsg->Pos != NULL) &&
+ GetNextHashPos(RecvMsg->MsgNumbers,
RecvMsg->Pos,
&HKLen, &HKey,
&vData))
}
else
{
- RecvMsg->State++;
+ RecvMsg->State++;
DeleteHashPos(&RecvMsg->Pos);
/// done receiving uidls.. start looking them up now.
RecvMsg->Pos = GetNewHashPos(RecvMsg->MsgNumbers, 0);
int rc;
rc = TestValidateHash(RecvMsg->MsgNumbers);
if (rc != 0)
- syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
+ EVP3CCS_syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
#endif
POP3C_DBG_READ();
void *vData;
RecvMsg->CurrMsg = NULL;
- while (GetNextHashPos(RecvMsg->MsgNumbers,
+ while ((RecvMsg->Pos != NULL) &&
+ GetNextHashPos(RecvMsg->MsgNumbers,
RecvMsg->Pos,
&HKLen, &HKey,
&vData) &&
pop3aggr *RecvMsg = (pop3aggr *) IO->Data;
struct UseTable ut;
- syslog(LOG_DEBUG,
- "MARKING: %s as seen: ",
- ChrPtr(RecvMsg->CurrMsg->MsgUID));
+ EVP3CCS_syslog(LOG_DEBUG,
+ "MARKING: %s as seen: ",
+ ChrPtr(RecvMsg->CurrMsg->MsgUID));
safestrncpy(ut.ut_msgid,
ChrPtr(RecvMsg->CurrMsg->MsgUID),
StrLength(RecvMsg->CurrMsg->MsgUID),
&ut,
sizeof(struct UseTable) );
-
+ StopDBWatchers(IO);
return QueueEventContext(&RecvMsg->IO, POP3_C_ReAttachToFetchMessages);
}
eNextState POP3C_SaveMsg(AsyncIO *IO)
}
CtdlFreeMessage(RecvMsg->CurrMsg->Msg);
+ RecvMsg->count ++;
return NextDBOperation(&RecvMsg->IO, POP3C_StoreMsgRead);
}
EVP3CM_syslog(LOG_DEBUG, "Converting message...");
RecvMsg->CurrMsg->Msg =
convert_internet_message_buf(&RecvMsg->IO.ReadMsg->MsgBuf);
-
+ StopClientWatchers(IO, 0);
return QueueDBOperation(&RecvMsg->IO, POP3C_SaveMsg);
}
}
eNextState POP3_C_DispatchReadDone(AsyncIO *IO)
{
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+/* EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__); to noisy anyways. */
pop3aggr *pMsg = IO->Data;
eNextState rc;
}
eNextState POP3_C_DispatchWriteDone(AsyncIO *IO)
{
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
pop3aggr *pMsg = IO->Data;
eNextState rc;
+/* EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__); to noisy anyways. */
rc = POP3C_SendHandlers[pMsg->State](pMsg);
POP3SetTimeout(rc, pMsg);
return rc;
{
/// pop3aggr *pMsg = (pop3aggr *)IO->Data;
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
FinalizePOP3AggrRun(IO);
return eAbort;
}
{
/// pop3aggr *pMsg = (pop3aggr *)IO->Data;
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
FinalizePOP3AggrRun(IO);
return eAbort;
}
{
pop3aggr *pMsg = IO->Data;
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State]));
return FailAggregationRun(IO);
}
{
pop3aggr *pMsg = (pop3aggr *)IO->Data;
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State]));
return FailAggregationRun(IO);
}
{
pop3aggr *pMsg = (pop3aggr *)IO->Data;
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State]));
return FailAggregationRun(IO);
}
eNextState POP3_C_Shutdown(AsyncIO *IO)
{
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
//// pop3aggr *pMsg = IO->Data;
////pMsg->MyQEntry->Status = 3;
{
pop3aggr *cpptr = IO->Data;
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
////??? cpptr->State ++;
if (cpptr->Pos == NULL)
cpptr->Pos = GetNewHashPos(cpptr->MsgNumbers, 0);
eNextState pop3_connect_ip(AsyncIO *IO)
{
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ pop3aggr *cpptr = IO->Data;
+
+ if (cpptr->IOStart == 0.0) /* whith or without DNS? */
+ cpptr->IOStart = IO->Now;
+
+ EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
return EvConnectSock(IO,
POP3_C_ConnTimeout,
{
pop3aggr *cpptr = IO->Data;
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+ cpptr->IOStart = IO->Now;
- syslog(LOG_DEBUG,
- "POP3 client[%ld]: looking up %s-Record %s : %d ...\n",
- cpptr->n,
- (cpptr->IO.ConnectMe->IPv6)? "aaaa": "a",
- cpptr->IO.ConnectMe->Host,
- cpptr->IO.ConnectMe->Port);
+ EVP3CCS_syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
+
+ EVP3CCS_syslog(LOG_DEBUG,
+ "POP3 client[%ld]: looking up %s-Record %s : %d ...\n",
+ cpptr->n,
+ (cpptr->IO.ConnectMe->IPv6)? "aaaa": "a",
+ cpptr->IO.ConnectMe->Host,
+ cpptr->IO.ConnectMe->Port);
QueueQuery((cpptr->IO.ConnectMe->IPv6)? ns_t_aaaa : ns_t_a,
cpptr->IO.ConnectMe->Host,
pthread_mutex_lock(&POP3QueueMutex);
if (GetHash(POP3QueueRooms, LKEY(qrbuf->QRnumber), &vptr))
{
- syslog(LOG_DEBUG,
- "pop3client: [%ld] %s already in progress.\n",
+ pthread_mutex_unlock(&POP3QueueMutex);
+ EVP3CQ_syslog(LOG_DEBUG,
+ "pop3client: [%ld] %s already in progress.",
qrbuf->QRnumber,
qrbuf->QRname);
- pthread_mutex_unlock(&POP3QueueMutex);
+ return;
}
pthread_mutex_unlock(&POP3QueueMutex);
if (server_shutting_down)
return;
if (fstat(fd, &statbuf) == -1) {
- syslog(LOG_DEBUG,
- "ERROR: could not stat configfile '%s' - %s\n",
- filename,
- strerror(errno));
+ EVP3CQ_syslog(LOG_INFO,
+ "ERROR: could not stat configfile '%s' - %s",
+ filename,
+ strerror(errno));
return;
}
if (server_shutting_down)
if (StrBufReadBLOB(CfgData, &fd, 1, statbuf.st_size, &Err) < 0) {
close(fd);
FreeStrBuf(&CfgData);
- syslog(LOG_DEBUG, "ERROR: reading config '%s' - %s<br>\n",
+ EVP3CQ_syslog(LOG_INFO,
+ "ERROR: reading config '%s' - %s",
filename, strerror(errno));
return;
}
if (!strcasecmp("pop3client", ChrPtr(CfgType)))
{
pop3aggr *cptr;
- StrBuf *Tmp;
/*
if (Count == NULL)
{
cptr->pop3pass =
NewStrBufPlain(NULL, StrLength(Line));
cptr->Url = NewStrBuf();
- Tmp = NewStrBuf();
+ cptr->Host =
+ NewStrBufPlain(NULL, StrLength(Line));
- StrBufExtract_NextToken(Tmp, Line, &lPtr, '|');
+ StrBufExtract_NextToken(cptr->Host, Line, &lPtr, '|');
StrBufExtract_NextToken(cptr->pop3user,
Line,
&lPtr,
&lPtr,
'|');
- StrBufPrintf(cptr->Url, "pop3://%s:%s@%s/%s",
- ChrPtr(cptr->pop3user),
- ChrPtr(cptr->pop3pass),
- ChrPtr(Tmp),
- ChrPtr(cptr->RoomName));
- FreeStrBuf(&Tmp);
+ StrBufAppendBufPlain(cptr->Url, HKEY("pop3://"), 0);
+ StrBufUrlescUPAppend(cptr->Url, cptr->pop3user, NULL);
+ StrBufAppendBufPlain(cptr->Url, HKEY(":"), 0);
+ StrBufUrlescUPAppend(cptr->Url, cptr->pop3pass, NULL);
+ StrBufAppendBufPlain(cptr->Url, HKEY("@"), 0);
+ StrBufAppendBuf(cptr->Url, cptr->Host, 0);
+ StrBufAppendBufPlain(cptr->Url, HKEY("/"), 0);
+ StrBufUrlescAppend(cptr->Url, cptr->RoomName, NULL);
+
ParseURL(&cptr->IO.ConnectMe, cptr->Url, 110);
if (doing_pop3client) return;
doing_pop3client = 1;
- syslog(LOG_DEBUG, "pop3client started");
+ EVP3CQM_syslog(LOG_DEBUG, "pop3client started");
CtdlForEachRoom(pop3client_scan_room, NULL);
pthread_mutex_lock(&POP3QueueMutex);
DeleteHashPos(&it);
pthread_mutex_unlock(&POP3QueueMutex);
- syslog(LOG_DEBUG, "pop3client ended");
+ EVP3CQM_syslog(LOG_DEBUG, "pop3client ended");
last_run = time(NULL);
doing_pop3client = 0;
}
pthread_mutex_init(&POP3QueueMutex, NULL);
POP3QueueRooms = NewHash(1, lFlathash);
POP3FetchUrls = NewHash(1, NULL);
- CtdlRegisterSessionHook(pop3client_scan, EVT_TIMER);
+ CtdlRegisterSessionHook(pop3client_scan, EVT_TIMER, PRIO_AGGR + 50);
CtdlRegisterEVCleanupHook(pop3_cleanup);
CtdlRegisterDebugFlagHook(HKEY("pop3client"), LogDebugEnablePOP3Client, &POP3ClientDebugEnabled);
}
projects / citadel.git / blobdiff