]> code.citadel.org Git - citadel.git/blobdiff - citadel/modules/rssclient/serv_rssclient.c
If the administrator specifies a smart-host as an smtp:// or smtps:// URI, allow...
[citadel.git] / citadel / modules / rssclient / serv_rssclient.c
index 13a887e0f5a87d2806f433628b1fcb61fb0aaa70..72ce11ed280f8164cdaa538ce73b0bf6994d7529 100644 (file)
@@ -1,21 +1,15 @@
 /*
  * Bring external RSS feeds into rooms.
  *
- * Copyright (c) 2007-2010 by the citadel.org team
+ * Copyright (c) 2007-2017 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 open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
  * 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
+ * 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>
@@ -27,9 +21,9 @@
 # include <time.h>
 #else
 # if HAVE_SYS_TIME_H
-#  include <sys/time.h>
+#include <sys/time.h>
 # else
-#  include <time.h>
+#include <time.h>
 # endif
 #endif
 
 #include "citadel_dirs.h"
 #include "md5.h"
 #include "context.h"
-#include "event_client.h"
-#include "rss_atom_parser.h"
+#include "internet_addressing.h"
 
+struct rssroom {
+       struct rssroom *next;
+       char *room;
+};
 
-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(rss_item *ri)
-{
+struct rssurl {
+       struct rssurl *next;
+       char *url;
+       struct rssroom *rooms;
+};
 
-       struct MD5Context md5context;
-       u_char rawdigest[MD5_DIGEST_LEN];
-       int i;
-       char utmsgid[SIZ];
-       struct cdbdata *cdbut;
-       struct UseTable ut;
+struct rssparser {
+       StrBuf *CData;
        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;
-   
-       /* Construct a GUID to use in the S_USETABLE table.
-        * If one is not present in the item itself, make one up.
-        */
-       if (ri->guid != NULL) {
-               StrBufSpaceToBlank(ri->guid);
-               StrBufTrim(ri->guid);
-               snprintf(utmsgid, sizeof utmsgid, "rss/%s", ChrPtr(ri->guid));
-       }
-       else {
-               MD5Init(&md5context);
-               if (ri->title != NULL) {
-                       MD5Update(&md5context, (const unsigned char*)ChrPtr(ri->title), StrLength(ri->title));
-               }
-               if (ri->link != NULL) {
-                       MD5Update(&md5context, (const unsigned char*)ChrPtr(ri->link), StrLength(ri->link));
-               }
-               MD5Final(rawdigest, &md5context);
-               for (i=0; i<MD5_DIGEST_LEN; i++) {
-                       sprintf(&utmsgid[i*2], "%02X", (unsigned char) (rawdigest[i] & 0xff));
-                       utmsgid[i*2] = tolower(utmsgid[i*2]);
-                       utmsgid[(i*2)+1] = tolower(utmsgid[(i*2)+1]);
-               }
-               strcat(utmsgid, "_rss2ctdl");
-       }
+       char *link;
+       char *description;
+       char *item_id;
+       struct rssroom *rooms;
+};
 
-       /* Find out if we've already seen this item */
+time_t last_run = 0L;
+struct CitContext rss_CC;
+struct rssurl *rsstodo = NULL;
 
-       cdbut = cdb_fetch(CDB_USETABLE, utmsgid, strlen(utmsgid));
-#ifndef DEBUG_RSS
-       if (cdbut != NULL) {
-               /* Item has already been seen */
-               CtdlLogPrintf(CTDL_DEBUG, "%s has already been seen\n", utmsgid);
-               cdb_free(cdbut);
 
-               /* rewrite the record anyway, to update the timestamp */
-               strcpy(ut.ut_msgid, utmsgid);
-               ut.ut_timestamp = time(NULL);
-               cdb_store(CDB_USETABLE, utmsgid, strlen(utmsgid), &ut, sizeof(struct UseTable) );
-       }
-       else
-#endif
+// This handler is called whenever an XML tag opens.
+//
+void rss_start_element(void *data, const char *el, const char **attribute)
 {
-               /* Item has not been seen, so save it. */
-               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;
-
-               if (ri->guid != NULL) {
-                       msg->cm_fields['E'] = strdup(ChrPtr(ri->guid));
+       struct rssparser *r = (struct rssparser *)data;
+       int i;
+
+       if (
+               (!strcasecmp(el, "entry"))
+               || (!strcasecmp(el, "item"))
+       ) {
+               // this is the start of a new item(rss) or entry(atom)
+               if (r->msg != NULL) {
+                       CM_Free(r->msg);
+                       r->msg = NULL;
                }
+               r->msg = malloc(sizeof(struct CtdlMessage));
+               memset(r->msg, 0, sizeof(struct CtdlMessage));
+               r->msg->cm_magic = CTDLMESSAGE_MAGIC;
+               r->msg->cm_anon_type = MES_NORMAL;
+               r->msg->cm_format_type = FMT_RFC822;
+       }
 
-               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 if (!strcasecmp(el, "link")) {                     // atom feeds have the link as an attribute
+               for(i = 0; attribute[i]; i += 2) {
+                       if (!strcasecmp(attribute[i], "href")) {
+                               if (r->link != NULL) {
+                                       free(r->link);
+                                       r->link = NULL;
                                }
+                               r->link = strdup(attribute[i+1]);
+                               striplt(r->link);
                        }
                }
-               else {
-                       msg->cm_fields['A'] = strdup("rss");
-               }
+       }
+}
 
-               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 handler is called whenever an XML tag closes.
+//
+void rss_end_element(void *data, const char *el)
+{
+       struct rssparser *r = (struct rssparser *)data;
 
-                       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 (                                                    // end of a new item(rss) or entry(atom)
+               (!strcasecmp(el, "entry"))
+               || (!strcasecmp(el, "item"))
+       ) {
+
+               if (r->msg != NULL) {                           // Save the message to the rooms
+
+                       // use the link as an item id if nothing else is available
+                       if ((r->item_id == NULL) && (r->link != NULL)) {
+                               r->item_id = strdup(r->link);
                        }
-               }
-               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));
+                       // check the use table
+                       StrBuf *u = NewStrBuf();
+                       StrBufAppendPrintf(u, "rss/%s", r->item_id);
+                       int already_seen = CheckIfAlreadySeen(u);
+                       FreeStrBuf(&u);
+
+                       if (already_seen == 0) {
+
+                               // Compose the message text
+                               StrBuf *TheMessage = NewStrBuf();
+                               StrBufAppendPrintf(TheMessage,
+                                       "Content-type: text/html\n\n"
+                                       "\n\n"
+                                       "<html><head></head><body>"
+                               );
+               
+                               if (r->description != NULL) {
+                                       StrBufAppendPrintf(TheMessage, "%s<br><br>\r\n", r->description);
+                                       free(r->description);
+                                       r->description = NULL;
+                               }
+               
+                               if (r->link != NULL) {
+                                       StrBufAppendPrintf(TheMessage, "<a href=\"%s\">%s</a>\r\n", r->link, r->link);
+                                       free(r->link);
+                                       r->link = NULL;
+                               }
+       
+                               StrBufAppendPrintf(TheMessage, "</body></html>\r\n");
+                               CM_SetField(r->msg, eMesageText, ChrPtr(TheMessage), StrLength(TheMessage));
+                               FreeStrBuf(&TheMessage);
+       
+                               if (CM_IsEmpty(r->msg, eAuthor)) {
+                                       CM_SetField(r->msg, eAuthor, HKEY("rss"));
+                               }
+       
+                               if (CM_IsEmpty(r->msg, eTimestamp)) {
+                                       CM_SetFieldLONG(r->msg, eTimestamp, time(NULL));
+                               }
+       
+                               // Save it to the room(s)
+                               struct rssroom *rr = NULL;
+                               long msgnum = (-1);
+                               for (rr=r->rooms; rr!=NULL; rr=rr->next) {
+                                       if (rr == r->rooms) {
+                                               msgnum = CtdlSubmitMsg(r->msg, NULL, rr->room, 0);
+                                       }
+                                       else {
+                                               CtdlSaveMsgPointerInRoom(rr->room, msgnum, 0, NULL);
+                                       }
+                                       syslog(LOG_DEBUG, "Saved message %ld to %s", msgnum, rr->room);
+                               }
+                       }
+                       else {
+                               syslog(LOG_DEBUG, "%s was already seen", r->item_id);
+                       }
+       
+                       CM_Free(r->msg);
+                       r->msg = NULL;
+               }
 
-               StrBufPlain(Message, HKEY(
-                        "Content-type: text/html; charset=\"UTF-8\"\r\n\r\n"
-                        "<html><body>\n"));
+               if (r->item_id != NULL) {
+                       free(r->item_id);
+                       r->item_id = NULL;
+               }
+       }
 
-               StrBufAppendBuf(Message, ri->description, 0);
-               StrBufAppendBufPlain(Message, HKEY("<br><br>\n"), 0);
+       else if (!strcasecmp(el, "title")) {                    // item subject (rss and atom)
+               if ((r->msg != NULL) && (CM_IsEmpty(r->msg, eMsgSubject))) {
+                       CM_SetField(r->msg, eMsgSubject, ChrPtr(r->CData), StrLength(r->CData));
+                       striplt(r->msg->cm_fields[eMsgSubject]);
+               }
+       }
 
-               AppendLink(Message, ri->link, ri->linkTitle, NULL);
-               AppendLink(Message, ri->reLink, ri->reLinkTitle, "Reply to this");
-               StrBufAppendBufPlain(Message, HKEY("</body></html>\n"), 0);
+       else if (!strcasecmp(el, "author")) {                   // author of item (rss and maybe atom)
+               if ((r->msg != NULL) && (CM_IsEmpty(r->msg, eAuthor))) {
+                       CM_SetField(r->msg, eAuthor, ChrPtr(r->CData), StrLength(r->CData));
+                       striplt(r->msg->cm_fields[eAuthor]);
+               }
+       }
 
-               msg->cm_fields['M'] = SmashStrBuf(&Message);
+       else if (!strcasecmp(el, "pubdate")) {                  // date/time stamp (rss) Sat, 25 Feb 2017 14:28:01 EST
+               if ((r->msg)&&(r->msg->cm_fields[eTimestamp]==NULL)) {
+                       CM_SetFieldLONG(r->msg, eTimestamp, parsedate(ChrPtr(r->CData)));
+               }
+       }
 
-               CtdlSubmitMsg(msg, recp, NULL, 0);
-               CtdlFreeMessage(msg);
+       else if (!strcasecmp(el, "updated")) {                  // date/time stamp (atom) 2003-12-13T18:30:02Z
+               if ((r->msg)&&(r->msg->cm_fields[eTimestamp]==NULL)) {
+                       struct tm t;
+                       char zulu;
+                       memset(&t, 0, sizeof t);
+                       sscanf(ChrPtr(r->CData), "%d-%d-%dT%d:%d:%d%c", &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec, &zulu);
+                       t.tm_year -= 1900;
+                       t.tm_mon -= 1;
+                       CM_SetFieldLONG(r->msg, eTimestamp, mktime(&t));
+               }
+       }
 
-               /* 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) );
+       else if (!strcasecmp(el, "link")) {                     // link to story (rss)
+               if (r->link != NULL) {
+                       free(r->link);
+                       r->link = NULL;
+               }
+               r->link = strdup(ChrPtr(r->CData));
+               striplt(r->link);
        }
-       free_recipients(recp);
-}
 
+       else if (
+               (!strcasecmp(el, "guid"))                       // unique item id (rss)
+               || (!strcasecmp(el, "id"))                      // unique item id (atom)
+       ) {
+               if (r->item_id != NULL) {
+                       free(r->item_id);
+                       r->item_id = NULL;
+               }
+               r->item_id = strdup(ChrPtr(r->CData));
+               striplt(r->item_id);
+       }
 
+       else if (
+               (!strcasecmp(el, "description"))                // message text (rss)
+               || (!strcasecmp(el, "summary"))                 // message text (atom)
+               || (!strcasecmp(el, "content"))                 // message text (atom)
+       ) {
+               if (r->description != NULL) {
+                       free(r->description);
+                       r->description = NULL;
+               }
+               r->description = strdup(ChrPtr(r->CData));
+               striplt(r->description);
+       }
 
+       if (r->CData != NULL) {
+               FreeStrBuf(&r->CData);
+               r->CData = NULL;
+       }
+}
 
 
-/*
- * Begin a feed parse
- */
-void rss_do_fetching(rssnetcfg *Cfg) {
-       rsscollection *rssc;
-       rss_item *ri;
-               
-       time_t now;
+// This handler is called whenever data appears between opening and closing tags.
+//
+void rss_handle_data(void *data, const char *content, int length)
+{
+       struct rssparser *r = (struct rssparser *)data;
 
-       CURL *chnd;
-       AsyncIO *IO;
+       if (r->CData == NULL) {
+               r->CData = NewStrBuf();
+       }
 
-        now = time(NULL);
+       StrBufAppendBufPlain(r->CData, content, length, 0);
+}
 
-       if ((Cfg->next_poll != 0) && (now < Cfg->next_poll))
-               return;
 
+// Feed has been downloaded, now parse it.
+//
+void rss_parse_feed(StrBuf *Feed, struct rssroom *rooms)
+{
+       struct rssparser r;
+
+       memset(&r, 0, sizeof r);
+       r.rooms = rooms;
+       XML_Parser p = XML_ParserCreate("UTF-8");
+       XML_SetElementHandler(p, rss_start_element, rss_end_element);
+       XML_SetCharacterDataHandler(p, rss_handle_data);
+       XML_SetUserData(p, (void *)&r);
+       XML_Parse(p, ChrPtr(Feed), StrLength(Feed), XML_TRUE);
+       XML_ParserFree(p);
+}
 
-       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;
 
+// Add a feed/room pair into the todo list
+//
+void rssclient_push_todo(char *rssurl, char *roomname)
+{
+       struct rssurl *r = NULL;
+       struct rssurl *thisone = NULL;
+       struct rssroom *newroom = NULL;
 
-       CtdlLogPrintf(CTDL_DEBUG, "Fetching RSS feed <%s>\n", ChrPtr(Cfg->Url));
-       ParseURL(&IO->ConnectMe, Cfg->Url, 80);
-       CurlPrepareURL(IO->ConnectMe);
+       syslog(LOG_DEBUG, "rssclient_push_todo(%s, %s)", rssurl, roomname);
 
-       if (! evcurl_init(IO, 
-//                       Ctx, 
-                         NULL,
-                         "Citadel RSS Client",
-                         ParseRSSReply))
-       {
-               CtdlLogPrintf(CTDL_ALERT, "Unable to initialize libcurl.\n");
-//             goto abort;
+       for (r=rsstodo; r!=NULL; r=r->next) {
+               if (!strcasecmp(r->url, rssurl)) {
+                       thisone = r;
+               }
+       }
+       if (thisone == NULL) {
+               thisone = malloc(sizeof(struct rssurl));
+               thisone->url = strdup(rssurl);
+               thisone->rooms = NULL;
+               thisone->next = rsstodo;
+               rsstodo = thisone;
        }
-       chnd = IO->HttpReq.chnd;
 
-       evcurl_handle_start(IO);
+       newroom = malloc(sizeof(struct rssroom));
+       newroom->room = strdup(roomname);
+       newroom->next = thisone->rooms;
+       thisone->rooms = newroom;
 }
 
 
+// pull one feed (possibly multiple rooms)
+//
+void rss_pull_one_feed(struct rssurl *url)
+{
+       CURL *curl;
+       CURLcode res;
+       StrBuf *Downloaded = NULL;
 
+       syslog(LOG_DEBUG, "rss_pull_one_feed(%s)", url->url);
 
-/*
- * Scan a room's netconfig to determine whether it is requesting any RSS feeds
- */
-void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
-{
-       char filename[PATH_MAX];
-       char buf[1024];
-       char instr[32];
-       FILE *fp;
-       char feedurl[256];
-       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) {
+       curl = curl_easy_init();
+       if (!curl) {
                return;
        }
 
-       while (fgets(buf, sizeof buf, fp) != NULL && !CtdlThreadCheckStop()) {
-               buf[strlen(buf)-1] = 0;
+       Downloaded = NewStrBuf();
+
+       curl_easy_setopt(curl, CURLOPT_URL, url->url);
+       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
+       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
+       curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);                     // Follow redirects
+       curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlFillStrBuf_callback); // What to do with downloaded data
+       curl_easy_setopt(curl, CURLOPT_WRITEDATA, Downloaded);                  // Give it our StrBuf to work with
+       curl_easy_setopt(curl, CURLOPT_TIMEOUT, 20L);                           // Time out after 20 seconds
+       res = curl_easy_perform(curl);                                          // Perform the request
+       if (res != CURLE_OK) {
+               syslog(LOG_WARNING, "Failed to load feed: %s", curl_easy_strerror(res));
+       }
+       curl_easy_cleanup(curl);
+
+       rss_parse_feed(Downloaded, url->rooms);                                 // parse the feed
+       FreeStrBuf(&Downloaded);                                                // free the downloaded feed data
+}
 
-               extract_token(instr, buf, 0, '|', sizeof instr);
-               if (!strcasecmp(instr, "rssclient")) {
 
-                       use_this_rncptr = NULL;
+// We have a list, now download the feeds
+//
+void rss_pull_feeds(void)
+{
+       struct rssurl *r;
+       struct rssroom *rr;
+
+       while (rsstodo != NULL) {
+               rss_pull_one_feed(rsstodo);
+               r = rsstodo;
+               rsstodo = rsstodo->next;
+               while (r->rooms != NULL) {
+                       rr = r->rooms;
+                       r->rooms = r->rooms->next;
+                       free(rr->room);
+                       free(rr);
+               }
+               free(r->url);
+               free(r);
+       }
+}
 
-                       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(ChrPtr(rncptr->Url), feedurl)) {
-                                       use_this_rncptr = rncptr;
-                               }
-                       }
+// Scan a room's netconfig looking for RSS feed parsing requests
+//
+void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
+{
+       char *serialized_config = NULL;
+       int num_configs = 0;
+       char cfgline[SIZ];
+       int i = 0;
 
-                       /* Otherwise create a new client request */
-                       if (use_this_rncptr == NULL) {
-                               rncptr = (rssnetcfg *) malloc(sizeof(rssnetcfg));
-                               memset(rncptr, 0, sizeof(rssnetcfg));
-                               rncptr->ItemType = RSS_UNSET;
-                               if (rncptr != NULL) {
-                                       rncptr->next = rnclist;
-                                       rncptr->Url = NewStrBufPlain(feedurl, -1);
-                                       rncptr->rooms = NULL;
-                                       rnclist = rncptr;
-                                       use_this_rncptr = rncptr;
-                               }
-                       }
+        serialized_config = LoadRoomNetConfigFile(qrbuf->QRnumber);
+        if (!serialized_config) {
+               return;
+       }
 
-                       /* Add the room name to the request */
-                       if (use_this_rncptr != NULL) {
-                               if (use_this_rncptr->rooms == NULL) {
-                                       rncptr->rooms = strdup(qrbuf->QRname);
-                               }
-                               else {
-                                       len = strlen(use_this_rncptr->rooms) + strlen(qrbuf->QRname) + 5;
-                                       ptr = realloc(use_this_rncptr->rooms, len);
-                                       if (ptr != NULL) {
-                                               strcat(ptr, "|");
-                                               strcat(ptr, qrbuf->QRname);
-                                               use_this_rncptr->rooms = ptr;
-                                       }
-                               }
+       num_configs = num_tokens(serialized_config, '\n');
+       for (i=0; i<num_configs; ++i) {
+               extract_token(cfgline, serialized_config, i, '\n', sizeof cfgline);
+               if (!strncasecmp(cfgline, HKEY("rssclient|"))) {
+                       strcpy(cfgline, &cfgline[10]);
+                       char *vbar = strchr(cfgline, '|');
+                       if (vbar != NULL) {
+                               *vbar = 0;
                        }
+                       rssclient_push_todo(cfgline, qrbuf->QRname);
                }
-
        }
 
-       fclose(fp);
-
+       free(serialized_config);
 }
 
+
 /*
  * Scan for rooms that have RSS client requests configured
  */
 void rssclient_scan(void) {
-       static time_t last_run = 0L;
-       static int doing_rssclient = 0;
-       rssnetcfg *rptr = NULL;
-
-       /*
-        * 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
-        * don't really require extremely fine granularity here, we'll do it
-        * with a static variable instead.
-        */
-       if (doing_rssclient) return;
-       doing_rssclient = 1;
-
-       CtdlLogPrintf(CTDL_DEBUG, "rssclient started\n");
-       CtdlForEachRoom(rssclient_scan_room, NULL);
-
-       while (rnclist != NULL && !CtdlThreadCheckStop()) {
-               rss_do_fetching(rnclist);
-               rptr = rnclist;
-               rnclist = rnclist->next;
-               if (rptr->rooms != NULL) free(rptr->rooms);
-               free(rptr);
+       time_t now = time(NULL);
+
+       /* Run no more than once every 15 minutes. */
+       if ((now - last_run) < 900) {
+               syslog(LOG_DEBUG,
+                       "Client: polling interval not yet reached; last run was %ldm%lds ago",
+                       ((now - last_run) / 60),
+                       ((now - last_run) % 60)
+               );
+               return;
        }
 
-       CtdlLogPrintf(CTDL_DEBUG, "rssclient ended\n");
+       become_session(&rss_CC);
+       syslog(LOG_DEBUG, "rssclient started");
+       CtdlForEachRoom(rssclient_scan_room, NULL);
+       rss_pull_feeds();
+       syslog(LOG_DEBUG, "rssclient ended");
        last_run = time(NULL);
-       doing_rssclient = 0;
        return;
 }
 
 
 CTDL_MODULE_INIT(rssclient)
 {
-       if (threading)
+       if (!threading)
+       {
+               syslog(LOG_INFO, "%s", curl_version());
+               CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER, PRIO_AGGR + 300);
+       }
+       else
        {
-               CtdlLogPrintf(CTDL_INFO, "%s\n", curl_version());
-               CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER);
+               CtdlFillSystemContext(&rss_CC, "rssclient");
        }
        return "rssclient";
 }
+