* Don't tell libcurl to use an interface that does not exist

[citadel.git] / citadel / modules / rssclient / serv_rssclient.c

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index de4c48cfc66807f00a78449b9cd87d5ce8c09843..7f8e9f383dd704d287de0023d2cd03bf864d13c9 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -3,21 +3,21 @@
  *
  * Bring external RSS feeds into rooms.
  *
- * Copyright (c) 2007-2009 by the citadel.org team
+ * Copyright (c) 2007-2010 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 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 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>
@@ -292,6 +292,7 @@ void rss_save_item(rsscollection *rssc) {
        recp = (struct recptypes *) malloc(sizeof(struct recptypes));
        if (recp == NULL) return;
        memset(recp, 0, sizeof(struct recptypes));
+       memset(&ut, 0, sizeof(struct UseTable));
        recp->recp_room = strdup(ri->roomlist);
        recp->num_room = num_tokens(ri->roomlist, '|');
        recp->recptypes_magic = RECPTYPES_MAGIC;
@@ -320,6 +321,7 @@ void rss_save_item(rsscollection *rssc) {
        }
 
        /* Find out if we've already seen this item */
+
        cdbut = cdb_fetch(CDB_USETABLE, utmsgid, strlen(utmsgid));
        if (cdbut != NULL) {
                /* Item has already been seen */
@@ -352,9 +354,31 @@ void rss_save_item(rsscollection *rssc) {
                }
 
                if (ri->author_or_creator != NULL) {
-                       msg->cm_fields['A'] = html_to_ascii(ri->author_or_creator,
-                               strlen(ri->author_or_creator), 512, 0);
-                       striplt(msg->cm_fields['A']);
+                       char *From;
+                       StrBuf *Encoded, *QPEncoded;
+                       StrBuf *UserName;
+                       StrBuf *EmailAddress;
+                       StrBuf *EncBuf;
+                       
+                       UserName = NewStrBuf();
+                       EmailAddress = NewStrBuf();
+                       EncBuf = NewStrBuf();
+
+                       From = html_to_ascii(ri->author_or_creator,
+                                            strlen(ri->author_or_creator), 
+                                            512, 0);
+
+                       Encoded = NewStrBufPlain(From, -1);
+                       free(From);
+                       StrBufTrim(Encoded);
+                       QPEncoded = StrBufSanitizeEmailRecipientVector(Encoded, UserName, EmailAddress, EncBuf);
+                       msg->cm_fields['A'] = SmashStrBuf(&QPEncoded);
+
+                       FreeStrBuf(&Encoded);
+                       FreeStrBuf(&UserName);
+                       FreeStrBuf(&EmailAddress);
+                       FreeStrBuf(&EncBuf);
+
                }
                else {
                        msg->cm_fields['A'] = strdup("rss");
@@ -362,8 +386,21 @@ void rss_save_item(rsscollection *rssc) {
 
                msg->cm_fields['N'] = strdup(NODENAME);
                if (ri->title != NULL) {
-                       msg->cm_fields['U'] = html_to_ascii(ri->title, strlen(ri->title), 512, 0);
-                       striplt(msg->cm_fields['U']);
+                       long len;
+                       char *Sbj;
+                       StrBuf *Encoded, *QPEncoded;
+
+                       QPEncoded = NULL;
+                       len = strlen(ri->title);
+                       Sbj = html_to_ascii(ri->title, len, 512, 0);
+                       Encoded = NewStrBufPlain(Sbj, -1);
+                       free(Sbj);
+
+                       StrBufTrim(Encoded);
+                       StrBufRFC2047encode(&QPEncoded, Encoded);
+
+                       msg->cm_fields['U'] = SmashStrBuf(&QPEncoded);
+                       FreeStrBuf(&Encoded);
                }
                msg->cm_fields['T'] = malloc(64);
                snprintf(msg->cm_fields['T'], 64, "%ld", ri->pubdate);
@@ -729,7 +766,12 @@ void rss_do_fetching(rssnetcfg *Cfg) {
 #endif
        curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180);           /* die after 180 seconds */
-       if (!IsEmptyStr(config.c_ip_addr)) {
+       if (
+               (!IsEmptyStr(config.c_ip_addr))
+               && (strcmp(config.c_ip_addr, "*"))
+               && (strcmp(config.c_ip_addr, "::"))
+               && (strcmp(config.c_ip_addr, "0.0.0.0"))
+       ) {
                curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
        }
 
@@ -873,8 +915,6 @@ void *rssclient_scan(void *args) {
        CtdlFillSystemContext(&rssclientCC, "rssclient");
        citthread_setspecific(MyConKey, (void *)&rssclientCC );
 
-       CtdlThreadAllocTSD();
-
        /*
         * This is a simple concurrency check to make sure only one rssclient run
         * is done at a time.  We could do this with a mutex, but since we
@@ -902,6 +942,7 @@ void *rssclient_scan(void *args) {
                CtdlThreadSchedule ("RSS Client", CTDLTHREAD_BIGSTACK, rssclient_scan, NULL, last_run + config.c_net_freq);
        else
                CtdlLogPrintf(CTDL_DEBUG, "rssclient: Task STOPPED.\n");
+       CtdlClearSystemContext();
        return NULL;
 }