Finalize Networker; native modern linux.

[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 199f051ee452f507f08ac563ddcf48dcd0471971..331a4d7c6de390d542b02f87a4e697bab4571d47 100644 (file)
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -136,6 +136,7 @@ void DeletePOP3Aggregator(void *vptr)
        FreeStrBuf(&ptr->IO.SendBuf.Buf);
        FreeStrBuf(&ptr->IO.RecvBuf.Buf);
        DeleteAsyncMsg(&ptr->IO.ReadMsg);
+       FreeAsyncIOContents(&ptr->IO);
        free(ptr);
 }
 
@@ -145,6 +146,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);
@@ -680,6 +682,14 @@ eNextState POP3_C_ConnFail(AsyncIO *IO)
        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)
 {
        syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
@@ -739,7 +749,7 @@ eNextState POP3_C_ReAttachToFetchMessages(AsyncIO *IO)
        return IO->NextState;
 }
 
-eNextState connect_ip(AsyncIO *IO)
+eNextState pop3_connect_ip(AsyncIO *IO)
 {
        pop3aggr *cpptr = IO->Data;
 
@@ -756,7 +766,7 @@ eNextState connect_ip(AsyncIO *IO)
                           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;
@@ -787,13 +797,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;
        /* 
@@ -818,7 +828,7 @@ eNextState get_one_host_ip(AsyncIO *IO)
                   cpptr->IO.ConnectMe->Host, 
                   &cpptr->IO, 
                   &cpptr->HostLookup, 
-                  get_one_host_ip_done);
+                  pop3_get_one_host_ip_done);
        IO->NextState = eReadDNSReply;
        return IO->NextState;
 }
@@ -836,6 +846,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.DNSFail       = POP3_C_DNSFail;
        cpptr->IO.Timeout       = POP3_C_Timeout;
        cpptr->IO.ShutdownAbort = POP3_C_Shutdown;
        
@@ -855,11 +866,11 @@ int pop3_do_fetching(pop3aggr *cpptr)
 
        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;
 }