Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

diff --git a/citadel/debian/rules b/citadel/debian/rules
index 7e478e1789b3d0f9f890c9e05ebd02b0df23f108..ef15cba83710e5b7371bc7296b424cd34f96aed2 100755 (executable)
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -16,7 +16,7 @@ CFLAGS = -Wall -g -Werror=format-security
 COMPILER=
 EXTRA_ARGS=
 PROFILE_ARGS=
-#to enable debugging: export DEB_BUILD_OPTIONS="debug profiling threadoff rss gcov clang"
+#to enable debugging: export DEB_BUILD_OPTIONS="debug profiling threadoff rss gcov clang cares"
 ifneq (,$(findstring clang,$(DEB_BUILD_OPTIONS)))
         COMPILER="clang" 
 endif
@@ -54,6 +54,10 @@ ifneq (,$(findstring rss,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -D DEBUG_RSS
 endif
 
+ifneq (,$(findstring cares,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -D DEBUG_CARES
+endif
+
 ifneq (,$(findstring iodbg,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -D BIGBAD_IODBG
 endif

diff --git a/citadel/event_client.c b/citadel/event_client.c
index f893548e421e85342ec5d37dd31f4560d940ea64..b5e54b9593047411e3780e60411c49ed2ed14ed8 100644 (file)
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -700,9 +700,15 @@ IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
        switch (IO->DNSQuery->PostDNS(IO))
        {
        case eAbort:
-               IO->DNSFail(IO);
+               switch (IO->DNSFail(IO)) {
+               case eAbort:
+                       ShutDownCLient(IO);
+               default:
+                       break;
+                       
+               }
        default:
-           break;
+               break;
        }
 }
 

diff --git a/citadel/event_client.h b/citadel/event_client.h
index 6d4f50dedcb47167d48e6491ce83035cd3b8ab91..ea68053d295bdd9cce9d9607f411824dfb344d6f 100644 (file)
--- a/citadel/event_client.h
+++ b/citadel/event_client.h
@@ -1,6 +1,7 @@
 #ifndef __EVENT_CLIENT_H__
 #define __EVENT_CLIENT_H__
 #define EV_COMPAT3 0
+#include "sysconfig.h"
 #include <ev.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -120,6 +121,7 @@ struct AsyncIO {
        /* DNS Related */
        ev_io dns_recv_event, 
                dns_send_event;
+       ev_timer dns_timeout;           /* timeout while requesting ips */
 #ifdef DEBUG_CARES
        short int DnsSourcePort;
 #endif
@@ -133,6 +135,7 @@ struct AsyncIO {
        ReadAsyncMsg *ReadMsg;
        struct CtdlMessage *AsyncMsg;
        struct recptypes *AsyncRcp;
+
        /* Custom data; its expected to contain  AsyncIO so we can save malloc()s... */
        void *Data;        /* application specific data */
        void *CitContext;  /* Citadel Session context... */

diff --git a/citadel/modules/c-ares-dns/serv_c-ares-dns.c b/citadel/modules/c-ares-dns/serv_c-ares-dns.c
index a97f5368d6cbbc15efe6684bbb952ab62d8cfa7a..8a18b3259e1cd0ed619b18c0fd5c7ac79ee23791 100644 (file)
--- a/citadel/modules/c-ares-dns/serv_c-ares-dns.c
+++ b/citadel/modules/c-ares-dns/serv_c-ares-dns.c
@@ -72,9 +72,11 @@ static void HostByAddrCb(void *data,
 #ifdef DEBUG_CARES
        EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
 #endif
+       ev_timer_stop (event_base, &IO->dns_timeout);
+
        IO->DNSQuery->DNSStatus = status;
        if  (status != ARES_SUCCESS) {
-//             ResolveError(*cb, status);
+               StrBufPlain(IO->ErrMsg, ares_strerror(status), -1);
                return;
        }
        IO->DNSQuery->Data = hostent;
@@ -94,7 +96,7 @@ static void ParseAnswerA(AsyncIO *IO, unsigned char* abuf, int alen)
 
        IO->DNSQuery->DNSStatus = ares_parse_a_reply(abuf, alen, &host, NULL, NULL);
        if (IO->DNSQuery->DNSStatus != ARES_SUCCESS) {
-//    ResolveError(arg->js_cb, status);
+               StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNSQuery->DNSStatus), -1);
                return;
        }
        IO->DNSQuery->VParsedDNSReply = host;
@@ -115,7 +117,7 @@ static void ParseAnswerAAAA(AsyncIO *IO, unsigned char* abuf, int alen)
 
        IO->DNSQuery->DNSStatus = ares_parse_aaaa_reply(abuf, alen, &host, NULL, NULL);
        if (IO->DNSQuery->DNSStatus != ARES_SUCCESS) {
-//    ResolveError(arg->js_cb, status);
+               StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNSQuery->DNSStatus), -1);
                return;
        }
        IO->DNSQuery->VParsedDNSReply = host;
@@ -137,7 +139,7 @@ static void ParseAnswerCNAME(AsyncIO *IO, unsigned char* abuf, int alen)
 
        IO->DNSQuery->DNSStatus = ares_parse_a_reply(abuf, alen, &host, NULL, NULL);
        if (IO->DNSQuery->DNSStatus != ARES_SUCCESS) {
-//    ResolveError(arg->js_cb, status);
+               StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNSQuery->DNSStatus), -1);
                return;
        }
 
@@ -160,7 +162,7 @@ static void ParseAnswerMX(AsyncIO *IO, unsigned char* abuf, int alen)
 
        IO->DNSQuery->DNSStatus = ares_parse_mx_reply(abuf, alen, &mx_out);
        if (IO->DNSQuery->DNSStatus != ARES_SUCCESS) {
-//    ResolveError(arg->js_cb, status);
+               StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNSQuery->DNSStatus), -1);
                return;
        }
 
@@ -182,7 +184,7 @@ static void ParseAnswerNS(AsyncIO *IO, unsigned char* abuf, int alen)
 
        IO->DNSQuery->DNSStatus = ares_parse_ns_reply(abuf, alen, &host);
        if (IO->DNSQuery->DNSStatus != ARES_SUCCESS) {
-//    ResolveError(arg->js_cb, status);
+               StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNSQuery->DNSStatus), -1);
                return;
        }
        IO->DNSQuery->VParsedDNSReply = host;
@@ -203,7 +205,7 @@ static void ParseAnswerSRV(AsyncIO *IO, unsigned char* abuf, int alen)
 
        IO->DNSQuery->DNSStatus = ares_parse_srv_reply(abuf, alen, &srv_out);
        if (IO->DNSQuery->DNSStatus != ARES_SUCCESS) {
-//    ResolveError(arg->js_cb, status);
+               StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNSQuery->DNSStatus), -1);
                return;
        }
 
@@ -225,7 +227,7 @@ static void ParseAnswerTXT(AsyncIO *IO, unsigned char* abuf, int alen)
 
        IO->DNSQuery->DNSStatus = ares_parse_txt_reply(abuf, alen, &txt_out);
        if (IO->DNSQuery->DNSStatus != ARES_SUCCESS) {
-//    ResolveError(arg->js_cb, status);
+               StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNSQuery->DNSStatus), -1);
                return;
        }
        IO->DNSQuery->VParsedDNSReply = txt_out;
@@ -242,13 +244,18 @@ void QueryCb(void *arg,
 #ifdef DEBUG_CARES
        EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
 #endif
+       ev_timer_stop (event_base, &IO->dns_timeout);
 
        IO->DNSQuery->DNSStatus = status;
        if (status == ARES_SUCCESS)
                IO->DNSQuery->DNS_CB(arg, abuf, alen);
-       else
+       else {
+               EV_syslog(LOG_DEBUG, "C-ARES: Failed by: %s error %s\n",
+                         __FUNCTION__,
+                         ares_strerror(status));
+               StrBufPlain(IO->ErrMsg, ares_strerror(status), -1);
                IO->DNSQuery->DNSStatus = status;
-///    ev_io_stop(event_base, &IO->DNSQuery->dns_io_event);
+       }
        
        ev_idle_init(&IO->unwind_stack,
                     IO_postdns_callback);
@@ -270,7 +277,7 @@ void InitC_ares_dns(AsyncIO *IO)
 {
        int optmask = 0;
 #ifdef DEBUG_CARES
-       EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+       EV_syslog(LOG_DEBUG, "C-ARES: %s %p\n", __FUNCTION__, IO->DNSChannel);
 #endif
 
        if (IO->DNSChannel == NULL) {
@@ -279,6 +286,33 @@ void InitC_ares_dns(AsyncIO *IO)
                IO->DNSOptions.sock_state_cb_data = IO;
                ares_init_options(&IO->DNSChannel, &IO->DNSOptions, optmask);
        }
+       IO->DNSQuery->DNSStatus = 0;
+}
+
+static void
+DNS_timeouttrigger_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
+{
+       AsyncIO *IO = watcher->data;
+       struct timeval tv, MaxTV;
+       struct timeval *NextTV;
+
+       memset(&MaxTV, 0, sizeof(MaxTV));
+       memset(&tv, 0, sizeof(tv));
+       MaxTV.tv_sec = 30;
+       NextTV = ares_timeout(IO->DNSChannel, &MaxTV, &tv);
+
+       if ((NextTV->tv_sec != MaxTV.tv_sec) ||
+           (NextTV->tv_usec != MaxTV.tv_usec))
+       {
+               fd_set readers, writers;
+#ifdef DEBUG_CARES
+               EV_syslog(LOG_DEBUG, "C-ARES: %s Timeout!\n", __FUNCTION__);
+#endif
+               FD_ZERO(&readers);
+               FD_ZERO(&writers);
+               ares_fds(IO->DNSChannel, &readers, &writers);
+               ares_process(IO->DNSChannel, &readers, &writers);
+       }
 }
 
 void QueueGetHostByNameDone(void *Ctx, 
@@ -305,6 +339,7 @@ void QueueGetHostByName(AsyncIO *IO, const char *Hostname, DNSQueryParts *QueryP
 {
 #ifdef DEBUG_CARES
        EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+       IO->DnsSourcePort = 0;
 #endif
 
        IO->DNSQuery = QueryParts;
@@ -312,23 +347,33 @@ void QueueGetHostByName(AsyncIO *IO, const char *Hostname, DNSQueryParts *QueryP
 
        InitC_ares_dns(IO);
 
+       ev_timer_init(&IO->dns_timeout, DNS_timeouttrigger_callback, 10, 1);
+       IO->dns_timeout.data = IO;
        ares_gethostbyname(IO->DNSChannel,
                           Hostname,   
                           AF_INET6, /* it falls back to ipv4 in doubt... */
                           QueueGetHostByNameDone,
                           IO);
-//get_one_mx_host_ip_done);
+       ev_timer_start(event_base, &IO->dns_timeout);
+
 }
 int QueueQuery(ns_type Type, const char *name, AsyncIO *IO, DNSQueryParts *QueryParts, IO_CallBack PostDNS)
 {
        int length, family;
        char address_b[sizeof(struct in6_addr)];
 
+#ifdef DEBUG_CARES
+       IO->DnsSourcePort = 0;
+#endif
+
        IO->DNSQuery = QueryParts;
        IO->DNSQuery->PostDNS = PostDNS;
 
        InitC_ares_dns(IO);
 
+       ev_timer_init(&IO->dns_timeout, DNS_timeouttrigger_callback, 10, 1);
+       IO->dns_timeout.data = IO;
+
        switch(Type) {
        case ns_t_a:
                IO->DNSQuery->DNS_CB = ParseAnswerA;
@@ -372,7 +417,7 @@ int QueueQuery(ns_type Type, const char *name, AsyncIO *IO, DNSQueryParts *Query
                }
 
                ares_gethostbyaddr(IO->DNSChannel, address_b, length, family, HostByAddrCb, IO);
-
+               ev_timer_start(event_base, &IO->dns_timeout);
 #ifdef DEBUG_CARES
                EV_syslog(LOG_DEBUG, "C-ARES: %s X1\n", __FUNCTION__);
 #endif
@@ -388,6 +433,7 @@ int QueueQuery(ns_type Type, const char *name, AsyncIO *IO, DNSQueryParts *Query
        EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
 #endif
        ares_query(IO->DNSChannel, name, ns_c_in, Type, QueryCb, IO);
+       ev_timer_start(event_base, &IO->dns_timeout);
        return 1;
 }
 
@@ -396,7 +442,7 @@ int QueueQuery(ns_type Type, const char *name, AsyncIO *IO, DNSQueryParts *Query
 
 
 /*****************************************************************************
- *                   libevent / c-ares integration                           *
+ *                      libev / c-ares integration                           *
  *****************************************************************************/
 static void DNS_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 {
@@ -421,11 +467,6 @@ static void DNS_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 
 void SockStateCb(void *data, int sock, int read, int write) 
 {
-       /*
-       struct timeval tvbuf, maxtv, *ret;
-       
-       int64_t time = 10;
-*/
        AsyncIO *IO = data;
 /* already inside of the event queue. */
 #ifdef DEBUG_CARES
@@ -467,16 +508,6 @@ void SockStateCb(void *data, int sock, int read, int write)
                IO->dns_send_event.data = IO;
                ev_io_start(event_base, &IO->dns_send_event);
        }
-/*
-
-               ev_io_start(event_base, &IO->dns_io_event);
-       
-               maxtv.tv_sec = time/1000;
-               maxtv.tv_usec = (time % 1000) * 1000;
-               
-               ret = ares_timeout(IO->DNSChannel, &maxtv, &tvbuf);
-       }
-*/
        if ((read == 0) && (write == 0)) {
                ev_io_stop(event_base, &IO->dns_recv_event);
                ev_io_stop(event_base, &IO->dns_send_event);

diff --git a/citadel/modules/eventclient/serv_eventclient.c b/citadel/modules/eventclient/serv_eventclient.c
index d930a228a6e8c4a360b833eb3812180ef2ede945..91e617617db8026c98b3da859827444317848634 100644 (file)
--- a/citadel/modules/eventclient/serv_eventclient.c
+++ b/citadel/modules/eventclient/serv_eventclient.c
@@ -359,8 +359,8 @@ int evcurl_init(AsyncIO *IO,
         OPT(NOSIGNAL, 1L);
         OPT(FAILONERROR, (long)1);
         OPT(ENCODING, "");
-        OPT(FOLLOWLOCATION, (long)1);
-        OPT(MAXREDIRS, (long)7);
+        OPT(FOLLOWLOCATION, (long)0);
+        OPT(MAXREDIRS, (long)0);
         OPT(USERAGENT, CITADEL);
 
         OPT(TIMEOUT, (long)1800);

diff --git a/citadel/modules/rssclient/rss_atom_parser.c b/citadel/modules/rssclient/rss_atom_parser.c
index 9bbeb8a1ffe26b4d5749f5f3a5fa9b52663eab67..84747d5d453de6d40ec27df136e67418af4ecaf3 100644 (file)
--- a/citadel/modules/rssclient/rss_atom_parser.c
+++ b/citadel/modules/rssclient/rss_atom_parser.c
@@ -144,7 +144,7 @@ void rss_xml_start(void *data, const char *supplied_el, const char **attr)
        char            *sep = NULL;
 
        /* Axe the namespace, we don't care about it */
-///    CtdlLogPrintf(0, "RSS: supplied el %d: %s...\n", rssc->Cfg->ItemType, supplied_el);
+///    syslog(LOG_DEBUG, "RSS: supplied el %d: %s...\n", rssc->Cfg->ItemType, supplied_el);
        pel = supplied_el;
        while (sep = strchr(pel, ':'), sep) {
                pel = sep + 1;
@@ -160,7 +160,7 @@ void rss_xml_start(void *data, const char *supplied_el, const char **attr)
                             &v))
                {
 #ifdef DEBUG_RSS
-                       CtdlLogPrintf(0, "RSS: START ignoring because of wrong namespace [%s] = [%s]\n", 
+                       syslog(LOG_DEBUG, "RSS: START ignoring because of wrong namespace [%s]\n", 
                                      supplied_el);
 #endif
                        return;
@@ -190,12 +190,12 @@ void rss_xml_start(void *data, const char *supplied_el, const char **attr)
                }
 #ifdef DEBUG_RSS
                else 
-                       CtdlLogPrintf(0, "RSS: START unhandled: [%s] [%s]...\n", pel, supplied_el);
+                       syslog(LOG_DEBUG, "RSS: START unhandled: [%s] [%s]...\n", pel, supplied_el);
 #endif
        }
 #ifdef DEBUG_RSS
        else 
-               CtdlLogPrintf(0, "RSS: START unhandled: [%s] [%s]...\n", pel,  supplied_el);
+               syslog(LOG_DEBUG, "RSS: START unhandled: [%s] [%s]...\n", pel,  supplied_el);
 #endif
 }
 
@@ -213,7 +213,7 @@ void rss_xml_end(void *data, const char *supplied_el)
        while (sep = strchr(pel, ':'), sep) {
                pel = sep + 1;
        }
-//     CtdlLogPrintf(0, "RSS: END %s...\n", el);
+//     syslog(LOG_DEBUG, "RSS: END %s...\n", el);
        if (pel != supplied_el)
        {
                void *v;
@@ -224,7 +224,7 @@ void rss_xml_end(void *data, const char *supplied_el)
                             &v))
                {
 #ifdef DEBUG_RSS
-                       CtdlLogPrintf(0, "RSS: END ignoring because of wrong namespace [%s] = [%s]\n", 
+                       syslog(LOG_DEBUG, "RSS: END ignoring because of wrong namespace [%s] = [%s]\n", 
                                      supplied_el, ChrPtr(rssc->CData));
 #endif
                        FlushStrBuf(rssc->CData);
@@ -255,12 +255,12 @@ void rss_xml_end(void *data, const char *supplied_el)
                }
 #ifdef DEBUG_RSS
                else 
-                       CtdlLogPrintf(0, "RSS: END   unhandled: [%s]  [%s] = [%s]...\n", pel, supplied_el, ChrPtr(rssc->CData));
+                       syslog(LOG_DEBUG, "RSS: END   unhandled: [%s]  [%s] = [%s]...\n", pel, supplied_el, ChrPtr(rssc->CData));
 #endif
        }
 #ifdef DEBUG_RSS
        else 
-               CtdlLogPrintf(0, "RSS: END   unhandled: [%s]  [%s] = [%s]...\n", pel, supplied_el, ChrPtr(rssc->CData));
+               syslog(LOG_DEBUG, "RSS: END   unhandled: [%s]  [%s] = [%s]...\n", pel, supplied_el, ChrPtr(rssc->CData));
 #endif
        FlushStrBuf(rssc->CData);
        rssc->Current = NULL;

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index a3afb9a9635d9c5ee7e5f38d50fd0df399f55cc8..efc274d37716515d52624095066b4b9f1527d3b5 100644 (file)
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -186,19 +186,25 @@ eNextState FailOneAttempt(AsyncIO *IO)
        /* 
         * possible ways here: 
         * - connection timeout 
-        * - 
+        * - dns lookup failed
         */
        StopClientWatchers(IO);
 
        if (SendMsg->pCurrRelay != NULL)
                SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next;
 
-       if (SendMsg->pCurrRelay == NULL)
+       if (SendMsg->pCurrRelay == NULL) {
+               EVS_syslog(LOG_DEBUG, "SMTP: %s Aborting\n", __FUNCTION__);
                return eAbort;
-       if (SendMsg->pCurrRelay->IsIP)
+       }
+       if (SendMsg->pCurrRelay->IsIP) {
+               EVS_syslog(LOG_DEBUG, "SMTP: %s connecting IP\n", __FUNCTION__);
                return mx_connect_ip(IO);
-       else
+       }
+       else {
+               EVS_syslog(LOG_DEBUG, "SMTP: %s resolving next MX Record\n", __FUNCTION__);
                return get_one_mx_host_ip(IO);
+       }
 }
 
 
@@ -624,7 +630,6 @@ eNextState SMTP_C_DNSFail(AsyncIO *IO)
        SmtpOutMsg *pMsg = IO->Data;
 
        EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
-       StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State]));
        return FailOneAttempt(IO);
 }
 eNextState SMTP_C_Shutdown(AsyncIO *IO)