rename InitEventIO to EvConnectSock, since this suits better what this function does...
[citadel.git] / citadel / modules / pop3client / serv_pop3client.c
index 12115292388a961a1e91c95edadbe1387b841e33..8a0d23c38f6c64537d9d2f44573082169509a43a 100644 (file)
@@ -1,21 +1,21 @@
 /*
  * Consolidate mail from remote POP3 accounts.
  *
- * Copyright (c) 2007-2009 by the citadel.org team
+ * Copyright (c) 2007-2011 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * 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
+ * by the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include <stdlib.h>
@@ -55,7 +55,7 @@
 
 struct CitContext pop3_client_CC;
 
-citthread_mutex_t POP3QueueMutex; /* locks the access to the following vars: */
+pthread_mutex_t POP3QueueMutex; /* locks the access to the following vars: */
 HashList *POP3QueueRooms = NULL; /* rss_room_counter */
 HashList *POP3FetchUrls = NULL; /* -> rss_aggregator; ->RefCount access to be locked too. */
 
@@ -135,6 +135,10 @@ void DeletePOP3Aggregator(void *vptr)
        FreeStrBuf(&ptr->IO.IOBuf);
        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);
 }
 
@@ -144,6 +148,7 @@ typedef eNextState(*Pop3ClientHandler)(pop3aggr* RecvMsg);
 eNextState POP3_C_Shutdown(AsyncIO *IO);
 eNextState POP3_C_Timeout(AsyncIO *IO);
 eNextState POP3_C_ConnFail(AsyncIO *IO);
+eNextState POP3_C_DNSFail(AsyncIO *IO);
 eNextState POP3_C_DispatchReadDone(AsyncIO *IO);
 eNextState POP3_C_DispatchWriteDone(AsyncIO *IO);
 eNextState POP3_C_Terminate(AsyncIO *IO);
@@ -155,15 +160,15 @@ eNextState FinalizePOP3AggrRun(AsyncIO *IO)
        HashPos  *It;
        pop3aggr *cptr = (pop3aggr *)IO->Data;
 
-       CtdlLogPrintf(CTDL_DEBUG, "Terminating Aggregator; bye.\n");
+       syslog(LOG_DEBUG, "Terminating Aggregator; bye.\n");
 
        It = GetNewHashPos(POP3FetchUrls, 0);
-       citthread_mutex_lock(&POP3QueueMutex);
+       pthread_mutex_lock(&POP3QueueMutex);
        {
-               GetHashPosFromKey(POP3FetchUrls, SKEY(cptr->Url), It);
-               DeleteEntryFromHash(POP3FetchUrls, It);
+               if (GetHashPosFromKey(POP3FetchUrls, SKEY(cptr->Url), It))
+                       DeleteEntryFromHash(POP3FetchUrls, It);
        }
-       citthread_mutex_unlock(&POP3QueueMutex);
+       pthread_mutex_unlock(&POP3QueueMutex);
        DeleteHashPos(&It);
        return eAbort;
 }
@@ -173,8 +178,9 @@ eNextState FailAggregationRun(AsyncIO *IO)
        return eAbort;
 }
 
-#define POP3C_DBG_SEND() CtdlLogPrintf(CTDL_DEBUG, "POP3 client[%ld]: > %s\n", RecvMsg->n, ChrPtr(RecvMsg->IO.SendBuf.Buf))
-#define POP3C_DBG_READ() CtdlLogPrintf(CTDL_DEBUG, "POP3 client[%ld]: < %s\n", RecvMsg->n, ChrPtr(RecvMsg->IO.IOBuf))
+
+#define POP3C_DBG_SEND() syslog(LOG_DEBUG, "POP3 client[%ld]: > %s\n", RecvMsg->n, ChrPtr(RecvMsg->IO.SendBuf.Buf))
+#define POP3C_DBG_READ() syslog(LOG_DEBUG, "POP3 client[%ld]: < %s\n", RecvMsg->n, ChrPtr(RecvMsg->IO.IOBuf))
 #define POP3C_OK (strncasecmp(ChrPtr(RecvMsg->IO.IOBuf), "+OK", 3) == 0)
 
 eNextState POP3C_ReadGreeting(pop3aggr *RecvMsg)
@@ -185,7 +191,6 @@ eNextState POP3C_ReadGreeting(pop3aggr *RecvMsg)
        else return eSendReply;
 }
 
-
 eNextState POP3C_SendUser(pop3aggr *RecvMsg)
 {
        /* Identify ourselves.  NOTE: we have to append a CR to each command.  The LF will
@@ -211,7 +216,7 @@ eNextState POP3C_SendPassword(pop3aggr *RecvMsg)
        /* Password */
        StrBufPrintf(RecvMsg->IO.SendBuf.Buf,
                     "PASS %s\r\n", ChrPtr(RecvMsg->pop3pass));
-       CtdlLogPrintf(CTDL_DEBUG, "<PASS <password>\n");
+       syslog(LOG_DEBUG, "<PASS <password>\n");
 //     POP3C_DBG_SEND();
        return eReadMessage;
 }
@@ -243,7 +248,9 @@ eNextState POP3C_GetListCommandState(pop3aggr *RecvMsg)
 
 eNextState POP3C_GetListOneLine(pop3aggr *RecvMsg)
 {
+#if 0
        int rc;
+#endif
        const char *pch;
        FetchItem *OneMsg = NULL;
        POP3C_DBG_READ();
@@ -271,16 +278,18 @@ eNextState POP3C_GetListOneLine(pop3aggr *RecvMsg)
        {
                OneMsg->MSGSize = atol(pch + 1);
        }
-
+#if 0
        rc = TestValidateHash(RecvMsg->MsgNumbers);
        if (rc != 0) 
-               CtdlLogPrintf(CTDL_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) 
-               CtdlLogPrintf(CTDL_DEBUG, "Hash Invalid: %d\n", rc);
+               syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
+#endif
        //RecvMsg->State --; /* read next Line */
        return eReadMore;
 }
@@ -296,9 +305,11 @@ eNextState POP3_FetchNetworkUsetableEntry(AsyncIO *IO)
        if(GetNextHashPos(RecvMsg->MsgNumbers, RecvMsg->Pos, &HKLen, &HKey, &vData))
        {
                struct UseTable ut;
-
+               if (server_shutting_down)
+                       return eAbort;
+                       
                RecvMsg->CurrMsg = (FetchItem*) vData;
-               CtdlLogPrintf(CTDL_DEBUG, "CHECKING: whether %s has already been seen: ", ChrPtr(RecvMsg->CurrMsg->MsgUID));
+               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),
@@ -308,18 +319,18 @@ eNextState POP3_FetchNetworkUsetableEntry(AsyncIO *IO)
                cdbut = cdb_fetch(CDB_USETABLE, SKEY(RecvMsg->CurrMsg->MsgUID));
                if (cdbut != NULL) {
                        /* Item has already been seen */
-                       CtdlLogPrintf(CTDL_DEBUG, "YES\n");
+                       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 = 1; ////TODO0;
+                       RecvMsg->CurrMsg->NeedFetch = 0; ////TODO0;
                }
                else
                {
-                       CtdlLogPrintf(CTDL_DEBUG, "NO\n");
+                       syslog(LOG_DEBUG, "NO\n");
                        RecvMsg->CurrMsg->NeedFetch = 1;
                }
                return NextDBOperation(&RecvMsg->IO, POP3_FetchNetworkUsetableEntry);
@@ -338,12 +349,13 @@ eNextState POP3C_GetOneMessagID(pop3aggr *RecvMsg)
        long HKLen;
        const char *HKey;
        void *vData;
-       int rc;
 
+#if 0
+       int rc;
        rc = TestValidateHash(RecvMsg->MsgNumbers);
        if (rc != 0) 
-               CtdlLogPrintf(CTDL_DEBUG, "Hash Invalid: %d\n", rc);
-
+               syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
+#endif
        if(GetNextHashPos(RecvMsg->MsgNumbers, RecvMsg->Pos, &HKLen, &HKey, &vData))
        {
                RecvMsg->CurrMsg = (FetchItem*) vData;
@@ -365,10 +377,12 @@ eNextState POP3C_GetOneMessagID(pop3aggr *RecvMsg)
 
 eNextState POP3C_GetOneMessageIDState(pop3aggr *RecvMsg)
 {
+#if 0
        int rc;
        rc = TestValidateHash(RecvMsg->MsgNumbers);
        if (rc != 0) 
-               CtdlLogPrintf(CTDL_DEBUG, "Hash Invalid: %d\n", rc);
+               syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
+#endif
 
        POP3C_DBG_READ();
        if (!POP3C_OK) return eTerminateConnection;
@@ -432,7 +446,7 @@ eNextState POP3C_StoreMsgRead(AsyncIO *IO)
        pop3aggr *RecvMsg = (pop3aggr *) IO->Data;
        struct UseTable ut;
 
-       CtdlLogPrintf(CTDL_DEBUG, "MARKING: %s as seen: ", ChrPtr(RecvMsg->CurrMsg->MsgUID));
+       syslog(LOG_DEBUG, "MARKING: %s as seen: ", ChrPtr(RecvMsg->CurrMsg->MsgUID));
 
        safestrncpy(ut.ut_msgid, 
                    ChrPtr(RecvMsg->CurrMsg->MsgUID),
@@ -463,12 +477,11 @@ eNextState POP3C_SaveMsg(AsyncIO *IO)
        CtdlFreeMessage(RecvMsg->CurrMsg->Msg);
 
        return NextDBOperation(&RecvMsg->IO, POP3C_StoreMsgRead);
-       return eReadMessage;
 }
 
 eNextState POP3C_ReadMessageBody(pop3aggr *RecvMsg)
 {
-       CtdlLogPrintf(CTDL_DEBUG, "Converting message...\n");
+       syslog(LOG_DEBUG, "Converting message...\n");
        RecvMsg->CurrMsg->Msg = convert_internet_message_buf(&RecvMsg->IO.ReadMsg->MsgBuf);
 
        return QueueDBOperation(&RecvMsg->IO, POP3C_SaveMsg);
@@ -580,9 +593,10 @@ void POP3SetTimeout(eNextState NextTCPState, pop3aggr *pMsg)
 {
        double Timeout = 0.0;
 
-       CtdlLogPrintf(CTDL_DEBUG, "POP3: %s\n", __FUNCTION__);
+       syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
 
        switch (NextTCPState) {
+       case eSendFile:
        case eSendReply:
        case eSendMore:
                Timeout = POP3_C_SendTimeouts[pMsg->State];
@@ -593,6 +607,7 @@ void POP3SetTimeout(eNextState NextTCPState, pop3aggr *pMsg)
   }
 */
                break;
+       case eReadFile:
        case eReadMessage:
                Timeout = POP3_C_ReadTimeouts[pMsg->State];
 /*
@@ -622,7 +637,7 @@ void POP3SetTimeout(eNextState NextTCPState, pop3aggr *pMsg)
 }
 eNextState POP3_C_DispatchReadDone(AsyncIO *IO)
 {
-       CtdlLogPrintf(CTDL_DEBUG, "POP3: %s\n", __FUNCTION__);
+       syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
        pop3aggr *pMsg = IO->Data;
        eNextState rc;
 
@@ -634,7 +649,7 @@ eNextState POP3_C_DispatchReadDone(AsyncIO *IO)
 }
 eNextState POP3_C_DispatchWriteDone(AsyncIO *IO)
 {
-       CtdlLogPrintf(CTDL_DEBUG, "POP3: %s\n", __FUNCTION__);
+       syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
        pop3aggr *pMsg = IO->Data;
        eNextState rc;
 
@@ -651,7 +666,7 @@ eNextState POP3_C_Terminate(AsyncIO *IO)
 {
 ///    pop3aggr *pMsg = (pop3aggr *)IO->Data;
 
-       CtdlLogPrintf(CTDL_DEBUG, "POP3: %s\n", __FUNCTION__);
+       syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
        FinalizePOP3AggrRun(IO);
        return eAbort;
 }
@@ -659,7 +674,7 @@ eNextState POP3_C_Timeout(AsyncIO *IO)
 {
        pop3aggr *pMsg = IO->Data;
 
-       CtdlLogPrintf(CTDL_DEBUG, "POP3: %s\n", __FUNCTION__);
+       syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
        StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State]));
        return FailAggregationRun(IO);
 }
@@ -667,13 +682,21 @@ eNextState POP3_C_ConnFail(AsyncIO *IO)
 {
        pop3aggr *pMsg = (pop3aggr *)IO->Data;
 
-       CtdlLogPrintf(CTDL_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_DNSFail(AsyncIO *IO)
+{
+       pop3aggr *pMsg = (pop3aggr *)IO->Data;
+
+       syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
        StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State]));
        return FailAggregationRun(IO);
 }
 eNextState POP3_C_Shutdown(AsyncIO *IO)
 {
-       CtdlLogPrintf(CTDL_DEBUG, "POP3: %s\n", __FUNCTION__);
+       syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
 ////   pop3aggr *pMsg = IO->Data;
 
        ////pMsg->MyQEntry->Status = 3;
@@ -699,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;
@@ -719,7 +744,7 @@ eNextState POP3_C_ReAttachToFetchMessages(AsyncIO *IO)
 {
        pop3aggr *cpptr = IO->Data;
 
-       CtdlLogPrintf(CTDL_DEBUG, "POP3: %s\n", __FUNCTION__);
+       syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
 ////???        cpptr->State ++;
        if (cpptr->Pos == NULL)
                cpptr->Pos = GetNewHashPos(cpptr->MsgNumbers, 0);
@@ -730,24 +755,24 @@ eNextState POP3_C_ReAttachToFetchMessages(AsyncIO *IO)
        return IO->NextState;
 }
 
-eNextState connect_ip(AsyncIO *IO)
+eNextState pop3_connect_ip(AsyncIO *IO)
 {
        pop3aggr *cpptr = IO->Data;
 
-       CtdlLogPrintf(CTDL_DEBUG, "POP3: %s\n", __FUNCTION__);
+       syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
        
 ////   IO->ConnectMe = &cpptr->Pop3Host;
        /*  Bypass the ns lookup result like this: IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1"); */
 
        /////// 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 get_one_host_ip_done(AsyncIO *IO)
+eNextState pop3_get_one_host_ip_done(AsyncIO *IO)
 {
        pop3aggr *cpptr = IO->Data;
        struct hostent *hostent;
@@ -778,13 +803,13 @@ eNextState get_one_host_ip_done(AsyncIO *IO)
                        addr->sin_port   = htons(DefaultPOP3Port);
                        
                }
-               return connect_ip(IO);
+               return pop3_connect_ip(IO);
        }
        else
                return eAbort;
 }
 
-eNextState get_one_host_ip(AsyncIO *IO)
+eNextState pop3_get_one_host_ip(AsyncIO *IO)
 {
        pop3aggr *cpptr = IO->Data;
        /* 
@@ -796,27 +821,20 @@ eNextState get_one_host_ip(AsyncIO *IO)
 
        InitC_ares_dns(IO);
 
-       CtdlLogPrintf(CTDL_DEBUG, "POP3: %s\n", __FUNCTION__);
+       syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
 
-       CtdlLogPrintf(CTDL_DEBUG, 
+       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);
 
-       if (!QueueQuery((cpptr->IO.ConnectMe->IPv6)? ns_t_aaaa : ns_t_a, 
-                       cpptr->IO.ConnectMe->Host, 
-                       &cpptr->IO, 
-                       &cpptr->HostLookup, 
-                       get_one_host_ip_done))
-       {
-//             cpptr->MyQEntry->Status = 5;
-//             StrBufPrintf(SendMsg->MyQEntry->StatusMessage, 
-//                          "No MX hosts found for <%s>", SendMsg->node);
-               cpptr->IO.NextState = eTerminateConnection;
-               return IO->NextState;
-       }
+       QueueQuery((cpptr->IO.ConnectMe->IPv6)? ns_t_aaaa : ns_t_a, 
+                  cpptr->IO.ConnectMe->Host, 
+                  &cpptr->IO, 
+                  &cpptr->HostLookup, 
+                  pop3_get_one_host_ip_done);
        IO->NextState = eReadDNSReply;
        return IO->NextState;
 }
@@ -834,6 +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.DNS.Fail      = POP3_C_DNSFail;
        cpptr->IO.Timeout       = POP3_C_Timeout;
        cpptr->IO.ShutdownAbort = POP3_C_Shutdown;
        
@@ -843,21 +862,24 @@ int pop3_do_fetching(pop3aggr *cpptr)
        
        cpptr->IO.NextState     = eReadMessage;
 /* TODO
-   CtdlLogPrintf(CTDL_DEBUG, "POP3: %s %s %s <password>\n", roomname, pop3host, pop3user);
-   CtdlLogPrintf(CTDL_NOTICE, "Connecting to <%s>\n", pop3host);
+   syslog(LOG_DEBUG, "POP3: %s %s %s <password>\n", roomname, pop3host, pop3user);
+   syslog(LOG_DEBUG, "Connecting to <%s>\n", pop3host);
 */
        
        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,
-                                 connect_ip);
+                                 pop3_connect_ip);
        }
        else { /* uneducated admin has chosen to add DNS to the equation... */
                QueueEventContext(&cpptr->IO,
-                                 get_one_host_ip);
+                                 pop3_get_one_host_ip);
        }
        return 1;
 }
@@ -882,48 +904,49 @@ void pop3client_scan_room(struct ctdlroom *qrbuf, void *data)
 //     pop3_room_counter *Count = NULL;
 //     pop3aggr *cpptr;
 
-       citthread_mutex_lock(&POP3QueueMutex);
+       pthread_mutex_lock(&POP3QueueMutex);
        if (GetHash(POP3QueueRooms, LKEY(qrbuf->QRnumber), &vptr))
        {
-               CtdlLogPrintf(CTDL_DEBUG, 
+               syslog(LOG_DEBUG, 
                              "pop3client: [%ld] %s already in progress.\n", 
                              qrbuf->QRnumber, 
                              qrbuf->QRname);
-               citthread_mutex_unlock(&POP3QueueMutex);
-               return;
+               pthread_mutex_unlock(&POP3QueueMutex);
        }
-       citthread_mutex_unlock(&POP3QueueMutex);
+       pthread_mutex_unlock(&POP3QueueMutex);
+
+       if (server_shutting_down) return;
 
        assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
 
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                return;
                
        /* Only do net processing for rooms that have netconfigs */
        fd = open(filename, 0);
        if (fd <= 0) {
-               //CtdlLogPrintf(CTDL_DEBUG, "rssclient: %s no config.\n", qrbuf->QRname);
+               //syslog(LOG_DEBUG, "rssclient: %s no config.\n", qrbuf->QRname);
                return;
        }
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                return;
        if (fstat(fd, &statbuf) == -1) {
-               CtdlLogPrintf(CTDL_DEBUG,  "ERROR: could not stat configfile '%s' - %s\n",
+               syslog(LOG_DEBUG, "ERROR: could not stat configfile '%s' - %s\n",
                              filename, strerror(errno));
                return;
        }
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                return;
        CfgData = NewStrBufPlain(NULL, statbuf.st_size + 1);
        if (StrBufReadBLOB(CfgData, &fd, 1, statbuf.st_size, &Err) < 0) {
                close(fd);
                FreeStrBuf(&CfgData);
-               CtdlLogPrintf(CTDL_DEBUG,  "ERROR: reading config '%s' - %s<br>\n",
+               syslog(LOG_DEBUG, "ERROR: reading config '%s' - %s<br>\n",
                              filename, strerror(errno));
                return;
        }
        close(fd);
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                return;
        
        CfgPtr = NULL;
@@ -977,7 +1000,7 @@ void pop3client_scan_room(struct ctdlroom *qrbuf, void *data)
 #if 0 
 /* todo: we need to reunite the url to be shure. */
                                
-                               citthread_mutex_lock(&POP3ueueMutex);
+                               pthread_mutex_lock(&POP3ueueMutex);
                                GetHash(POP3FetchUrls, SKEY(ptr->Url), &vptr);
                                use_this_cptr = (pop3aggr *)vptr;
                                
@@ -1004,15 +1027,15 @@ void pop3client_scan_room(struct ctdlroom *qrbuf, void *data)
                                                Put(use_this_cptr->OtherQRnumbers, LKEY(qrbuf->QRnumber), QRnumber, NULL);
                                                use_this_cptr->roomlist_parts++;
                                        }
-                                       citthread_mutex_unlock(&POP3QueueMutex);
+                                       pthread_mutex_unlock(&POP3QueueMutex);
                                        continue;
                                }
-                               citthread_mutex_unlock(&RSSQueueMutex);
+                               pthread_mutex_unlock(&RSSQueueMutex);
 #endif
 
-                               citthread_mutex_lock(&POP3QueueMutex);
+                               pthread_mutex_lock(&POP3QueueMutex);
                                Put(POP3FetchUrls, SKEY(cptr->Url), cptr, DeletePOP3Aggregator);
-                               citthread_mutex_unlock(&POP3QueueMutex);
+                               pthread_mutex_unlock(&POP3QueueMutex);
 
                        }
 
@@ -1026,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;
@@ -1059,23 +1082,33 @@ void pop3client_scan(void) {
        if (doing_pop3client) return;
        doing_pop3client = 1;
 
-       CtdlLogPrintf(CTDL_DEBUG, "pop3client started\n");
+       syslog(LOG_DEBUG, "pop3client started");
        CtdlForEachRoom(pop3client_scan_room, NULL);
 
-
-       citthread_mutex_lock(&POP3QueueMutex);
+       pthread_mutex_lock(&POP3QueueMutex);
        it = GetNewHashPos(POP3FetchUrls, 0);
-       while (GetNextHashPos(POP3FetchUrls, it, &len, &Key, &vrptr) && 
+       while (!server_shutting_down && 
+              GetNextHashPos(POP3FetchUrls, it, &len, &Key, &vrptr) && 
               (vrptr != NULL)) {
                cptr = (pop3aggr *)vrptr;
                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 + config.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);
-       citthread_mutex_unlock(&POP3QueueMutex);
+       pthread_mutex_unlock(&POP3QueueMutex);
 
-       CtdlLogPrintf(CTDL_DEBUG, "pop3client ended\n");
+       syslog(LOG_DEBUG, "pop3client ended");
        last_run = time(NULL);
        doing_pop3client = 0;
 }
@@ -1083,7 +1116,8 @@ void pop3client_scan(void) {
 
 void pop3_cleanup(void)
 {
-       citthread_mutex_destroy(&POP3QueueMutex);
+       /* citthread_mutex_destroy(&POP3QueueMutex); TODO */
+       while (doing_pop3client != 0) ;
        DeleteHash(&POP3FetchUrls);
        DeleteHash(&POP3QueueRooms);
 }
@@ -1093,12 +1127,13 @@ CTDL_MODULE_INIT(pop3client)
        if (!threading)
        {
                CtdlFillSystemContext(&pop3_client_CC, "POP3aggr");
-               citthread_mutex_init(&POP3QueueMutex, NULL);
+               pthread_mutex_init(&POP3QueueMutex, NULL);
                POP3QueueRooms = NewHash(1, lFlathash);
                POP3FetchUrls = NewHash(1, NULL);
                CtdlRegisterSessionHook(pop3client_scan, EVT_TIMER);
                 CtdlRegisterCleanupHook(pop3_cleanup);
        }
-       /* return our Subversion id for the Log */
+
+       /* return our module id for the log */
         return "pop3client";
 }