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

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 74f1992cb..00c32971d 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -1,21 +1,15 @@
 /*
  * Bring external RSS feeds into rooms.
  *
- * Copyright (c) 2007-2010 by the citadel.org team
+ * Copyright (c) 2007-2012 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
 
@@ -62,512 +56,455 @@
 #define TMP_SHORTER_URL_OFFSET 0xFE
 #define TMP_SHORTER_URLS 0xFD
 
+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 rssnetcfg *rnclist = NULL;
-void AppendLink(StrBuf *Message, StrBuf *link, StrBuf *LinkTitle, const char *Title)
+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)
 {
-	if (StrLength(link) > 0)
+	HashPos *At;
+	long HKLen;
+	const char *HK;
+	void *vData = NULL;
+	rss_room_counter *pRoomC;
+
+	At = GetNewHashPos(RSSQueueRooms, 0);
+
+	if (GetHashPosFromKey(RSSQueueRooms, LKEY(QRnumber), At))
 	{
-		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);
+		GetHashPos(RSSQueueRooms, At, &HKLen, &HK, &vData);
+		if (vData != NULL)
+		{
+			pRoomC = (rss_room_counter *) vData;
+			pRoomC->count --;
+			if (pRoomC->count == 0)
+				DeleteEntryFromHash(RSSQueueRooms, At);
+		}
 	}
-}
-typedef struct __networker_save_message {
-	AsyncIO IO;
-	struct CtdlMessage *Msg;
-	struct recptypes *recp;
-	StrBuf *MsgGUID;
-	StrBuf *Message;
-	struct UseTable ut;
-} networker_save_message;
-
-eNextState FreeNetworkSaveMessage (AsyncIO *IO)
-{
-	networker_save_message *Ctx = (networker_save_message *) IO->Data;
-
-	CtdlFreeMessage(Ctx->Msg);
-	free_recipients(Ctx->recp);
-	FreeStrBuf(&Ctx->MsgGUID);
-	free(Ctx);
-	return eAbort;
+	DeleteHashPos(&At);
 }
 
-eNextState AbortNetworkSaveMessage (AsyncIO *IO)
+void UnlinkRooms(rss_aggregator *RSSAggr)
 {
-    return eAbort; ///TODO
+	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);
+		}
+
+		DeleteHashPos(&At);
+	}
 }
 
-eNextState RSSSaveMessage(AsyncIO *IO)
+void UnlinkRSSAggregator(rss_aggregator *RSSAggr)
 {
-	networker_save_message *Ctx = (networker_save_message *) IO->Data;
-
-	Ctx->Msg->cm_fields['M'] = SmashStrBuf(&Ctx->Message);
+	HashPos *At;
 
-	CtdlSubmitMsg(Ctx->Msg, Ctx->recp, NULL, 0);
+	pthread_mutex_lock(&RSSQueueMutex);
+	UnlinkRooms(RSSAggr);
 
-	/* write the uidl to the use table so we don't store this item again */
-	cdb_store(CDB_USETABLE, SKEY(Ctx->MsgGUID), &Ctx->ut, sizeof(struct UseTable) );
-
-	return eTerminateConnection;
+	At = GetNewHashPos(RSSFetchUrls, 0);
+	if (GetHashPosFromKey(RSSFetchUrls, SKEY(RSSAggr->Url), At))
+	{
+		DeleteEntryFromHash(RSSFetchUrls, At);
+	}
+	DeleteHashPos(&At);
+	last_run = time(NULL);
+	pthread_mutex_unlock(&RSSQueueMutex);
 }
 
-// TODO: relink me:	ExpandShortUrls(ri->description);
-
-eNextState FetchNetworkUsetableEntry(AsyncIO *IO)
+void DeleteRssCfg(void *vptr)
 {
-	struct cdbdata *cdbut;
-	networker_save_message *Ctx = (networker_save_message *) IO->Data;
+	rss_aggregator *RSSAggr = (rss_aggregator *)vptr;
+	AsyncIO *IO = &RSSAggr->IO;
+	EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying\n");
 
-	/* Find out if we've already seen this item */
-	strcpy(Ctx->ut.ut_msgid, ChrPtr(Ctx->MsgGUID)); /// TODO
-	Ctx->ut.ut_timestamp = time(NULL);
+	FreeStrBuf(&RSSAggr->Url);
+	FreeStrBuf(&RSSAggr->rooms);
+	FreeStrBuf(&RSSAggr->CData);
+	FreeStrBuf(&RSSAggr->Key);
+	DeleteHash(&RSSAggr->OtherQRnumbers);
 
-	cdbut = cdb_fetch(CDB_USETABLE, SKEY(Ctx->MsgGUID));
-#ifndef DEBUG_RSS
-	if (cdbut != NULL) {
-		/* Item has already been seen */
-		CtdlLogPrintf(CTDL_DEBUG, "%s has already been seen\n", ChrPtr(Ctx->MsgGUID));
-		cdb_free(cdbut);
+	DeleteHashPos (&RSSAggr->Pos);
+	DeleteHash (&RSSAggr->Messages);
+	if (RSSAggr->recp.recp_room != NULL)
+		free(RSSAggr->recp.recp_room);
 
-		/* rewrite the record anyway, to update the timestamp */
-		cdb_store(CDB_USETABLE, 
-			  SKEY(Ctx->MsgGUID), 
-			  &Ctx->ut, sizeof(struct UseTable) );
-		return eTerminateConnection;
-	}
-	else
-#endif
+
+	if (RSSAggr->Item != NULL)
 	{
-		NextDBOperation(IO, RSSSaveMessage);
-		return eSendMore;
+		flush_rss_item(RSSAggr->Item);
+
+		free(RSSAggr->Item);
 	}
+
+	FreeAsyncIOContents(&RSSAggr->IO);
+	memset(RSSAggr, 0, sizeof(rss_aggregator));
+	free(RSSAggr);
 }
-void RSSQueueSaveMessage(struct CtdlMessage *Msg, struct recptypes *recp, StrBuf *MsgGUID, StrBuf *MessageBody)
+
+eNextState RSSAggregator_Terminate(AsyncIO *IO)
 {
-	networker_save_message *Ctx;
-
-	Ctx = (networker_save_message *) malloc(sizeof(networker_save_message));
-	memset(Ctx, 0, sizeof(networker_save_message));
-	
-	Ctx->MsgGUID = MsgGUID;
-	Ctx->Message = MessageBody;
-	Ctx->Msg = Msg;
-	Ctx->recp = recp;
-	Ctx->IO.Data = Ctx;
-	Ctx->IO.CitContext = CloneContext(CC);
-	Ctx->IO.Terminate = FreeNetworkSaveMessage;
-	Ctx->IO.ShutdownAbort = AbortNetworkSaveMessage;
-	QueueDBOperation(&Ctx->IO, FetchNetworkUsetableEntry);
-}
+	rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
 
+	EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
 
-/*
- * Commit a fetched and parsed RSS item to disk
- */
-void rss_save_item(rss_item *ri)
+	StopCurlWatchers(IO);
+	UnlinkRSSAggregator(RSSAggr);
+	return eAbort;
+}
+
+eNextState RSSAggregator_TerminateDB(AsyncIO *IO)
 {
+	rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
 
-	struct MD5Context md5context;
-	u_char rawdigest[MD5_DIGEST_LEN];
-	struct CtdlMessage *msg;
-	struct recptypes *recp = NULL;
-	int msglen = 0;
-	StrBuf *Message;
-	StrBuf *guid;
-
-	recp = (struct recptypes *) malloc(sizeof(struct recptypes));
-	if (recp == NULL) return;
-	memset(recp, 0, sizeof(struct recptypes));
-	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);
-		guid = NewStrBufPlain(HKEY("rss/"));
-		StrBufAppendBuf(guid, ri->guid, 0);
-	}
-	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);
-		guid = NewStrBufPlain(NULL, MD5_DIGEST_LEN * 2 + 12 /* _rss2ctdl*/);
-		StrBufHexEscAppend(guid, NULL, rawdigest, MD5_DIGEST_LEN);
-		StrBufAppendBufPlain(guid, HKEY("_rss2ctdl"), 0);
-	}
+	EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
 
-	/* translate Item into message. */
-	CtdlLogPrintf(CTDL_DEBUG, "RSS: translating 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));
-	}
 
-	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");
-	}
+	StopDBWatchers(&RSSAggr->IO);
+	UnlinkRSSAggregator(RSSAggr);
+	return eAbort;
+}
 
-	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);
+eNextState RSSAggregator_ShutdownAbort(AsyncIO *IO)
+{
+	const char *pUrl;
+	rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
 
-		StrBufTrim(Encoded);
-		StrBufRFC2047encode(&QPEncoded, Encoded);
+	pUrl = IO->ConnectMe->PlainUrl;
+	if (pUrl == NULL)
+		pUrl = "";
 
-		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(""));
+	EVRSSC_syslog(LOG_DEBUG, "RSS: Aborting by shutdown: %s.\n", pUrl);
 
-#if 0 /* temporarily disable shorter urls. */
-	msg->cm_fields[TMP_SHORTER_URLS] = GetShorterUrls(ri->description);
-#endif
 
-	msglen += 1024 + StrLength(ri->link) + StrLength(ri->description) ;
+	UnlinkRSSAggregator(RSSAggr);
+	return eAbort;
+}
 
-	Message = NewStrBufPlain(NULL, StrLength(ri->description));
+eNextState RSSSaveMessage(AsyncIO *IO)
+{
+	long len;
+	const char *Key;
+	rss_aggregator *RSSAggr = (rss_aggregator *) IO->Data;
 
-	StrBufPlain(Message, HKEY(
-			    "Content-type: text/html; charset=\"UTF-8\"\r\n\r\n"
-			    "<html><body>\n"));
-#if 0 /* disable shorter url for now. */
-	msg->cm_fields[TMP_SHORTER_URL_OFFSET] = StrLength(Message);
-#endif
-	StrBufAppendBuf(Message, ri->description, 0);
-	StrBufAppendBufPlain(Message, HKEY("<br><br>\n"), 0);
+	RSSAggr->ThisMsg->Msg.cm_fields['M'] =
+		SmashStrBuf(&RSSAggr->ThisMsg->Message);
 
-	AppendLink(Message, ri->link, ri->linkTitle, NULL);
-	AppendLink(Message, ri->reLink, ri->reLinkTitle, "Reply to this");
-	StrBufAppendBufPlain(Message, HKEY("</body></html>\n"), 0);
+	CtdlSubmitMsg(&RSSAggr->ThisMsg->Msg, &RSSAggr->recp, NULL, 0);
 
-	RSSQueueSaveMessage(msg, recp, guid, Message);
+	/* 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)
+{
+	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;
+	}
+}
 
 /*
  * Begin a feed parse
  */
-void rss_do_fetching(rssnetcfg *Cfg) {
-	rsscollection *rssc;
+int rss_do_fetching(rss_aggregator *RSSAggr)
+{
+	AsyncIO		*IO = &RSSAggr->IO;
 	rss_item *ri;
-		
 	time_t now;
-	AsyncIO *IO;
 
-        now = time(NULL);
+	now = time(NULL);
 
-	if ((Cfg->next_poll != 0) && (now < Cfg->next_poll))
-		return;
-	Cfg->Attached = 1;
+	if ((RSSAggr->next_poll != 0) && (now < RSSAggr->next_poll))
+		return 0;
 
 	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;
-
-
-	CtdlLogPrintf(CTDL_DEBUG, "Fetching RSS feed <%s>\n", ChrPtr(Cfg->Url));
-	ParseURL(&IO->ConnectMe, Cfg->Url, 80);
-	CurlPrepareURL(IO->ConnectMe);
-
-	if (! evcurl_init(IO, 
-//			  Ctx, 
-			  NULL,
-			  "Citadel RSS Client",
-			  ParseRSSReply))
+	RSSAggr->Item = ri;
+
+	if (! InitcURLIOStruct(&RSSAggr->IO,
+			       RSSAggr,
+			       "Citadel RSS Client",
+			       RSSAggregator_ParseReply,
+			       RSSAggregator_Terminate,
+			       RSSAggregator_TerminateDB,
+			       RSSAggregator_ShutdownAbort))
 	{
-		CtdlLogPrintf(CTDL_ALERT, "Unable to initialize libcurl.\n");
-//		goto abort;
-	}
-
-	evcurl_handle_start(IO);
-}
-
-citthread_mutex_t RSSQueueMutex; /* locks the access to the following vars: */
-HashList *RSSQueueRooms = NULL;
-HashList *RSSFetchUrls = 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.
-			 * / TODO: how do we do this best?
-			for (rncptr=rnclist; rncptr!=NULL; rncptr=rncptr->next) {
-				if (!strcmp(ChrPtr(rncptr->Url), feedurl)) {
-					use_this_rncptr = rncptr;
-				}
-			}
-			* /
-			/* 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;
-
-				rncptr->Url = NewStrBufPlain(feedurl, -1);
-				rncptr->rooms = NULL;
-				rnclist = rncptr;
-				use_this_rncptr = rncptr;
-
-			}
-
-			/* 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;
-					}
-				}
-			}
-		}
-
+		EVRSSCM_syslog(LOG_ALERT, "Unable to initialize libcurl.\n");
+		return 0;
 	}
-			*/
-typedef struct __RoomCounter {
-	int count;
-	long QRnumber;
-} RoomCounter;
 
+	safestrncpy(((CitContext*)RSSAggr->IO.CitContext)->cs_host,
+		    ChrPtr(RSSAggr->Url),
+		    sizeof(((CitContext*)RSSAggr->IO.CitContext)->cs_host));
 
+	EVRSSC_syslog(LOG_DEBUG, "Fetching RSS feed <%s>\n", ChrPtr(RSSAggr->Url));
+	ParseURL(&RSSAggr->IO.ConnectMe, RSSAggr->Url, 80);
+	CurlPrepareURL(RSSAggr->IO.ConnectMe);
 
-void DeleteRssCfg(void *vptr)
-{
-	rssnetcfg *rncptr = (rssnetcfg *)vptr;
-
-	FreeStrBuf(&rncptr->Url);
-	if (rncptr->rooms != NULL) free(rncptr->rooms);
-	free(rncptr);
+	QueueCurlContext(&RSSAggr->IO);
+	return 1;
 }
 
-
 /*
  * 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;
+	StrBuf *CfgData=NULL;
 	StrBuf *CfgType;
 	StrBuf *Line;
-	RoomCounter *Count = NULL;
+	rss_room_counter *Count = NULL;
 	struct stat statbuf;
 	char filename[PATH_MAX];
-	//char buf[1024];
-	//char instr[32];
-	int  fd;
+	int fd;
 	int Done;
-	//char feedurl[256];
-	rssnetcfg *rncptr = NULL;
-	rssnetcfg *use_this_rncptr = NULL;
-	//int len = 0;
-	//char *ptr = NULL;
+	rss_aggregator *RSSAggr = NULL;
+	rss_aggregator *use_this_RSSAggr = NULL;
 	void *vptr;
 	const char *CfgPtr, *lPtr;
 	const char *Err;
 
-	citthread_mutex_lock(&RSSQueueMutex);
+	pthread_mutex_lock(&RSSQueueMutex);
 	if (GetHash(RSSQueueRooms, LKEY(qrbuf->QRnumber), &vptr))
 	{
-		//CtdlLogPrintf(CTDL_DEBUG, "rssclient: %s already in progress.\n", qrbuf->QRname);
-		citthread_mutex_unlock(&RSSQueueMutex);
+		EVRSSQ_syslog(LOG_DEBUG,
+			      "rssclient: [%ld] %s already in progress.\n",
+			      qrbuf->QRnumber,
+			      qrbuf->QRname);
+		pthread_mutex_unlock(&RSSQueueMutex);
 		return;
 	}
-	citthread_mutex_unlock(&RSSQueueMutex);
+	pthread_mutex_unlock(&RSSQueueMutex);
 
 	assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
 
-	if (CtdlThreadCheckStop())
+	if (server_shutting_down)
 		return;
-		
+
 	/* Only do net processing for rooms that have netconfigs */
 	fd = open(filename, 0);
 	if (fd <= 0) {
-		//CtdlLogPrintf(CTDL_DEBUG, "rssclient: %s no config.\n", qrbuf->QRname);
+		/* syslog(LOG_DEBUG,
+		   "rssclient: %s no config.\n",
+		   qrbuf->QRname); */
 		return;
 	}
-	if (CtdlThreadCheckStop())
+
+	if (server_shutting_down)
 		return;
+
 	if (fstat(fd, &statbuf) == -1) {
-		CtdlLogPrintf(CTDL_DEBUG,  "ERROR: could not stat configfile '%s' - %s\n",
-			filename, strerror(errno));
+		EVRSSQ_syslog(LOG_DEBUG,
+			      "ERROR: could not stat configfile '%s' - %s\n",
+			      filename,
+			      strerror(errno));
 		return;
 	}
-	if (CtdlThreadCheckStop())
+
+	if (server_shutting_down)
 		return;
+
 	CfgData = NewStrBufPlain(NULL, statbuf.st_size + 1);
+
 	if (StrBufReadBLOB(CfgData, &fd, 1, statbuf.st_size, &Err) < 0) {
 		close(fd);
 		FreeStrBuf(&CfgData);
-		CtdlLogPrintf(CTDL_DEBUG,  "ERROR: reading config '%s' - %s<br>\n",
-			filename, strerror(errno));
+		EVRSSQ_syslog(LOG_ERR, "ERROR: reading config '%s' - %s<br>\n",
+			      filename, strerror(errno));
 		return;
 	}
 	close(fd);
-	if (CtdlThreadCheckStop())
+	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 (!strcmp("rssclient", ChrPtr(CfgType)))
+		Done = StrBufSipLine(Line, CfgData, &CfgPtr) == 0;
+		if (StrLength(Line) > 0)
 		{
-		    if (Count == NULL)
-		    {
-			Count = malloc(sizeof(RoomCounter));
-			Count->count = 0;
-		    }
-		    Count->count ++;
-		    rncptr = (rssnetcfg *) malloc(sizeof(rssnetcfg));
-		    memset (rncptr, 0, sizeof(rssnetcfg));
-		    rncptr->Url = NewStrBuf();
-		    StrBufExtract_NextToken(rncptr->Url, Line, &lPtr, '|');
-
-		    citthread_mutex_lock(&RSSQueueMutex);
-		    GetHash(RSSFetchUrls, SKEY(rncptr->Url), &vptr);
-		    use_this_rncptr = (rssnetcfg *)vptr;
-		    citthread_mutex_unlock(&RSSQueueMutex);
-
-		    if (use_this_rncptr != NULL)
-		    {
-			/* mustn't attach to an active session */
-			if (use_this_rncptr->Attached == 1)
-			{
-			    DeleteRssCfg(rncptr);
-			}
-			else 
+			lPtr = NULL;
+			StrBufExtract_NextToken(CfgType, Line, &lPtr, '|');
+			if (!strcasecmp("rssclient", ChrPtr(CfgType)))
 			{
-			    /* TODO: hook us into the otherone here. */
-			}
+				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);
 
-			continue;
-		    }
+				RSSAggr->ItemType = RSS_UNSET;
 
-		    rncptr->ItemType = RSS_UNSET;
-				
-		    rncptr->rooms = NULL;
-		    rncptr->rooms = strdup(qrbuf->QRname);
+				RSSAggr->rooms = NewStrBufPlain(
+					qrbuf->QRname, -1);
 
-		    citthread_mutex_lock(&RSSQueueMutex);
-		    Put(RSSFetchUrls, SKEY(rncptr->Url), rncptr, DeleteRssCfg);
-		    citthread_mutex_unlock(&RSSQueueMutex);
+				pthread_mutex_lock(&RSSQueueMutex);
+
+				Put(RSSFetchUrls,
+				    SKEY(RSSAggr->Url),
+				    RSSAggr,
+				    DeleteRssCfg);
+
+				pthread_mutex_unlock(&RSSQueueMutex);
+			}
 		}
-	    }
 	}
 	if (Count != NULL)
 	{
 		Count->QRnumber = qrbuf->QRnumber;
-		citthread_mutex_lock(&RSSQueueMutex);
+		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);
-		citthread_mutex_unlock(&RSSQueueMutex);
+		pthread_mutex_unlock(&RSSQueueMutex);
 	}
 	FreeStrBuf(&CfgData);
 	FreeStrBuf(&CfgType);
@@ -578,58 +515,86 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
  * Scan for rooms that have RSS client requests configured
  */
 void rssclient_scan(void) {
-	static int doing_rssclient = 0;
-	rssnetcfg *rptr = NULL;
+	int RSSRoomCount, RSSCount;
+	rss_aggregator *rptr = NULL;
 	void *vrptr = NULL;
-	HashPos  *it;
+	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)
+		);
+		return;
+	}
 
 	/*
-	 * 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.
+	 * This is a simple concurrency check to make sure only one rssclient
+	 * run is done at a time.
 	 */
-	if (doing_rssclient) return;
-	doing_rssclient = 1;
+	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;
+	}
 
-	CtdlLogPrintf(CTDL_DEBUG, "rssclient started\n");
+	become_session(&rss_CC);
+	EVRSSQM_syslog(LOG_DEBUG, "rssclient started\n");
 	CtdlForEachRoom(rssclient_scan_room, NULL);
 
-	citthread_mutex_lock(&RSSQueueMutex);
+	pthread_mutex_lock(&RSSQueueMutex);
 
-	it = GetNewHashPos(RSSQueueRooms, 0);
-	while (GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) && 
+	it = GetNewHashPos(RSSFetchUrls, 0);
+	while (!server_shutting_down &&
+	       GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) &&
 	       (vrptr != NULL)) {
-		rptr = (rssnetcfg *)vrptr;
-		if (!rptr->Attached) rss_do_fetching(rptr);
+		rptr = (rss_aggregator *)vrptr;
+		if (!rss_do_fetching(rptr))
+			UnlinkRSSAggregator(rptr);
 	}
 	DeleteHashPos(&it);
-	citthread_mutex_unlock(&RSSQueueMutex);
+	pthread_mutex_unlock(&RSSQueueMutex);
 
-	CtdlLogPrintf(CTDL_DEBUG, "rssclientscheduler ended\n");
-	doing_rssclient = 0;
+	EVRSSQM_syslog(LOG_DEBUG, "rssclient ended\n");
 	return;
 }
 
-void RSSCleanup(void)
+void rss_cleanup(void)
 {
-	citthread_mutex_destroy(&RSSQueueMutex);
+	/* citthread_mutex_destroy(&RSSQueueMutex); TODO */
 	DeleteHash(&RSSFetchUrls);
 	DeleteHash(&RSSQueueRooms);
 }
 
+void LogDebugEnableRSSClient(const int n)
+{
+	RSSClientDebugEnabled = n;
+}
 
 CTDL_MODULE_INIT(rssclient)
 {
 	if (threading)
 	{
-		citthread_mutex_init(&RSSQueueMutex, NULL);
-		RSSQueueRooms = NewHash(1, Flathash);
+		CtdlFillSystemContext(&rss_CC, "rssclient");
+		pthread_mutex_init(&RSSQueueMutex, NULL);
+		RSSQueueRooms = NewHash(1, lFlathash);
 		RSSFetchUrls = NewHash(1, NULL);
-		CtdlLogPrintf(CTDL_INFO, "%s\n", curl_version());
+		syslog(LOG_INFO, "%s\n", curl_version());
 		CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER);
+		CtdlRegisterEVCleanupHook(rss_cleanup);
+		CtdlRegisterDebugFlagHook(HKEY("rssclient"), LogDebugEnableRSSClient, &RSSClientDebugEnabled);
 	}
 	return "rssclient";
 }