Fucked up the sequence of arguments for the floodprotected aide message

[citadel.git] / citadel / modules / pop3client / serv_pop3client.c

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index 2d4c02530adc6470a0b9ed460abfc766c5ed0b8d..950436dd8ed65d5eaa4954b5cdbba915efc9af56 100644 (file)
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <sysconfig.h>
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -63,42 +64,42 @@ int POP3ClientDebugEnabled = 0;
 
 #define EVP3C_syslog(LEVEL, FORMAT, ...)                               \
        DBGLOG(LEVEL) syslog(LEVEL,                                     \
-                            "IO[%ld]CC[%d][%ld]POP3: " FORMAT,         \
-                            IO->ID, CCID, N, __VA_ARGS__)
+                            "%s[%ld]CC[%d][%ld]POP3: " FORMAT,         \
+                            IOSTR, IO->ID, CCID, N, __VA_ARGS__)
 
 #define EVP3CM_syslog(LEVEL, FORMAT)                                   \
        DBGLOG(LEVEL) syslog(LEVEL,                                     \
-                            "IO[%ld]CC[%d][%ld]POP3: " FORMAT,         \
-                            IO->ID, CCID, N)
+                            "%s[%ld]CC[%d][%ld]POP3: " FORMAT,         \
+                            IOSTR, IO->ID, CCID, N)
 
 #define EVP3CQ_syslog(LEVEL, FORMAT, ...)                              \
        DBGLOG(LEVEL) syslog(LEVEL,                                     \
-                            "P3Q:" FORMAT,                             \
-                            __VA_ARGS__)
+                            "%s P3Q:" FORMAT,                          \
+                            IOSTR, __VA_ARGS__)
 
 #define EVP3CQM_syslog(LEVEL, FORMAT)                                  \
        DBGLOG(LEVEL) syslog(LEVEL,                                     \
-                            "P3Q" FORMAT                               \
-               )
+                            "%s P3Q" FORMAT,                           \
+                            IOSTR)
 
 #define EVP3CCS_syslog(LEVEL, FORMAT, ...)                             \
-       DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]POP3: " FORMAT,        \
-                            IO->ID, N, __VA_ARGS__)
+       DBGLOG(LEVEL) syslog(LEVEL, "%s[%ld][%ld]POP3: " FORMAT,        \
+                            IOSTR, IO->ID, N, __VA_ARGS__)
 
 #define EVP3CCSM_syslog(LEVEL, FORMAT)                                 \
-       DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]POP3: " FORMAT,        \
-                            IO->ID, N)
+       DBGLOG(LEVEL) syslog(LEVEL, "%s[%ld][%ld]POP3: " FORMAT,        \
+                            IOSTR, IO->ID, N)
 
 #define POP3C_DBG_SEND()                                               \
        EVP3C_syslog(LOG_DEBUG,                                         \
-                    "IO[%ld]CC[%d][%ld]POP3: > %s\n",                  \
-                    IO->ID, CCID, N,                                   \
+                    "%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,                                         \
-                    "IO[%ld]CC[%d][%ld]POP3: < %s\n",                  \
-                    IO->ID, CCID, N,                                   \
+                    "%s[%ld]CC[%d][%ld]POP3: < %s\n",                  \
+                    IOSTR, IO->ID, CCID, N,                            \
                     ChrPtr(RecvMsg->IO.IOBuf))
 
 
@@ -158,6 +159,44 @@ void HfreeFetchItem(void *vItem)
        free(Item);
 }
 
+
+
+typedef enum _POP3State {
+       eCreated,
+       eGreeting,
+       eUser,
+       ePassword,
+       eListing,
+       eUseTable,
+       eGetMsgID,
+       eGetMsg,
+       eStoreMsg,
+       eDelete,
+       eQuit
+} POP3State;
+
+ConstStr POP3States[] = {
+       {HKEY("Aggregator created")},
+       {HKEY("Reading Greeting")},
+       {HKEY("Sending User")},
+       {HKEY("Sending Password")},
+       {HKEY("Listing")},
+       {HKEY("Fetching Usetable")},
+       {HKEY("Get MSG ID")},
+       {HKEY("Get Message")},
+       {HKEY("Store Msg")},
+       {HKEY("Delete Upstream")},
+       {HKEY("Quit")}
+};
+
+static void SetPOP3State(AsyncIO *IO, POP3State State)
+{
+       CitContext* CCC = IO->CitContext;
+       if (CCC != NULL)
+               memcpy(CCC->cs_clientname, POP3States[State].Key, POP3States[State].len + 1);
+}
+
+
 struct pop3aggr {
        AsyncIO  IO;
 
@@ -240,6 +279,7 @@ eNextState FailAggregationRun(AsyncIO *IO)
 eNextState POP3C_ReadGreeting(pop3aggr *RecvMsg)
 {
        AsyncIO *IO = &RecvMsg->IO;
+       SetPOP3State(IO, eGreeting);
        POP3C_DBG_READ();
        /* Read the server greeting */
        if (!POP3C_OK) return eTerminateConnection;
@@ -249,6 +289,7 @@ eNextState POP3C_ReadGreeting(pop3aggr *RecvMsg)
 eNextState POP3C_SendUser(pop3aggr *RecvMsg)
 {
        AsyncIO *IO = &RecvMsg->IO;
+       SetPOP3State(IO, eUser);
        /* Identify ourselves.  NOTE: we have to append a CR to each command.
         *  The LF will automatically be appended by sock_puts().  Believe it
         * or not, leaving out the CR will cause problems if the server happens
@@ -272,6 +313,7 @@ eNextState POP3C_GetUserState(pop3aggr *RecvMsg)
 eNextState POP3C_SendPassword(pop3aggr *RecvMsg)
 {
        AsyncIO *IO = &RecvMsg->IO;
+       SetPOP3State(IO, ePassword);
        /* Password */
        StrBufPrintf(RecvMsg->IO.SendBuf.Buf,
                     "PASS %s\r\n", ChrPtr(RecvMsg->pop3pass));
@@ -291,6 +333,8 @@ eNextState POP3C_GetPassState(pop3aggr *RecvMsg)
 eNextState POP3C_SendListCommand(pop3aggr *RecvMsg)
 {
        AsyncIO *IO = &RecvMsg->IO;
+       SetPOP3State(IO, eListing);
+
        /* Get the list of messages */
        StrBufPlain(RecvMsg->IO.SendBuf.Buf, HKEY("LIST\r\n"));
        POP3C_DBG_SEND();
@@ -375,6 +419,8 @@ eNextState POP3_FetchNetworkUsetableEntry(AsyncIO *IO)
        void *vData;
        pop3aggr *RecvMsg = (pop3aggr *) IO->Data;
 
+       SetPOP3State(IO, eUseTable);
+
        if((RecvMsg->Pos != NULL) &&
           GetNextHashPos(RecvMsg->MsgNumbers,
                          RecvMsg->Pos,
@@ -387,8 +433,8 @@ eNextState POP3_FetchNetworkUsetableEntry(AsyncIO *IO)
 
                if (CheckIfAlreadySeen("POP3 Item Seen",
                                       RecvMsg->CurrMsg->MsgUID,
-                                      IO->Now,
-                                      IO->Now, //// todo
+                                      EvGetNow(IO),
+                                      EvGetNow(IO) - USETABLE_ANTIEXPIRE,
                                       eCheckUpdate,
                                       IO->ID, CCID)
                    != 0)
@@ -409,8 +455,7 @@ eNextState POP3_FetchNetworkUsetableEntry(AsyncIO *IO)
                /* ok, now we know them all,
                 * continue with reading the actual messages. */
                DeleteHashPos(&RecvMsg->Pos);
-               StopDBWatchers(IO);
-               return QueueEventContext(IO, POP3_C_ReAttachToFetchMessages);
+               return DBQueueEventContext(IO, POP3_C_ReAttachToFetchMessages);
        }
 }
 
@@ -421,6 +466,7 @@ eNextState POP3C_GetOneMessagID(pop3aggr *RecvMsg)
        const char *HKey;
        void *vData;
 
+       SetPOP3State(IO, eGetMsgID);
 #if 0
        int rc;
        rc = TestValidateHash(RecvMsg->MsgNumbers);
@@ -446,8 +492,9 @@ eNextState POP3C_GetOneMessagID(pop3aggr *RecvMsg)
                DeleteHashPos(&RecvMsg->Pos);
                /// done receiving uidls.. start looking them up now.
                RecvMsg->Pos = GetNewHashPos(RecvMsg->MsgNumbers, 0);
-               return QueueDBOperation(&RecvMsg->IO,
-                                       POP3_FetchNetworkUsetableEntry);
+               return EventQueueDBOperation(&RecvMsg->IO,
+                                            POP3_FetchNetworkUsetableEntry,
+                                            0);
        }
        return eReadMore; /* TODO */
 }
@@ -490,6 +537,8 @@ eNextState POP3C_SendGetOneMsg(pop3aggr *RecvMsg)
        const char *HKey;
        void *vData;
 
+       SetPOP3State(IO, eGetMsg);
+
        RecvMsg->CurrMsg = NULL;
        while ((RecvMsg->Pos != NULL) && 
               GetNextHashPos(RecvMsg->MsgNumbers,
@@ -535,18 +584,19 @@ eNextState POP3C_StoreMsgRead(AsyncIO *IO)
 {
        pop3aggr *RecvMsg = (pop3aggr *) IO->Data;
 
+       SetPOP3State(IO, eStoreMsg);
+
        EVP3CCS_syslog(LOG_DEBUG,
                       "MARKING: %s as seen: ",
                       ChrPtr(RecvMsg->CurrMsg->MsgUID));
        CheckIfAlreadySeen("POP3 Item Seen",
                           RecvMsg->CurrMsg->MsgUID,
-                          IO->Now,
-                          IO->Now, //// todo
+                          EvGetNow(IO),
+                          EvGetNow(IO) - USETABLE_ANTIEXPIRE,
                           eWrite,
                           IO->ID, CCID);
 
-       StopDBWatchers(IO);
-       return QueueEventContext(&RecvMsg->IO, POP3_C_ReAttachToFetchMessages);
+       return DBQueueEventContext(&RecvMsg->IO, POP3_C_ReAttachToFetchMessages);
 }
 eNextState POP3C_SaveMsg(AsyncIO *IO)
 {
@@ -565,7 +615,7 @@ eNextState POP3C_SaveMsg(AsyncIO *IO)
                 * so we don't fetch this message again
                 */
        }
-       CtdlFreeMessage(RecvMsg->CurrMsg->Msg);
+       CM_Free(RecvMsg->CurrMsg->Msg);
 
        RecvMsg->count ++;
        return NextDBOperation(&RecvMsg->IO, POP3C_StoreMsgRead);
@@ -577,13 +627,15 @@ eNextState POP3C_ReadMessageBody(pop3aggr *RecvMsg)
        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);
+       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);
@@ -606,6 +658,8 @@ eNextState POP3C_ReadDeleteState(pop3aggr *RecvMsg)
 eNextState POP3C_SendQuit(pop3aggr *RecvMsg)
 {
        AsyncIO *IO = &RecvMsg->IO;
+       SetPOP3State(IO, eQuit);
+
        /* Log out */
        StrBufPlain(RecvMsg->IO.SendBuf.Buf,
                    HKEY("QUIT\r\n3)"));