]> code.citadel.org Git - citadel.git/blobdiff - citadel/modules/rssclient/serv_rssclient.c
fix pointer indirections so we now can successfully fetch RSS feeds again.
[citadel.git] / citadel / modules / rssclient / serv_rssclient.c
index 424aec4894448cd44a8b9771adb65d9524ba34dc..13a887e0f5a87d2806f433628b1fcb61fb0aaa70 100644 (file)
@@ -1,8 +1,21 @@
 /*
- * $Id: serv_rssclient.c 5652 2007-10-29 20:14:48Z ajc $
- *
  * Bring external RSS feeds into rooms.
  *
+ * 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 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
  */
 
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <expat.h>
+#include <curl/curl.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "tools.h"
-#include "room_ops.h"
+#include "threads.h"
 #include "ctdl_module.h"
-#include "clientsocket.h"
 #include "msgbase.h"
+#include "parsedate.h"
 #include "database.h"
 #include "citadel_dirs.h"
 #include "md5.h"
-
-#ifdef HAVE_EXPAT
-#include <expat.h>
+#include "context.h"
+#include "event_client.h"
+#include "rss_atom_parser.h"
 
 
-struct rssnetcfg {
-       struct rssnetcfg *next;
-       char url[256];
-       char *rooms;
-};
-
-struct rss_item {
-       char *chardata;
-       int chardata_len;
-       char *roomlist;
-       int done_parsing;
-       char *guid;
-       char *title;
-       char *link;
-       char *description;
-       time_t pubdate;
-};
-
 struct rssnetcfg *rnclist = NULL;
-
-
+void AppendLink(StrBuf *Message, StrBuf *link, StrBuf *LinkTitle, const char *Title)
+{
+       if (StrLength(link) > 0)
+       {
+               StrBufAppendBufPlain(Message, HKEY("<a href=\""), 0);
+               StrBufAppendBuf(Message, link, 0);
+               StrBufAppendBufPlain(Message, HKEY("\">"), 0);
+               if (StrLength(LinkTitle) > 0)
+                       StrBufAppendBuf(Message, LinkTitle, 0);
+               else if ((Title != NULL) && !IsEmptyStr(Title))
+                       StrBufAppendBufPlain(Message, Title, -1, 0);
+               else
+                       StrBufAppendBuf(Message, link, 0);
+               StrBufAppendBufPlain(Message, HKEY("</a><br>\n"), 0);
+       }
+}
 /*
  * Commit a fetched and parsed RSS item to disk
  */
-void rss_save_item(struct rss_item *ri) {
+void rss_save_item(rss_item *ri)
+{
 
        struct MD5Context md5context;
        u_char rawdigest[MD5_DIGEST_LEN];
@@ -78,10 +90,12 @@ void rss_save_item(struct rss_item *ri) {
        struct CtdlMessage *msg;
        struct recptypes *recp = NULL;
        int msglen = 0;
+       StrBuf *Message;
 
        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;
@@ -90,15 +104,17 @@ void rss_save_item(struct rss_item *ri) {
         * If one is not present in the item itself, make one up.
         */
        if (ri->guid != NULL) {
-               snprintf(utmsgid, sizeof utmsgid, "rss/%s", ri->guid);
+               StrBufSpaceToBlank(ri->guid);
+               StrBufTrim(ri->guid);
+               snprintf(utmsgid, sizeof utmsgid, "rss/%s", ChrPtr(ri->guid));
        }
        else {
                MD5Init(&md5context);
                if (ri->title != NULL) {
-                       MD5Update(&md5context, ri->title, strlen(ri->title));
+                       MD5Update(&md5context, (const unsigned char*)ChrPtr(ri->title), StrLength(ri->title));
                }
                if (ri->link != NULL) {
-                       MD5Update(&md5context, ri->link, strlen(ri->link));
+                       MD5Update(&md5context, (const unsigned char*)ChrPtr(ri->link), StrLength(ri->link));
                }
                MD5Final(rawdigest, &md5context);
                for (i=0; i<MD5_DIGEST_LEN; i++) {
@@ -110,10 +126,12 @@ void rss_save_item(struct rss_item *ri) {
        }
 
        /* Find out if we've already seen this item */
+
        cdbut = cdb_fetch(CDB_USETABLE, utmsgid, strlen(utmsgid));
+#ifndef DEBUG_RSS
        if (cdbut != NULL) {
                /* Item has already been seen */
-               lprintf(CTDL_DEBUG, "%s has already been seen\n", utmsgid);
+               CtdlLogPrintf(CTDL_DEBUG, "%s has already been seen\n", utmsgid);
                cdb_free(cdbut);
 
                /* rewrite the record anyway, to update the timestamp */
@@ -121,344 +139,176 @@ void rss_save_item(struct rss_item *ri) {
                ut.ut_timestamp = time(NULL);
                cdb_store(CDB_USETABLE, utmsgid, strlen(utmsgid), &ut, sizeof(struct UseTable) );
        }
-       else {
+       else
+#endif
+{
                /* Item has not been seen, so save it. */
-
-               for (i=strlen(ri->description); i>=0; --i) {
-                       if (isspace(ri->description[i])) {
-                               ri->description[i] = ' ';
-                       }
-               }
-
+               CtdlLogPrintf(CTDL_DEBUG, "RSS: saving item...\n");
+               if (ri->description == NULL) ri->description = NewStrBufPlain(HKEY(""));
+               StrBufSpaceToBlank(ri->description);
                msg = malloc(sizeof(struct CtdlMessage));
                memset(msg, 0, sizeof(struct CtdlMessage));
                msg->cm_magic = CTDLMESSAGE_MAGIC;
                msg->cm_anon_type = MES_NORMAL;
                msg->cm_format_type = FMT_RFC822;
-               msg->cm_fields['A'] = strdup("rss");
-               msg->cm_fields['N'] = strdup(NODENAME);
-               msg->cm_fields['U'] = strdup(ri->title);
-               msg->cm_fields['T'] = malloc(64);
-               snprintf(msg->cm_fields['T'], 64, "%ld", ri->pubdate);
-
-               msglen = 1024 + strlen(ri->link) + strlen(ri->description) ;
-               msg->cm_fields['M'] = malloc(msglen);
-               snprintf(msg->cm_fields['M'], msglen,
-                       "Content-type: text/html\r\n\r\n"
-                       "<html><body>\n"
-                       "%s<br><br>\n"
-                       "<a href=\"%s\">%s</a>\n"
-                       "</body></html>\n"
-                       ,
-                       ri->description,
-                       ri->link, ri->link
-               );
-
-               CtdlSubmitMsg(msg, recp, NULL);
-               CtdlFreeMessage(msg);
-               free_recipients(recp);
-
-               /* write the uidl to the use table so we don't store this item again */
-               strcpy(ut.ut_msgid, utmsgid);
-               ut.ut_timestamp = time(NULL);
-               cdb_store(CDB_USETABLE, utmsgid, strlen(utmsgid), &ut, sizeof(struct UseTable) );
-       }
-}
-
-
 
-/*
- * Convert an RDF/RSS datestamp into a time_t
- */
-time_t rdf_parsedate(char *p)
-{
-       struct tm tm;
-
-       if (!p) return 0L;
-       if (strlen(p) < 10) return 0L;
-
-       memset(&tm, 0, sizeof tm);
-
-       /* YYYY-MM-DDTHH:MM format...
-        */
-       if ( (p[4] == '-') && (p[7] == '-') ) {
-               tm.tm_year = atoi(&p[0]) - 1900;
-               tm.tm_mon = atoi(&p[5]) - 1;
-               tm.tm_mday = atoi(&p[8]);
-               if ( (p[10] == 'T') && (p[13] == ':') ) {
-                       tm.tm_hour = atoi(&p[11]);
-                       tm.tm_min = atoi(&p[14]);
+               if (ri->guid != NULL) {
+                       msg->cm_fields['E'] = strdup(ChrPtr(ri->guid));
                }
-       }
-
-       else {
-               /* FIXME try an imap timestamp conversion */
-       }
-
-       return mktime(&tm);
-}
-
-
-
-void rss_xml_start(void *data, const char *el, const char **attr) {
-       struct rss_item *ri = (struct rss_item *) data;
-
-       if (!strcasecmp(el, "item")) {
-
-               /* Initialize the feed item data structure */
-               if (ri->guid != NULL) free(ri->guid);
-               ri->guid = NULL;
-               if (ri->title != NULL) free(ri->title);
-               ri->title = NULL;
-               if (ri->link != NULL) free(ri->link);
-               ri->link = NULL;
-               if (ri->description != NULL) free(ri->description);
-               ri->description = NULL;
 
-               /* Throw away any existing character data */
-               if (ri->chardata_len > 0) {
-                       free(ri->chardata);
-                       ri->chardata = 0;
-                       ri->chardata_len = 0;
+               if (ri->author_or_creator != NULL) {
+                       char *From;
+                       StrBuf *Encoded = NULL;
+                       int FromAt;
+                       
+                       From = html_to_ascii(ChrPtr(ri->author_or_creator),
+                                            StrLength(ri->author_or_creator), 
+                                            512, 0);
+                       StrBufPlain(ri->author_or_creator, From, -1);
+                       StrBufTrim(ri->author_or_creator);
+                       free(From);
+
+                       FromAt = strchr(ChrPtr(ri->author_or_creator), '@') != NULL;
+                       if (!FromAt && StrLength (ri->author_email) > 0)
+                       {
+                               StrBufRFC2047encode(&Encoded, ri->author_or_creator);
+                               msg->cm_fields['A'] = SmashStrBuf(&Encoded);
+                               msg->cm_fields['P'] = SmashStrBuf(&ri->author_email);
+                       }
+                       else
+                       {
+                               if (FromAt)
+                                       msg->cm_fields['P'] = SmashStrBuf(&ri->author_or_creator);
+                               else 
+                               {
+                                       StrBufRFC2047encode(&Encoded, ri->author_or_creator);
+                                       msg->cm_fields['A'] = SmashStrBuf(&Encoded);
+                                       msg->cm_fields['P'] = strdup("rss@localhost");
+                               }
+                       }
+               }
+               else {
+                       msg->cm_fields['A'] = strdup("rss");
                }
-       }
-
-
-
-}
-
-void rss_xml_end(void *data, const char *supplied_el) {
-       struct rss_item *ri = (struct rss_item *) data;
-       char el[256];
-       char *sep = NULL;
-
-
-       /* Axe the namespace, we don't care about it */
-
-       safestrncpy(el, supplied_el, sizeof el);
-       while (sep = strchr(el, ':'), sep) {
-               strcpy(el, ++sep);
-       }
-
-       if (!strcasecmp(el, "guid")) {
-               if (ri->guid != NULL) free(ri->guid);
-               striplt(ri->chardata);
-               ri->guid = strdup(ri->chardata);
-       }
-
-       if (!strcasecmp(el, "title")) {
-               if (ri->title != NULL) free(ri->title);
-               striplt(ri->chardata);
-               ri->title = strdup(ri->chardata);
-       }
-
-       if (!strcasecmp(el, "link")) {
-               if (ri->link != NULL) free(ri->link);
-               striplt(ri->chardata);
-               ri->link = strdup(ri->chardata);
-       }
-
-       if (!strcasecmp(el, "description")) {
-               if (ri->description != NULL) free(ri->description);
-               ri->description = strdup(ri->chardata);
-       }
-
-       if ( (!strcasecmp(el, "pubdate")) || (!strcasecmp(el, "date")) ) {
-               striplt(ri->chardata);
-               ri->pubdate = rdf_parsedate(ri->chardata);
-       }
-
-       if (!strcasecmp(el, "item")) {
-               rss_save_item(ri);
-       }
-
-       if ( (!strcasecmp(el, "rss")) || (!strcasecmp(el, "rdf")) ) {
-               lprintf(CTDL_DEBUG, "KILL THE PARSER, KILL THE PARSER, KILL THE PARSER!\n");
-               ri->done_parsing = 1;
-       }
-
-       if (ri->chardata_len > 0) {
-               free(ri->chardata);
-               ri->chardata = 0;
-               ri->chardata_len = 0;
-       }
 
-}
+               msg->cm_fields['N'] = strdup(NODENAME);
+               if (ri->title != NULL) {
+                       long len;
+                       char *Sbj;
+                       StrBuf *Encoded, *QPEncoded;
+
+                       QPEncoded = NULL;
+                       StrBufSpaceToBlank(ri->title);
+                       len = StrLength(ri->title);
+                       Sbj = html_to_ascii(ChrPtr(ri->title), len, 512, 0);
+                       len = strlen(Sbj);
+                       if (Sbj[len - 1] == '\n')
+                       {
+                               len --;
+                               Sbj[len] = '\0';
+                       }
+                       Encoded = NewStrBufPlain(Sbj, len);
+                       free(Sbj);
 
+                       StrBufTrim(Encoded);
+                       StrBufRFC2047encode(&QPEncoded, Encoded);
 
-/*
- * This callback stores up the data which appears in between tags.
- */
-void rss_xml_chardata(void *data, const XML_Char *s, int len) {
-       struct rss_item *ri = (struct rss_item *) data;
-       int old_len;
-       int new_len;
-       char *new_buffer;
-
-       old_len = ri->chardata_len;
-       new_len = old_len + len;
-       new_buffer = realloc(ri->chardata, new_len + 1);
-       if (new_buffer != NULL) {
-               memcpy(&new_buffer[old_len], s, len);
-               new_buffer[new_len] = 0;
-               ri->chardata = new_buffer;
-               ri->chardata_len = new_len;
-       }
-}
+                       msg->cm_fields['U'] = SmashStrBuf(&QPEncoded);
+                       FreeStrBuf(&Encoded);
+               }
+               msg->cm_fields['T'] = malloc(64);
+               snprintf(msg->cm_fields['T'], 64, "%ld", ri->pubdate);
+               if (ri->channel_title != NULL) {
+                       if (StrLength(ri->channel_title) > 0) {
+                               msg->cm_fields['O'] = strdup(ChrPtr(ri->channel_title));
+                       }
+               }
+               if (ri->link == NULL) 
+                       ri->link = NewStrBufPlain(HKEY(""));
+               // TODO: reenable me    ExpandShortUrls(ri->description);
+               msglen += 1024 + StrLength(ri->link) + StrLength(ri->description) ;
 
+               Message = NewStrBufPlain(NULL, StrLength(ri->description));
 
+               StrBufPlain(Message, HKEY(
+                        "Content-type: text/html; charset=\"UTF-8\"\r\n\r\n"
+                        "<html><body>\n"));
 
-/* 
- * Parses an url into hostname, port number and resource identifier.
- */
-int parse_url(char *url, char *hostname, int *port, char *identifier)
-{
-       char protocol[1024], scratch[1024];
-       char *ptr = NULL;
-       char *nptr = NULL;
-       
-       strcpy(scratch, url);
-       ptr = (char *)strchr(scratch, ':');
-       if (!ptr) {
-               return(1);      /* no protocol specified */
-       }
-       strcpy(ptr, "");
-       strcpy(protocol, scratch);
-       if (strcmp(protocol, "http")) {
-               return(2);      /* not HTTP */
-       }
+               StrBufAppendBuf(Message, ri->description, 0);
+               StrBufAppendBufPlain(Message, HKEY("<br><br>\n"), 0);
 
-       strcpy(scratch, url);
-       ptr = (char *) strstr(scratch, "//");
-       if (!ptr) {
-               return(3);      /* no server specified */
-       }
-       ptr += 2;
+               AppendLink(Message, ri->link, ri->linkTitle, NULL);
+               AppendLink(Message, ri->reLink, ri->reLinkTitle, "Reply to this");
+               StrBufAppendBufPlain(Message, HKEY("</body></html>\n"), 0);
 
-       strcpy(hostname, ptr);
-       nptr = (char *)strchr(ptr, ':');
-       if (!nptr) {
-               *port = 80;     /* default */
-               nptr = (char *)strchr(hostname, '/');
-       }
-       else {
-               sscanf(nptr, ":%d", port);
-               nptr = (char *)strchr(hostname, ':');
-       }
+               msg->cm_fields['M'] = SmashStrBuf(&Message);
 
-       if (nptr) {
-               *nptr = '\0';
-       }
+               CtdlSubmitMsg(msg, recp, NULL, 0);
+               CtdlFreeMessage(msg);
 
-       nptr = (char *)strchr(ptr, '/');
-       
-       if (!nptr) {
-               return(4);      /* no url specified */
+               /* write the uidl to the use table so we don't store this item again */
+               strcpy(ut.ut_msgid, utmsgid);
+               ut.ut_timestamp = time(NULL);
+               cdb_store(CDB_USETABLE, utmsgid, strlen(utmsgid), &ut, sizeof(struct UseTable) );
        }
-       
-       strcpy(identifier, nptr);
-       return(0);
+       free_recipients(recp);
 }
 
 
 
 
 
-
 /*
  * Begin a feed parse
  */
-void rss_do_fetching(char *url, char *rooms) {
-       char buf[1024];
-       char rsshost[1024];
-       int rssport = 80;
-       char rssurl[1024];
-       struct rss_item ri;
-       XML_Parser xp;
-       int sock = (-1);
-       int got_bytes = (-1);
-
-
-       xp = XML_ParserCreateNS("UTF-8", ':');
-       if (!xp) {
-               lprintf(CTDL_ALERT, "Cannot create XML parser!\n");
-               return;
-       }
+void rss_do_fetching(rssnetcfg *Cfg) {
+       rsscollection *rssc;
+       rss_item *ri;
+               
+       time_t now;
 
-       memset(&ri, 0, sizeof(struct rss_item));
-       ri.roomlist = rooms;
-       XML_SetElementHandler(xp, rss_xml_start, rss_xml_end);
-       XML_SetCharacterDataHandler(xp, rss_xml_chardata);
-       XML_SetUserData(xp, &ri);
-
-       /* Parse the URL */
-       
-retry: sock = (-1);
-       if (parse_url(url, rsshost, &rssport, rssurl) != 0) {
-               lprintf(CTDL_ALERT, "Invalid URL: %s\n", url);
-       }
-       else {
-               lprintf(CTDL_NOTICE, "Connecting to <%s>\n", rsshost);
-               sprintf(buf, "%d", rssport);
-               sock = sock_connect(rsshost, buf, "tcp");
-       }
+       CURL *chnd;
+       AsyncIO *IO;
 
-       if (sock >= 0) {
-               lprintf(CTDL_DEBUG, "Connected!\n");
+        now = time(NULL);
 
-               snprintf(buf, sizeof buf, "GET %s HTTP/1.0\r", rssurl);
-               lprintf(CTDL_DEBUG, "<%s\n", buf);
-               sock_puts(sock, buf);
+       if ((Cfg->next_poll != 0) && (now < Cfg->next_poll))
+               return;
 
-               snprintf(buf, sizeof buf, "Server: %s\r", rsshost);
-               lprintf(CTDL_DEBUG, "<%s\n", buf);
-               sock_puts(sock, buf);
 
-               sock_puts(sock, "\r");
+       ri = (rss_item*) malloc(sizeof(rss_item));
+       rssc = (rsscollection*) malloc(sizeof(rsscollection));
+       memset(ri, 0, sizeof(rss_item));
+       memset(rssc, 0, sizeof(rsscollection));
+       rssc->Item = ri;
+       rssc->Cfg = Cfg;
+       IO = &rssc->IO;
+       IO->CitContext = CloneContext(CC);
+       IO->Data = rssc;
+       ri->roomlist = Cfg->rooms;
 
-               if (sock_getln(sock, buf, sizeof buf) >= 0) {
-               lprintf(CTDL_DEBUG, ">%s\n", buf);
-                       remove_token(buf, 0, ' ');
-                       if (buf[0] == '2') {
 
-                               while (got_bytes = sock_getln(sock, buf, sizeof buf),
-                                     (got_bytes >= 0 && (strcmp(buf, "")) && (strcmp(buf, "\r"))) ) {
-                                       /* FIXME handle 302 redirects!! */
-                               }
+       CtdlLogPrintf(CTDL_DEBUG, "Fetching RSS feed <%s>\n", ChrPtr(Cfg->Url));
+       ParseURL(&IO->ConnectMe, Cfg->Url, 80);
+       CurlPrepareURL(IO->ConnectMe);
 
-
-                               while (got_bytes = sock_read(sock, buf, sizeof buf, 0),
-                                     ((got_bytes>=0) && (ri.done_parsing == 0)) ) {
-                                       XML_Parse(xp, buf, got_bytes, 0);
-                               }
-                               if (ri.done_parsing == 0) XML_Parse(xp, "", 0, 1);
-                       }
-               }
-               sock_close(sock);
-       }
-       else {
-               lprintf(CTDL_ERR, "Could not connect: %s\n", strerror(errno));
+       if (! evcurl_init(IO, 
+//                       Ctx, 
+                         NULL,
+                         "Citadel RSS Client",
+                         ParseRSSReply))
+       {
+               CtdlLogPrintf(CTDL_ALERT, "Unable to initialize libcurl.\n");
+//             goto abort;
        }
+       chnd = IO->HttpReq.chnd;
 
-       XML_ParserFree(xp);
-
-       /* Free the feed item data structure */
-       if (ri.guid != NULL) free(ri.guid);
-       ri.guid = NULL;
-       if (ri.title != NULL) free(ri.title);
-       ri.title = NULL;
-       if (ri.link != NULL) free(ri.link);
-       ri.link = NULL;
-       if (ri.description != NULL) free(ri.description);
-       ri.description = NULL;
-       if (ri.chardata_len > 0) {
-               free(ri.chardata);
-               ri.chardata = 0;
-               ri.chardata_len = 0;
-       }
+       evcurl_handle_start(IO);
 }
 
 
+
+
 /*
  * Scan a room's netconfig to determine whether it is requesting any RSS feeds
  */
@@ -469,41 +319,49 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
        char instr[32];
        FILE *fp;
        char feedurl[256];
-       struct rssnetcfg *rncptr = NULL;
-       struct rssnetcfg *use_this_rncptr = NULL;
+       rssnetcfg *rncptr = NULL;
+       rssnetcfg *use_this_rncptr = NULL;
        int len = 0;
        char *ptr = NULL;
 
        assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
 
+       if (CtdlThreadCheckStop())
+               return;
+               
        /* Only do net processing for rooms that have netconfigs */
        fp = fopen(filename, "r");
        if (fp == NULL) {
                return;
        }
 
-       while (fgets(buf, sizeof buf, fp) != NULL) {
+       while (fgets(buf, sizeof buf, fp) != NULL && !CtdlThreadCheckStop()) {
                buf[strlen(buf)-1] = 0;
 
                extract_token(instr, buf, 0, '|', sizeof instr);
                if (!strcasecmp(instr, "rssclient")) {
+
+                       use_this_rncptr = NULL;
+
                        extract_token(feedurl, buf, 1, '|', sizeof feedurl);
 
                        /* If any other rooms have requested the same feed, then we will just add this
                         * room to the target list for that client request.
                         */
                        for (rncptr=rnclist; rncptr!=NULL; rncptr=rncptr->next) {
-                               if (!strcmp(rncptr->url, feedurl)) {
+                               if (!strcmp(ChrPtr(rncptr->Url), feedurl)) {
                                        use_this_rncptr = rncptr;
                                }
                        }
 
                        /* Otherwise create a new client request */
                        if (use_this_rncptr == NULL) {
-                               rncptr = (struct rssnetcfg *) malloc(sizeof(struct rssnetcfg));
+                               rncptr = (rssnetcfg *) malloc(sizeof(rssnetcfg));
+                               memset(rncptr, 0, sizeof(rssnetcfg));
+                               rncptr->ItemType = RSS_UNSET;
                                if (rncptr != NULL) {
                                        rncptr->next = rnclist;
-                                       safestrncpy(rncptr->url, feedurl, sizeof rncptr->url);
+                                       rncptr->Url = NewStrBufPlain(feedurl, -1);
                                        rncptr->rooms = NULL;
                                        rnclist = rncptr;
                                        use_this_rncptr = rncptr;
@@ -539,14 +397,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
 void rssclient_scan(void) {
        static time_t last_run = 0L;
        static int doing_rssclient = 0;
-       struct rssnetcfg *rptr = NULL;
-
-       /*
-        * Run RSS client no more frequently than once every n seconds
-        */
-       if ( (time(NULL) - last_run) < config.c_net_freq ) {
-               return;
-       }
+       rssnetcfg *rptr = NULL;
 
        /*
         * This is a simple concurrency check to make sure only one rssclient run
@@ -557,32 +408,30 @@ void rssclient_scan(void) {
        if (doing_rssclient) return;
        doing_rssclient = 1;
 
-       lprintf(CTDL_DEBUG, "rssclient started\n");
-       ForEachRoom(rssclient_scan_room, NULL);
+       CtdlLogPrintf(CTDL_DEBUG, "rssclient started\n");
+       CtdlForEachRoom(rssclient_scan_room, NULL);
 
-       while (rnclist != NULL) {
-               rss_do_fetching(rnclist->url, rnclist->rooms);
+       while (rnclist != NULL && !CtdlThreadCheckStop()) {
+               rss_do_fetching(rnclist);
                rptr = rnclist;
                rnclist = rnclist->next;
                if (rptr->rooms != NULL) free(rptr->rooms);
                free(rptr);
        }
 
-       lprintf(CTDL_DEBUG, "rssclient ended\n");
+       CtdlLogPrintf(CTDL_DEBUG, "rssclient ended\n");
        last_run = time(NULL);
        doing_rssclient = 0;
+       return;
 }
 
 
-#endif /* HAVE_EXPAT */
-
 CTDL_MODULE_INIT(rssclient)
 {
-#ifdef HAVE_EXPAT
-       CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER);
-#else
-        lprintf(CTDL_INFO, "This server is missing the Expat XML parser.  RSS client will be disabled.\n");
-#endif
-       /* return our Subversion id for the Log */
-        return "$Id: serv_rssclient.c 5652 2007-10-29 20:14:48Z ajc $";
+       if (threading)
+       {
+               CtdlLogPrintf(CTDL_INFO, "%s\n", curl_version());
+               CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER);
+       }
+       return "rssclient";
 }