X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Frssclient%2Fserv_rssclient.c;h=72ce11ed280f8164cdaa538ce73b0bf6994d7529;hb=684e3a06c4d2ab35e39760f328a0d354ad330622;hp=00c32971db81763ada94e14fdb363cac8b173a9a;hpb=271924aeff4c786b31ec293ab48c861f7fe77bd0;p=citadel.git

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 00c32971d..72ce11ed2 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -1,7 +1,7 @@
 /*
  * Bring external RSS feeds into rooms.
  *
- * Copyright (c) 2007-2012 by the citadel.org team
+ * Copyright (c) 2007-2017 by the citadel.org team
  *
  * 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.
@@ -48,553 +48,416 @@
 #include "citadel_dirs.h"
 #include "md5.h"
 #include "context.h"
-#include "event_client.h"
-#include "rss_atom_parser.h"
-
-
-#define TMP_MSGDATA 0xFF
-#define TMP_SHORTER_URL_OFFSET 0xFE
-#define TMP_SHORTER_URLS 0xFD
+#include "internet_addressing.h"
+
+struct rssroom {
+	struct rssroom *next;
+	char *room;
+};
+
+struct rssurl {
+	struct rssurl *next;
+	char *url;
+	struct rssroom *rooms;
+};
+
+struct rssparser {
+	StrBuf *CData;
+	struct CtdlMessage *msg;
+	char *link;
+	char *description;
+	char *item_id;
+	struct rssroom *rooms;
+};
 
 time_t last_run = 0L;
-
-pthread_mutex_t RSSQueueMutex; /* locks the access to the following vars: */
-HashList *RSSQueueRooms = NULL; /* rss_room_counter */
-HashList *RSSFetchUrls = NULL; /*->rss_aggregator;->RefCount access locked*/
-
-eNextState RSSAggregator_Terminate(AsyncIO *IO);
-eNextState RSSAggregator_TerminateDB(AsyncIO *IO);
-eNextState RSSAggregator_ShutdownAbort(AsyncIO *IO);
 struct CitContext rss_CC;
+struct rssurl *rsstodo = NULL;
 
-struct rssnetcfg *rnclist = NULL;
-int RSSClientDebugEnabled = 0;
-#define N ((rss_aggregator*)IO->Data)->QRnumber
-
-#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (RSSClientDebugEnabled != 0))
-
-#define EVRSSC_syslog(LEVEL, FORMAT, ...)				\
-	DBGLOG(LEVEL) syslog(LEVEL,					\
-			     "IO[%ld]CC[%d][%ld]RSS" FORMAT,		\
-			     IO->ID, CCID, N, __VA_ARGS__)
-
-#define EVRSSCM_syslog(LEVEL, FORMAT)					\
-	DBGLOG(LEVEL) syslog(LEVEL,					\
-			     "IO[%ld]CC[%d][%ld]RSS" FORMAT,		\
-			     IO->ID, CCID, N)
-
-#define EVRSSQ_syslog(LEVEL, FORMAT, ...)				\
-	DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT,			\
-			     __VA_ARGS__)
-#define EVRSSQM_syslog(LEVEL, FORMAT)			\
-	DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT)
 
-#define EVRSSCSM_syslog(LEVEL, FORMAT)					\
-	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]RSS" FORMAT,		\
-			     IO->ID, N)
-
-void DeleteRoomReference(long QRnumber)
+// This handler is called whenever an XML tag opens.
+//
+void rss_start_element(void *data, const char *el, const char **attribute)
 {
-	HashPos *At;
-	long HKLen;
-	const char *HK;
-	void *vData = NULL;
-	rss_room_counter *pRoomC;
-
-	At = GetNewHashPos(RSSQueueRooms, 0);
-
-	if (GetHashPosFromKey(RSSQueueRooms, LKEY(QRnumber), At))
-	{
-		GetHashPos(RSSQueueRooms, At, &HKLen, &HK, &vData);
-		if (vData != NULL)
-		{
-			pRoomC = (rss_room_counter *) vData;
-			pRoomC->count --;
-			if (pRoomC->count == 0)
-				DeleteEntryFromHash(RSSQueueRooms, At);
+	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;
 	}
-	DeleteHashPos(&At);
-}
 
-void UnlinkRooms(rss_aggregator *RSSAggr)
-{
-	DeleteRoomReference(RSSAggr->QRnumber);
-	if (RSSAggr->OtherQRnumbers != NULL)
-	{
-		long HKLen;
-		const char *HK;
-		HashPos *At;
-		void *vData;
-
-		At = GetNewHashPos(RSSAggr->OtherQRnumbers, 0);
-		while (! server_shutting_down &&
-		       GetNextHashPos(RSSAggr->OtherQRnumbers,
-				      At,
-				      &HKLen, &HK,
-				      &vData) &&
-		       (vData != NULL))
-		{
-			long *lData = (long*) vData;
-			DeleteRoomReference(*lData);
+	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);
+			}
 		}
-
-		DeleteHashPos(&At);
 	}
 }
 
-void UnlinkRSSAggregator(rss_aggregator *RSSAggr)
-{
-	HashPos *At;
-
-	pthread_mutex_lock(&RSSQueueMutex);
-	UnlinkRooms(RSSAggr);
-
-	At = GetNewHashPos(RSSFetchUrls, 0);
-	if (GetHashPosFromKey(RSSFetchUrls, SKEY(RSSAggr->Url), At))
-	{
-		DeleteEntryFromHash(RSSFetchUrls, At);
-	}
-	DeleteHashPos(&At);
-	last_run = time(NULL);
-	pthread_mutex_unlock(&RSSQueueMutex);
-}
 
-void DeleteRssCfg(void *vptr)
+// This handler is called whenever an XML tag closes.
+//
+void rss_end_element(void *data, const char *el)
 {
-	rss_aggregator *RSSAggr = (rss_aggregator *)vptr;
-	AsyncIO *IO = &RSSAggr->IO;
-	EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying\n");
+	struct rssparser *r = (struct rssparser *)data;
 
-	FreeStrBuf(&RSSAggr->Url);
-	FreeStrBuf(&RSSAggr->rooms);
-	FreeStrBuf(&RSSAggr->CData);
-	FreeStrBuf(&RSSAggr->Key);
-	DeleteHash(&RSSAggr->OtherQRnumbers);
+	if (							// end of a new item(rss) or entry(atom)
+		(!strcasecmp(el, "entry"))
+		|| (!strcasecmp(el, "item"))
+	) {
 
-	DeleteHashPos (&RSSAggr->Pos);
-	DeleteHash (&RSSAggr->Messages);
-	if (RSSAggr->recp.recp_room != NULL)
-		free(RSSAggr->recp.recp_room);
+		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 (RSSAggr->Item != NULL)
-	{
-		flush_rss_item(RSSAggr->Item);
+			// 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;
+		}
 
-		free(RSSAggr->Item);
+		if (r->item_id != NULL) {
+			free(r->item_id);
+			r->item_id = NULL;
+		}
 	}
 
-	FreeAsyncIOContents(&RSSAggr->IO);
-	memset(RSSAggr, 0, sizeof(rss_aggregator));
-	free(RSSAggr);
-}
+	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]);
+		}
+	}
 
-eNextState RSSAggregator_Terminate(AsyncIO *IO)
-{
-	rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
+	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]);
+		}
+	}
 
-	EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
+	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)));
+		}
+	}
 
-	StopCurlWatchers(IO);
-	UnlinkRSSAggregator(RSSAggr);
-	return eAbort;
-}
+	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));
+		}
+	}
 
-eNextState RSSAggregator_TerminateDB(AsyncIO *IO)
-{
-	rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
+	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);
+	}
 
-	EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
+	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);
+	}
 
-	StopDBWatchers(&RSSAggr->IO);
-	UnlinkRSSAggregator(RSSAggr);
-	return eAbort;
+	if (r->CData != NULL) {
+		FreeStrBuf(&r->CData);
+		r->CData = NULL;
+	}
 }
 
-eNextState RSSAggregator_ShutdownAbort(AsyncIO *IO)
-{
-	const char *pUrl;
-	rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
-
-	pUrl = IO->ConnectMe->PlainUrl;
-	if (pUrl == NULL)
-		pUrl = "";
 
-	EVRSSC_syslog(LOG_DEBUG, "RSS: Aborting by shutdown: %s.\n", pUrl);
+// 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;
 
+	if (r->CData == NULL) {
+		r->CData = NewStrBuf();
+	}
 
-	UnlinkRSSAggregator(RSSAggr);
-	return eAbort;
+	StrBufAppendBufPlain(r->CData, content, length, 0);
 }
 
-eNextState RSSSaveMessage(AsyncIO *IO)
-{
-	long len;
-	const char *Key;
-	rss_aggregator *RSSAggr = (rss_aggregator *) IO->Data;
-
-	RSSAggr->ThisMsg->Msg.cm_fields['M'] =
-		SmashStrBuf(&RSSAggr->ThisMsg->Message);
-
-	CtdlSubmitMsg(&RSSAggr->ThisMsg->Msg, &RSSAggr->recp, NULL, 0);
-
-	/* write the uidl to the use table so we don't store this item again */
-	cdb_store(CDB_USETABLE,
-		  SKEY(RSSAggr->ThisMsg->MsgGUID),
-		  &RSSAggr->ThisMsg->ut,
-		  sizeof(struct UseTable) );
-
-	if (GetNextHashPos(RSSAggr->Messages,
-			   RSSAggr->Pos,
-			   &len, &Key,
-			   (void**) &RSSAggr->ThisMsg))
-		return NextDBOperation(IO, RSS_FetchNetworkUsetableEntry);
-	else
-		return eAbort;
-}
 
-eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
+// Feed has been downloaded, now parse it.
+//
+void rss_parse_feed(StrBuf *Feed, struct rssroom *rooms)
 {
-	const char *Key;
-	long len;
-	struct cdbdata *cdbut;
-	rss_aggregator *Ctx = (rss_aggregator *) IO->Data;
-
-	/* Find out if we've already seen this item */
-	strcpy(Ctx->ThisMsg->ut.ut_msgid,
-	       ChrPtr(Ctx->ThisMsg->MsgGUID)); /// TODO
-	Ctx->ThisMsg->ut.ut_timestamp = time(NULL);
-
-	cdbut = cdb_fetch(CDB_USETABLE, SKEY(Ctx->ThisMsg->MsgGUID));
-#ifndef DEBUG_RSS
-	if (cdbut != NULL) {
-		/* Item has already been seen */
-		EVRSSC_syslog(LOG_DEBUG,
-			  "%s has already been seen\n",
-			  ChrPtr(Ctx->ThisMsg->MsgGUID));
-		cdb_free(cdbut);
-
-		/* rewrite the record anyway, to update the timestamp */
-		cdb_store(CDB_USETABLE,
-			  SKEY(Ctx->ThisMsg->MsgGUID),
-			  &Ctx->ThisMsg->ut, sizeof(struct UseTable) );
-
-		if (GetNextHashPos(Ctx->Messages,
-				   Ctx->Pos,
-				   &len, &Key,
-				   (void**) &Ctx->ThisMsg))
-			return NextDBOperation(
-				IO,
-				RSS_FetchNetworkUsetableEntry);
-		else
-			return eAbort;
-	}
-	else
-#endif
-	{
-		NextDBOperation(IO, RSSSaveMessage);
-		return eSendMore;
-	}
+	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);
 }
 
-/*
- * Begin a feed parse
- */
-int rss_do_fetching(rss_aggregator *RSSAggr)
+
+// Add a feed/room pair into the todo list
+//
+void rssclient_push_todo(char *rssurl, char *roomname)
 {
-	AsyncIO		*IO = &RSSAggr->IO;
-	rss_item *ri;
-	time_t now;
-
-	now = time(NULL);
-
-	if ((RSSAggr->next_poll != 0) && (now < RSSAggr->next_poll))
-		return 0;
-
-	ri = (rss_item*) malloc(sizeof(rss_item));
-	memset(ri, 0, sizeof(rss_item));
-	RSSAggr->Item = ri;
-
-	if (! InitcURLIOStruct(&RSSAggr->IO,
-			       RSSAggr,
-			       "Citadel RSS Client",
-			       RSSAggregator_ParseReply,
-			       RSSAggregator_Terminate,
-			       RSSAggregator_TerminateDB,
-			       RSSAggregator_ShutdownAbort))
-	{
-		EVRSSCM_syslog(LOG_ALERT, "Unable to initialize libcurl.\n");
-		return 0;
-	}
+	struct rssurl *r = NULL;
+	struct rssurl *thisone = NULL;
+	struct rssroom *newroom = NULL;
 
-	safestrncpy(((CitContext*)RSSAggr->IO.CitContext)->cs_host,
-		    ChrPtr(RSSAggr->Url),
-		    sizeof(((CitContext*)RSSAggr->IO.CitContext)->cs_host));
+	syslog(LOG_DEBUG, "rssclient_push_todo(%s, %s)", rssurl, roomname);
 
-	EVRSSC_syslog(LOG_DEBUG, "Fetching RSS feed <%s>\n", ChrPtr(RSSAggr->Url));
-	ParseURL(&RSSAggr->IO.ConnectMe, RSSAggr->Url, 80);
-	CurlPrepareURL(RSSAggr->IO.ConnectMe);
+	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;
+	}
 
-	QueueCurlContext(&RSSAggr->IO);
-	return 1;
+	newroom = malloc(sizeof(struct rssroom));
+	newroom->room = strdup(roomname);
+	newroom->next = thisone->rooms;
+	thisone->rooms = newroom;
 }
 
-/*
- * Scan a room's netconfig to determine whether it is requesting any RSS feeds
- */
-void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
-{
-	StrBuf *CfgData=NULL;
-	StrBuf *CfgType;
-	StrBuf *Line;
-	rss_room_counter *Count = NULL;
-	struct stat statbuf;
-	char filename[PATH_MAX];
-	int fd;
-	int Done;
-	rss_aggregator *RSSAggr = NULL;
-	rss_aggregator *use_this_RSSAggr = NULL;
-	void *vptr;
-	const char *CfgPtr, *lPtr;
-	const char *Err;
-
-	pthread_mutex_lock(&RSSQueueMutex);
-	if (GetHash(RSSQueueRooms, LKEY(qrbuf->QRnumber), &vptr))
-	{
-		EVRSSQ_syslog(LOG_DEBUG,
-			      "rssclient: [%ld] %s already in progress.\n",
-			      qrbuf->QRnumber,
-			      qrbuf->QRname);
-		pthread_mutex_unlock(&RSSQueueMutex);
-		return;
-	}
-	pthread_mutex_unlock(&RSSQueueMutex);
 
-	assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
+// pull one feed (possibly multiple rooms)
+//
+void rss_pull_one_feed(struct rssurl *url)
+{
+	CURL *curl;
+	CURLcode res;
+	StrBuf *Downloaded = NULL;
 
-	if (server_shutting_down)
-		return;
+	syslog(LOG_DEBUG, "rss_pull_one_feed(%s)", url->url);
 
-	/* Only do net processing for rooms that have netconfigs */
-	fd = open(filename, 0);
-	if (fd <= 0) {
-		/* syslog(LOG_DEBUG,
-		   "rssclient: %s no config.\n",
-		   qrbuf->QRname); */
+	curl = curl_easy_init();
+	if (!curl) {
 		return;
 	}
 
-	if (server_shutting_down)
-		return;
-
-	if (fstat(fd, &statbuf) == -1) {
-		EVRSSQ_syslog(LOG_DEBUG,
-			      "ERROR: could not stat configfile '%s' - %s\n",
-			      filename,
-			      strerror(errno));
-		return;
+	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);
 
-	if (server_shutting_down)
-		return;
+	rss_parse_feed(Downloaded, url->rooms);					// parse the feed
+	FreeStrBuf(&Downloaded);						// free the downloaded feed data
+}
 
-	CfgData = NewStrBufPlain(NULL, statbuf.st_size + 1);
 
-	if (StrBufReadBLOB(CfgData, &fd, 1, statbuf.st_size, &Err) < 0) {
-		close(fd);
-		FreeStrBuf(&CfgData);
-		EVRSSQ_syslog(LOG_ERR, "ERROR: reading config '%s' - %s<br>\n",
-			      filename, strerror(errno));
-		return;
+// 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);
 	}
-	close(fd);
-	if (server_shutting_down)
-		return;
-
-	CfgPtr = NULL;
-	CfgType = NewStrBuf();
-	Line = NewStrBufPlain(NULL, StrLength(CfgData));
-	Done = 0;
-	while (!Done)
-	{
-		Done = StrBufSipLine(Line, CfgData, &CfgPtr) == 0;
-		if (StrLength(Line) > 0)
-		{
-			lPtr = NULL;
-			StrBufExtract_NextToken(CfgType, Line, &lPtr, '|');
-			if (!strcasecmp("rssclient", ChrPtr(CfgType)))
-			{
-				if (Count == NULL)
-				{
-					Count = malloc(
-						sizeof(rss_room_counter));
-					Count->count = 0;
-				}
-				Count->count ++;
-				RSSAggr = (rss_aggregator *) malloc(
-					sizeof(rss_aggregator));
-
-				memset (RSSAggr, 0, sizeof(rss_aggregator));
-				RSSAggr->QRnumber = qrbuf->QRnumber;
-				RSSAggr->roomlist_parts = 1;
-				RSSAggr->Url = NewStrBuf();
-
-				StrBufExtract_NextToken(RSSAggr->Url,
-							Line,
-							&lPtr,
-							'|');
-
-				pthread_mutex_lock(&RSSQueueMutex);
-				GetHash(RSSFetchUrls,
-					SKEY(RSSAggr->Url),
-					&vptr);
-
-				use_this_RSSAggr = (rss_aggregator *)vptr;
-				if (use_this_RSSAggr != NULL)
-				{
-					long *QRnumber;
-					StrBufAppendBufPlain(
-						use_this_RSSAggr->rooms,
-						qrbuf->QRname,
-						-1, 0);
-					if (use_this_RSSAggr->roomlist_parts==1)
-					{
-						use_this_RSSAggr->OtherQRnumbers
-							= NewHash(1, lFlathash);
-					}
-					QRnumber = (long*)malloc(sizeof(long));
-					*QRnumber = qrbuf->QRnumber;
-					Put(use_this_RSSAggr->OtherQRnumbers,
-					    LKEY(qrbuf->QRnumber),
-					    QRnumber,
-					    NULL);
-					use_this_RSSAggr->roomlist_parts++;
-
-					pthread_mutex_unlock(&RSSQueueMutex);
-
-					FreeStrBuf(&RSSAggr->Url);
-					free(RSSAggr);
-					RSSAggr = NULL;
-					continue;
-				}
-				pthread_mutex_unlock(&RSSQueueMutex);
-
-				RSSAggr->ItemType = RSS_UNSET;
+}
 
-				RSSAggr->rooms = NewStrBufPlain(
-					qrbuf->QRname, -1);
 
-				pthread_mutex_lock(&RSSQueueMutex);
+// 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;
 
-				Put(RSSFetchUrls,
-				    SKEY(RSSAggr->Url),
-				    RSSAggr,
-				    DeleteRssCfg);
+        serialized_config = LoadRoomNetConfigFile(qrbuf->QRnumber);
+        if (!serialized_config) {
+		return;
+	}
 
-				pthread_mutex_unlock(&RSSQueueMutex);
+	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);
 		}
 	}
-	if (Count != NULL)
-	{
-		Count->QRnumber = qrbuf->QRnumber;
-		pthread_mutex_lock(&RSSQueueMutex);
-		EVRSSQ_syslog(LOG_DEBUG, "client: [%ld] %s now starting.\n",
-			      qrbuf->QRnumber, qrbuf->QRname);
-		Put(RSSQueueRooms, LKEY(qrbuf->QRnumber), Count, NULL);
-		pthread_mutex_unlock(&RSSQueueMutex);
-	}
-	FreeStrBuf(&CfgData);
-	FreeStrBuf(&CfgType);
-	FreeStrBuf(&Line);
+
+	free(serialized_config);
 }
 
+
 /*
  * Scan for rooms that have RSS client requests configured
  */
 void rssclient_scan(void) {
-	int RSSRoomCount, RSSCount;
-	rss_aggregator *rptr = NULL;
-	void *vrptr = NULL;
-	HashPos *it;
-	long len;
-	const char *Key;
 	time_t now = time(NULL);
 
 	/* Run no more than once every 15 minutes. */
 	if ((now - last_run) < 900) {
-		EVRSSQ_syslog(LOG_DEBUG,
-			      "Client: polling interval not yet reached; last run was %ldm%lds ago",
-			      ((now - last_run) / 60),
-			      ((now - last_run) % 60)
+		syslog(LOG_DEBUG,
+			"Client: polling interval not yet reached; last run was %ldm%lds ago",
+			((now - last_run) / 60),
+			((now - last_run) % 60)
 		);
 		return;
 	}
 
-	/*
-	 * This is a simple concurrency check to make sure only one rssclient
-	 * run is done at a time.
-	 */
-	pthread_mutex_lock(&RSSQueueMutex);
-	RSSCount = GetCount(RSSFetchUrls);
-	RSSRoomCount = GetCount(RSSQueueRooms);
-	pthread_mutex_unlock(&RSSQueueMutex);
-
-	if ((RSSRoomCount > 0) || (RSSCount > 0)) {
-		EVRSSQ_syslog(LOG_DEBUG,
-			      "rssclient: concurrency check failed; %d rooms and %d url's are queued",
-			      RSSRoomCount, RSSCount
-			);
-		return;
-	}
-
 	become_session(&rss_CC);
-	EVRSSQM_syslog(LOG_DEBUG, "rssclient started\n");
+	syslog(LOG_DEBUG, "rssclient started");
 	CtdlForEachRoom(rssclient_scan_room, NULL);
-
-	pthread_mutex_lock(&RSSQueueMutex);
-
-	it = GetNewHashPos(RSSFetchUrls, 0);
-	while (!server_shutting_down &&
-	       GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) &&
-	       (vrptr != NULL)) {
-		rptr = (rss_aggregator *)vrptr;
-		if (!rss_do_fetching(rptr))
-			UnlinkRSSAggregator(rptr);
-	}
-	DeleteHashPos(&it);
-	pthread_mutex_unlock(&RSSQueueMutex);
-
-	EVRSSQM_syslog(LOG_DEBUG, "rssclient ended\n");
+	rss_pull_feeds();
+	syslog(LOG_DEBUG, "rssclient ended");
+	last_run = time(NULL);
 	return;
 }
 
-void rss_cleanup(void)
-{
-	/* citthread_mutex_destroy(&RSSQueueMutex); TODO */
-	DeleteHash(&RSSFetchUrls);
-	DeleteHash(&RSSQueueRooms);
-}
-
-void LogDebugEnableRSSClient(const int n)
-{
-	RSSClientDebugEnabled = n;
-}
 
 CTDL_MODULE_INIT(rssclient)
 {
-	if (threading)
+	if (!threading)
+	{
+		syslog(LOG_INFO, "%s", curl_version());
+		CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER, PRIO_AGGR + 300);
+	}
+	else
 	{
 		CtdlFillSystemContext(&rss_CC, "rssclient");
-		pthread_mutex_init(&RSSQueueMutex, NULL);
-		RSSQueueRooms = NewHash(1, lFlathash);
-		RSSFetchUrls = NewHash(1, NULL);
-		syslog(LOG_INFO, "%s\n", curl_version());
-		CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER);
-		CtdlRegisterEVCleanupHook(rss_cleanup);
-		CtdlRegisterDebugFlagHook(HKEY("rssclient"), LogDebugEnableRSSClient, &RSSClientDebugEnabled);
 	}
 	return "rssclient";
 }
+