closer...
[citadel.git] / citadel / modules / rssclient / serv_rssclient.c
index e5060ec457a69d5095d1a6696a1a2ff756865977..2fa5134e9173dd9a73f29ab1f561dae10a8e61e6 100644 (file)
@@ -1,21 +1,15 @@
 /*
  * Bring external RSS feeds into rooms.
  *
- * Copyright (c) 2007-2010 by the citadel.org team
+ * Copyright (c) 2007-2016 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
 
 #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 to be locked too. */
-
-eNextState RSSAggregatorTerminate(AsyncIO *IO);
+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)->Cfg.QRnumber
+
+#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (RSSClientDebugEnabled != 0))
+
+#define EVRSSC_syslog(LEVEL, FORMAT, ...)                              \
+       DBGLOG(LEVEL) syslog(LEVEL,                                     \
+                            "%s[%ld]CC[%d][%ld]RSS" FORMAT,            \
+                            IOSTR, IO->ID, CCID, N, __VA_ARGS__)
+
+#define EVRSSCM_syslog(LEVEL, FORMAT)                                  \
+       DBGLOG(LEVEL) syslog(LEVEL,                                     \
+                            "%s[%ld]CC[%d][%ld]RSS" FORMAT,            \
+                            IOSTR, 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, "%s[%ld][%ld]RSS" FORMAT,           \
+                            IOSTR, IO->ID, N)
+
+typedef enum _RSSState {
+       eRSSCreated,
+       eRSSFetching,
+       eRSSFailure,
+       eRSSParsing,
+       eRSSUT
+} RSSState;
+ConstStr RSSStates[] = {
+       {HKEY("Aggregator created")},
+       {HKEY("Fetching content")},
+       {HKEY("Failed")},
+       {HKEY("parsing content")},
+       {HKEY("checking usetable")}
+};
+
+
+static size_t GetLocationString( void *ptr, size_t size, size_t nmemb, void *userdata)
 {
-       if (StrLength(link) > 0)
+#define LOCATION "location"
+       if (strncasecmp((char*)ptr, LOCATION, sizeof(LOCATION) - 1) == 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);
+               AsyncIO *IO = (AsyncIO *) userdata;
+               rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
+
+               char *pch = (char*) ptr;
+               char *pche;
+               
+               pche = pch + (size * nmemb);
+               pch += sizeof(LOCATION);
+               
+               while (isspace(*pch) || (*pch == ':'))
+                       pch ++;
+
+               while (isspace(*pche) || (*pche == '\0'))
+                       pche--;
+               if (RSSAggr->RedirectUrl == NULL) {
+                       RSSAggr->RedirectUrl = NewStrBufPlain(pch, pche - pch + 1);
+               }
+               else {
+                       FlushStrBuf(RSSAggr->RedirectUrl);
+                       StrBufPlain(RSSAggr->RedirectUrl, pch, pche - pch + 1); 
+               }
        }
+       return size * nmemb;
 }
-typedef struct __networker_save_message {
-       AsyncIO IO;
-       struct CtdlMessage *Msg;
-       struct recptypes *recp;
-       rss_aggregator *Cfg;
-       StrBuf *MsgGUID;
-       StrBuf *Message;
-       struct UseTable ut;
-} networker_save_message;
 
+static void SetRSSState(AsyncIO *IO, RSSState State)
+{
+       CitContext* CCC = IO->CitContext;
+       if (CCC != NULL)
+               memcpy(CCC->cs_clientname, RSSStates[State].Key, RSSStates[State].len + 1);
+}
 
 void DeleteRoomReference(long QRnumber)
 {
@@ -108,615 +156,767 @@ void DeleteRoomReference(long QRnumber)
 
        At = GetNewHashPos(RSSQueueRooms, 0);
 
-       GetHashPosFromKey(RSSQueueRooms, LKEY(QRnumber), At);
-       GetHashPos(RSSQueueRooms, At, &HKLen, &HK, &vData);
-       if (vData != NULL)
+       if (GetHashPosFromKey(RSSQueueRooms, LKEY(QRnumber), At))
        {
-               pRoomC = (rss_room_counter *) vData;
-               pRoomC->count --;
-               if (pRoomC->count == 0)
-                       DeleteEntryFromHash(RSSQueueRooms, At);
+               GetHashPos(RSSQueueRooms, At, &HKLen, &HK, &vData);
+               if (vData != NULL)
+               {
+                       pRoomC = (rss_room_counter *) vData;
+                       pRoomC->count --;
+                       if (pRoomC->count == 0)
+                               DeleteEntryFromHash(RSSQueueRooms, At);
+               }
        }
        DeleteHashPos(&At);
 }
 
-void UnlinkRooms(rss_aggregator *Cfg)
+void UnlinkRooms(rss_aggregator *RSSAggr)
 {
-       
-       DeleteRoomReference(Cfg->QRnumber);
-       if (Cfg->OtherQRnumbers != NULL)
+       DeleteRoomReference(RSSAggr->Cfg.QRnumber);
+       if (RSSAggr->OtherQRnumbers != NULL)
        {
                long HKLen;
                const char *HK;
                HashPos *At;
                void *vData;
 
-               At = GetNewHashPos(Cfg->OtherQRnumbers, 0);
-               while (GetNextHashPos(Cfg->OtherQRnumbers, At, &HKLen, &HK, &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);
+                       pRSSConfig *Data = (pRSSConfig*) vData;
+                       DeleteRoomReference(Data->QRnumber);
                }
-/*
-               if (server_shutting_down)
-                       break; /* TODO */
 
                DeleteHashPos(&At);
        }
 }
 
-void UnlinkRSSAggregator(rss_aggregator *Cfg)
+void UnlinkRSSAggregator(rss_aggregator *RSSAggr)
 {
        HashPos *At;
 
-       UnlinkRooms(Cfg);
+       pthread_mutex_lock(&RSSQueueMutex);
+       UnlinkRooms(RSSAggr);
 
        At = GetNewHashPos(RSSFetchUrls, 0);
-       if (GetHashPosFromKey(RSSFetchUrls, SKEY(Cfg->Url), At) == 0)
+       if (GetHashPosFromKey(RSSFetchUrls, SKEY(RSSAggr->Url), At))
        {
                DeleteEntryFromHash(RSSFetchUrls, At);
        }
        DeleteHashPos(&At);
+       last_run = time(NULL);
+       pthread_mutex_unlock(&RSSQueueMutex);
 }
 
-eNextState FreeNetworkSaveMessage (AsyncIO *IO)
+void DeleteRssCfg(void *vptr)
 {
-       networker_save_message *Ctx = (networker_save_message *) IO->Data;
+       rss_aggregator *RSSAggr = (rss_aggregator *)vptr;
+       AsyncIO *IO = &RSSAggr->IO;
+
+       if (IO->CitContext != NULL)
+               EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying\n");
+
+       FreeStrBuf(&RSSAggr->Url);
+       FreeStrBuf(&RSSAggr->RedirectUrl);
+       FreeStrBuf(&RSSAggr->rooms);
+       FreeStrBuf(&RSSAggr->CData);
+       FreeStrBuf(&RSSAggr->Key);
+       DeleteHash(&RSSAggr->OtherQRnumbers);
+
+       DeleteHashPos (&RSSAggr->Pos);
+       DeleteHash (&RSSAggr->Messages);
+       if (RSSAggr->recp.recp_room != NULL)
+               free(RSSAggr->recp.recp_room);
 
-       pthread_mutex_lock(&RSSQueueMutex);
-       Ctx->Cfg->RefCount --;
 
-       if (Ctx->Cfg->RefCount == 0)
+       if (RSSAggr->Item != NULL)
        {
-               UnlinkRSSAggregator(Ctx->Cfg);
+               flush_rss_item(RSSAggr->Item);
 
+               free(RSSAggr->Item);
        }
-       pthread_mutex_unlock(&RSSQueueMutex);
 
-       CtdlFreeMessage(Ctx->Msg);
-       free_recipients(Ctx->recp);
-       FreeStrBuf(&Ctx->Message);
-       FreeStrBuf(&Ctx->MsgGUID);
-       free(Ctx);
-       return eAbort;
+       FreeAsyncIOContents(&RSSAggr->IO);
+       memset(RSSAggr, 0, sizeof(rss_aggregator));
+       free(RSSAggr);
 }
 
-eNextState AbortNetworkSaveMessage (AsyncIO *IO)
+eNextState RSSAggregator_Terminate(AsyncIO *IO)
 {
-       return eAbort; ///TODO
+       rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
+
+       EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
+
+       StopCurlWatchers(IO);
+       UnlinkRSSAggregator(RSSAggr);
+       return eAbort;
 }
 
-eNextState RSSSaveMessage(AsyncIO *IO)
+eNextState RSSAggregator_TerminateDB(AsyncIO *IO)
 {
-       networker_save_message *Ctx = (networker_save_message *) IO->Data;
-
-       Ctx->Msg->cm_fields['M'] = SmashStrBuf(&Ctx->Message);
+       rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
 
-       CtdlSubmitMsg(Ctx->Msg, Ctx->recp, NULL, 0);
+       EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
 
-       /* 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;
+       StopDBWatchers(&RSSAggr->IO);
+       UnlinkRSSAggregator(RSSAggr);
+       return eAbort;
 }
 
-eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
+eNextState RSSAggregator_ShutdownAbort(AsyncIO *IO)
 {
-       struct cdbdata *cdbut;
-       networker_save_message *Ctx = (networker_save_message *) IO->Data;
+       const char *pUrl;
+       rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
 
-       /* Find out if we've already seen this item */
-       strcpy(Ctx->ut.ut_msgid, ChrPtr(Ctx->MsgGUID)); /// TODO
-       Ctx->ut.ut_timestamp = time(NULL);
+       pUrl = IO->ConnectMe->PlainUrl;
+       if (pUrl == NULL)
+               pUrl = "";
 
-       cdbut = cdb_fetch(CDB_USETABLE, SKEY(Ctx->MsgGUID));
-#ifndef DEBUG_RSS
-       if (cdbut != NULL) {
-               /* Item has already been seen */
-               syslog(LOG_DEBUG, "%s has already been seen\n", ChrPtr(Ctx->MsgGUID));
-               cdb_free(cdbut);
+       EVRSSC_syslog(LOG_DEBUG, "RSS: Aborting by shutdown: %s.\n", pUrl);
 
-               /* rewrite the record anyway, to update the timestamp */
-               cdb_store(CDB_USETABLE, 
-                         SKEY(Ctx->MsgGUID), 
-                         &Ctx->ut, sizeof(struct UseTable) );
-               return eAbort;
-       }
-       else
-#endif
-       {
-               NextDBOperation(IO, RSSSaveMessage);
-               return eSendMore;
-       }
+       StopCurlWatchers(IO);
+       UnlinkRSSAggregator(RSSAggr);
+       return eAbort;
 }
-void RSSQueueSaveMessage(struct CtdlMessage *Msg, struct recptypes *recp, StrBuf *MsgGUID, StrBuf *MessageBody, rss_aggregator *Cfg)
-{
-       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->Cfg = Cfg;
-       Ctx->recp = recp;
-       Ctx->IO.Data = Ctx;
-       Ctx->IO.CitContext = CloneContext(&rss_CC);
-       Ctx->IO.Terminate = FreeNetworkSaveMessage;
-       Ctx->IO.ShutdownAbort = AbortNetworkSaveMessage;
-       QueueDBOperation(&Ctx->IO, RSS_FetchNetworkUsetableEntry);
+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, rss_aggregator *Cfg)
+int rss_format_item(AsyncIO *IO, networker_save_message *SaveMsg)
 {
-
-       struct MD5Context md5context;
-       u_char rawdigest[MD5_DIGEST_LEN];
-       struct CtdlMessage *msg;
-       struct recptypes *recp = NULL;
-       int msglen = 0;
        StrBuf *Message;
-       StrBuf *guid;
-       StrBuf *Buf;
-
-       recp = (struct recptypes *) malloc(sizeof(struct recptypes));
-       if (recp == NULL) return;
-       memset(recp, 0, sizeof(struct recptypes));
-       Buf = NewStrBufDup(Cfg->rooms);
-       recp->recp_room = SmashStrBuf(&Buf);
-       recp->num_room = Cfg->roomlist_parts;
-       recp->recptypes_magic = RECPTYPES_MAGIC;
-   
-       Cfg->RefCount ++;
-       /* 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);
-       }
+       int msglen = 0;
 
-       /* translate Item into message. */
-       syslog(LOG_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 (StrLength(SaveMsg->description) + 
+           StrLength(SaveMsg->link) + 
+           StrLength(SaveMsg->linkTitle) + 
+           StrLength(SaveMsg->reLink) +
+           StrLength(SaveMsg->reLinkTitle) +
+           StrLength(SaveMsg->title) == 0)
+       {
+               EVRSSCM_syslog(LOG_INFO, "Refusing to save empty message.");
+               return 0;
        }
 
-       if (ri->author_or_creator != NULL) {
+       CM_Flush(&SaveMsg->Msg);
+
+       if (SaveMsg->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), 
+
+               From = html_to_ascii(ChrPtr(SaveMsg->author_or_creator),
+                                    StrLength(SaveMsg->author_or_creator),
                                     512, 0);
-               StrBufPlain(ri->author_or_creator, From, -1);
-               StrBufTrim(ri->author_or_creator);
+               StrBufPlain(SaveMsg->author_or_creator, From, -1);
+               StrBufTrim(SaveMsg->author_or_creator);
                free(From);
 
-               FromAt = strchr(ChrPtr(ri->author_or_creator), '@') != NULL;
-               if (!FromAt && StrLength (ri->author_email) > 0)
+               FromAt = strchr(ChrPtr(SaveMsg->author_or_creator), '@') != NULL;
+               if (!FromAt && StrLength (SaveMsg->author_email) > 0)
                {
-                       StrBufRFC2047encode(&Encoded, ri->author_or_creator);
-                       msg->cm_fields['A'] = SmashStrBuf(&Encoded);
-                       msg->cm_fields['P'] = SmashStrBuf(&ri->author_email);
+                       StrBufRFC2047encode(&Encoded, SaveMsg->author_or_creator);
+                       CM_SetAsFieldSB(&SaveMsg->Msg, eAuthor, &Encoded);
+                       CM_SetAsFieldSB(&SaveMsg->Msg, eMessagePath, &SaveMsg->author_email);
                }
                else
                {
                        if (FromAt)
                        {
-                               msg->cm_fields['A'] = SmashStrBuf(&ri->author_or_creator);
-                               msg->cm_fields['P'] = strdup(msg->cm_fields['A']);
+                               CM_SetAsFieldSB(&SaveMsg->Msg, eAuthor, &SaveMsg->author_or_creator);
+                               CM_CopyField(&SaveMsg->Msg, eMessagePath, eAuthor);
                        }
-                       else 
+                       else
                        {
-                               StrBufRFC2047encode(&Encoded, ri->author_or_creator);
-                               msg->cm_fields['A'] = SmashStrBuf(&Encoded);
-                               msg->cm_fields['P'] = strdup("rss@localhost");
+                               StrBufRFC2047encode(&Encoded,
+                                                   SaveMsg->author_or_creator);
+                               CM_SetAsFieldSB(&SaveMsg->Msg, eAuthor, &Encoded);
+                               CM_SetField(&SaveMsg->Msg, eMessagePath, HKEY("rss@localhost"));
 
                        }
-                       if (ri->pubdate <= 0) {
-                               ri->pubdate = time(NULL);
-                       }
                }
        }
        else {
-               msg->cm_fields['A'] = strdup("rss");
+               CM_SetField(&SaveMsg->Msg, eAuthor, HKEY("rss"));
        }
 
-       msg->cm_fields['N'] = strdup(NODENAME);
-       if (ri->title != NULL) {
+       CM_SetField(&SaveMsg->Msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
+       if (SaveMsg->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);
+               StrBufSpaceToBlank(SaveMsg->title);
+               len = StrLength(SaveMsg->title);
+               Sbj = html_to_ascii(ChrPtr(SaveMsg->title), len, 512, 0);
+               if (!IsEmptyStr(Sbj)) {
+                       len = strlen(Sbj);
+                       if ((Sbj[len - 1] == '\n'))
+                       {
+                               len --;
+                               Sbj[len] = '\0';
+                       }
+                       Encoded = NewStrBufPlain(Sbj, 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));
+                       StrBufTrim(Encoded);
+                       StrBufRFC2047encode(&QPEncoded, Encoded);
+                       
+                       CM_SetAsFieldSB(&SaveMsg->Msg, eMsgSubject, &QPEncoded);
+                       FreeStrBuf(&Encoded);
+               }
+               if (Sbj != NULL) {
+                       free(Sbj);
                }
        }
-       if (ri->link == NULL) 
-               ri->link = NewStrBufPlain(HKEY(""));
+       if (SaveMsg->link == NULL)
+               SaveMsg->link = NewStrBufPlain(HKEY(""));
 
 #if 0 /* temporarily disable shorter urls. */
-       msg->cm_fields[TMP_SHORTER_URLS] = GetShorterUrls(ri->description);
+       SaveMsg->Msg.cm_fields[TMP_SHORTER_URLS] =
+               GetShorterUrls(SaveMsg->description);
 #endif
 
-       msglen += 1024 + StrLength(ri->link) + StrLength(ri->description) ;
+       msglen += 1024 + StrLength(SaveMsg->link) + StrLength(SaveMsg->description) ;
 
-       Message = NewStrBufPlain(NULL, StrLength(ri->description));
+       Message = NewStrBufPlain(NULL, msglen);
 
        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);
+       SaveMsg->Msg.cm_fields[TMP_SHORTER_URL_OFFSET] = StrLength(Message);
 #endif
-       StrBufAppendBuf(Message, ri->description, 0);
+       StrBufAppendBuf(Message, SaveMsg->description, 0);
        StrBufAppendBufPlain(Message, HKEY("<br><br>\n"), 0);
 
-       AppendLink(Message, ri->link, ri->linkTitle, NULL);
-       AppendLink(Message, ri->reLink, ri->reLinkTitle, "Reply to this");
+       AppendLink(Message, SaveMsg->link, SaveMsg->linkTitle, NULL);
+       AppendLink(Message, SaveMsg->reLink, SaveMsg->reLinkTitle, "Reply to this");
        StrBufAppendBufPlain(Message, HKEY("</body></html>\n"), 0);
 
-       RSSQueueSaveMessage(msg, recp, guid, Message, Cfg);
+       SaveMsg->Message = Message;
+       return 1;
 }
 
+eNextState RSSSaveMessage(AsyncIO *IO)
+{
+       long len;
+       const char *Key;
+       rss_aggregator *RSSAggr = (rss_aggregator *) IO->Data;
 
+       if (rss_format_item(IO, RSSAggr->ThisMsg))
+       {
+               CM_SetAsFieldSB(&RSSAggr->ThisMsg->Msg, eMesageText,
+                                      &RSSAggr->ThisMsg->Message);
 
-/*
- * Begin a feed parse
- */
-int rss_do_fetching(rss_aggregator *Cfg)
-{
-       rss_item *ri;
+               CtdlSubmitMsg(&RSSAggr->ThisMsg->Msg, &RSSAggr->recp, NULL, 0);
                
-       time_t now;
-       AsyncIO *IO;
+               /* write the uidl to the use table so we don't store this item again */
+               
+               CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, EvGetNow(IO), 0, eWrite, CCID, IO->ID);
+       }
 
-        now = time(NULL);
+       if (GetNextHashPos(RSSAggr->Messages,
+                          RSSAggr->Pos,
+                          &len, &Key,
+                          (void**) &RSSAggr->ThisMsg))
+               return NextDBOperation(IO, RSS_FetchNetworkUsetableEntry);
+       else
+               return eAbort;
+}
 
-       if ((Cfg->next_poll != 0) && (now < Cfg->next_poll))
-               return 0;
-       Cfg->RefCount = 1;
+eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
+{
+       static const time_t antiExpire = USETABLE_ANTIEXPIRE_HIRES;
+#ifndef DEBUG_RSS
+       time_t seenstamp = 0;
+       const char *Key;
+       long len;
+       rss_aggregator *Ctx = (rss_aggregator *) IO->Data;
 
-       ri = (rss_item*) malloc(sizeof(rss_item));
-       memset(ri, 0, sizeof(rss_item));
-       Cfg->Item = ri;
-       IO = &Cfg->IO;
-       IO->CitContext = CloneContext(&rss_CC);
-       IO->Data = Cfg;
-
-
-       syslog(LOG_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, 
-                         RSSAggregatorTerminate))
+       /* Find out if we've already seen this item */
+// todo: expiry?
+       SetRSSState(IO, eRSSUT);
+       seenstamp = CheckIfAlreadySeen("RSS Item Seen",
+                                      Ctx->ThisMsg->MsgGUID,
+                                      EvGetNow(IO),
+                                      antiExpire,
+                                      eCheckUpdate,
+                                      CCID, IO->ID);
+       if (seenstamp != 0)
        {
-               syslog(LOG_DEBUG, "Unable to initialize libcurl.\n");
-               return 0;
+               /* Item has already been seen */
+               EVRSSC_syslog(LOG_DEBUG,
+                             "%s has already been seen - %ld < %ld",
+                             ChrPtr(Ctx->ThisMsg->MsgGUID),
+                             seenstamp, antiExpire);
+
+               SetRSSState(IO, eRSSParsing);
+
+               if (GetNextHashPos(Ctx->Messages,
+                                  Ctx->Pos,
+                                  &len, &Key,
+                                  (void**) &Ctx->ThisMsg))
+                       return NextDBOperation(
+                               IO,
+                               RSS_FetchNetworkUsetableEntry);
+               else
+                       return eAbort;
        }
+       else
+#endif
+       {
+               /* Item has already been seen */
+               EVRSSC_syslog(LOG_DEBUG,
+                             "%s Parsing - %ld >= %ld",
+                             ChrPtr(Ctx->ThisMsg->MsgGUID),
+                             seenstamp, antiExpire);
+               SetRSSState(IO, eRSSParsing);
 
-       evcurl_handle_start(IO);
-       return 1;
+               NextDBOperation(IO, RSSSaveMessage);
+               return eSendMore;
+       }
+       return eSendMore;
 }
 
-
-void DeleteRssCfg(void *vptr)
+void UpdateLastKnownGood(pRSSConfig *pCfg, time_t now)
 {
-       rss_aggregator *rncptr = (rss_aggregator *)vptr;
+       OneRoomNetCfg *pRNCfg;
+       begin_critical_section(S_NETCONFIGS);
+       pRNCfg = CtdlGetNetCfgForRoom(pCfg->QRnumber);
+       if (pRNCfg != NULL)
+       {
+               RSSCfgLine *RSSCfg = (RSSCfgLine *)pRNCfg->NetConfigs[rssclient];
 
-       FreeStrBuf(&rncptr->Url);
-       FreeStrBuf(&rncptr->rooms);
-       FreeStrBuf(&rncptr->CData);
-       FreeStrBuf(&rncptr->Key);
-       FreeStrBuf(&rncptr->IO.HttpReq.ReplyData);
-       DeleteHash(&rncptr->OtherQRnumbers);
-       FreeURL(&rncptr->IO.ConnectMe);
+               while (RSSCfg != NULL)
+               {
+                       if (RSSCfg == pCfg->pCfg)
+                               break;
 
-       if (rncptr->Item != NULL)
-       {
-               FreeStrBuf(&rncptr->Item->guid);
-               FreeStrBuf(&rncptr->Item->title);
-               FreeStrBuf(&rncptr->Item->link);
-               FreeStrBuf(&rncptr->Item->linkTitle);
-               FreeStrBuf(&rncptr->Item->reLink);
-               FreeStrBuf(&rncptr->Item->reLinkTitle);
-               FreeStrBuf(&rncptr->Item->description);
-               FreeStrBuf(&rncptr->Item->channel_title);
-               FreeStrBuf(&rncptr->Item->author_or_creator);
-               FreeStrBuf(&rncptr->Item->author_url);
-               FreeStrBuf(&rncptr->Item->author_email);
-
-               free(rncptr->Item);
+                       RSSCfg = RSSCfg->next;
+               }
+               if (RSSCfg != NULL)
+               {
+                       RSSCfg->last_known_good = now;
+               }
        }
-       free(rncptr);
+       SaveRoomNetConfigFile(pRNCfg, pCfg->QRnumber);
+       FreeRoomNetworkStruct(&pRNCfg);
+       end_critical_section(S_NETCONFIGS);
 }
 
-eNextState RSSAggregatorTerminate(AsyncIO *IO)
+eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 {
-       rss_aggregator *rncptr = (rss_aggregator *)IO->Data;
-       /*
-         HashPos *At;
-         long HKLen;
-         const char *HK;
-         void *vData;
-       */
-       pthread_mutex_lock(&RSSQueueMutex);
-       rncptr->RefCount --;
-       if (rncptr->RefCount == 0)
+       HashPos *it = NULL;
+       long len;
+       const char *Key;
+       pRSSConfig *pCfg;
+       u_char rawdigest[MD5_DIGEST_LEN];
+       struct MD5Context md5context;
+       StrBuf *guid;
+       rss_aggregator *Ctx = (rss_aggregator *) IO->Data;
+
+
+       if ((IO->HttpReq.httpcode >= 300) &&
+           (IO->HttpReq.httpcode < 400)  && 
+           (Ctx->RedirectUrl != NULL)) {
+
+               StrBuf *ErrMsg;
+               long lens[2];
+               const char *strs[2];
+
+               SetRSSState(IO, eRSSFailure);
+               ErrMsg = NewStrBuf();
+               if (IO) EVRSSC_syslog(LOG_ALERT, "need a 200, got a %ld !\n",
+                             IO->HttpReq.httpcode);
+               strs[0] = ChrPtr(Ctx->Url);
+               lens[0] = StrLength(Ctx->Url);
+
+               strs[1] = ChrPtr(Ctx->rooms);
+               lens[1] = StrLength(Ctx->rooms);
+
+               if (IO->HttpReq.CurlError == NULL)
+                       IO->HttpReq.CurlError = "";
+
+               StrBufPrintf(ErrMsg,
+                            "Error while RSS-Aggregation Run of %s\n"
+                            " need a 200, got a %ld !\n"
+                            " Curl Error message: \n%s / %s\n"
+                            " Redirect header points to: %s\n"
+                            " Response text was: \n"
+                            " \n %s\n",
+                            ChrPtr(Ctx->Url),
+                            IO->HttpReq.httpcode,
+                            IO->HttpReq.errdesc,
+                            IO->HttpReq.CurlError,
+                            ChrPtr(Ctx->RedirectUrl),
+                            ChrPtr(IO->HttpReq.ReplyData)
+                       );
+
+               CtdlAideFPMessage(
+                       ChrPtr(ErrMsg),
+                       "RSS Aggregation run failure",
+                       2, strs, (long*) &lens,
+                       CCID,
+                       IO->ID,
+                       EvGetNow(IO));
+               
+               FreeStrBuf(&ErrMsg);
+               EVRSSC_syslog(LOG_DEBUG,
+                             "RSS feed returned an invalid http status code. <%s><HTTP %ld>\n",
+                             ChrPtr(Ctx->Url),
+                             IO->HttpReq.httpcode);
+               return eAbort;
+       }
+       else if (IO->HttpReq.httpcode != 200)
        {
-               UnlinkRSSAggregator(rncptr);
+               StrBuf *ErrMsg;
+               long lens[2];
+               const char *strs[2];
+
+               SetRSSState(IO, eRSSFailure);
+               ErrMsg = NewStrBuf();
+               if (IO) EVRSSC_syslog(LOG_ALERT, "need a 200, got a %ld !\n",
+                             IO->HttpReq.httpcode);
+               strs[0] = ChrPtr(Ctx->Url);
+               lens[0] = StrLength(Ctx->Url);
+
+               strs[1] = ChrPtr(Ctx->rooms);
+               lens[1] = StrLength(Ctx->rooms);
+
+               if (IO->HttpReq.CurlError == NULL)
+                       IO->HttpReq.CurlError = "";
+
+               StrBufPrintf(ErrMsg,
+                            "Error while RSS-Aggregation Run of %s\n"
+                            " need a 200, got a %ld !\n"
+                            " Curl Error message: \n%s / %s\n"
+                            " Response text was: \n"
+                            " \n %s\n",
+                            ChrPtr(Ctx->Url),
+                            IO->HttpReq.httpcode,
+                            IO->HttpReq.errdesc,
+                            IO->HttpReq.CurlError,
+                            ChrPtr(IO->HttpReq.ReplyData)
+                       );
+
+               CtdlAideFPMessage(
+                       ChrPtr(ErrMsg),
+                       "RSS Aggregation run failure",
+                       2, strs, (long*) &lens,
+                       CCID,
+                       IO->ID,
+                       EvGetNow(IO));
+               
+               FreeStrBuf(&ErrMsg);
+               EVRSSC_syslog(LOG_DEBUG,
+                             "RSS feed returned an invalid http status code. <%s><HTTP %ld>\n",
+                             ChrPtr(Ctx->Url),
+                             IO->HttpReq.httpcode);
+               return eAbort;
+       }
 
+       pCfg = &Ctx->Cfg;
+
+       while (pCfg != NULL)
+       {
+               UpdateLastKnownGood (pCfg, EvGetNow(IO));
+               if ((Ctx->roomlist_parts > 1) && 
+                   (it == NULL))
+               {
+                       it = GetNewHashPos(RSSFetchUrls, 0);
+               }
+               if (it != NULL)
+               {
+                       void *vptr;
+                       if (GetNextHashPos(Ctx->OtherQRnumbers, it, &len, &Key, &vptr))
+                               pCfg = vptr;
+                       else
+                               pCfg = NULL;
+               }
+               else 
+                       pCfg = NULL;
        }
-       pthread_mutex_unlock(&RSSQueueMutex);
+       DeleteHashPos (&it);
+
+       SetRSSState(IO, eRSSUT);
+
+       MD5Init(&md5context);
+
+       MD5Update(&md5context,
+                 (const unsigned char*)SKEY(IO->HttpReq.ReplyData));
+
+       MD5Update(&md5context,
+                 (const unsigned char*)SKEY(Ctx->Url));
+
+       MD5Final(rawdigest, &md5context);
+       guid = NewStrBufPlain(NULL,
+                             MD5_DIGEST_LEN * 2 + 12 /* _rss2ctdl*/);
+       StrBufHexEscAppend(guid, NULL, rawdigest, MD5_DIGEST_LEN);
+       StrBufAppendBufPlain(guid, HKEY("_rssFM"), 0);
+       if (StrLength(guid) > 40)
+               StrBufCutAt(guid, 40, NULL);
+       /* Find out if we've already seen this item */
+
+#ifndef DEBUG_RSS
+
+       if (CheckIfAlreadySeen("RSS Whole",
+                              guid,
+                              EvGetNow(IO),
+                              EvGetNow(IO) - USETABLE_ANTIEXPIRE,
+                              eUpdate,
+                              CCID, IO->ID)
+           != 0)
+       {
+               FreeStrBuf(&guid);
+
+               EVRSSC_syslog(LOG_DEBUG, "RSS feed already seen. <%s>\n", ChrPtr(Ctx->Url));
+               return eAbort;
+       }
+       FreeStrBuf(&guid);
+#endif
+       SetRSSState(IO, eRSSParsing);
+       return RSSAggregator_ParseReply(IO);
+}
+
+eNextState RSSAggregator_FinishHttp(AsyncIO *IO)
+{
+       return CurlQueueDBOperation(IO, RSSAggregator_AnalyseReply);
+}
+
 /*
-       At = GetNewHashPos(RSSFetchUrls, 0);
+ * Begin a feed parse
+ */
+int rss_do_fetching(rss_aggregator *RSSAggr)
+{
+       AsyncIO         *IO = &RSSAggr->IO;
+       rss_item *ri;
+       time_t now;
+       CURLcode sta;
+       CURL *chnd;
 
-       pthread_mutex_lock(&RSSQueueMutex);
-       GetHashPosFromKey(RSSFetchUrls, SKEY(rncptr->Url), At);
-       GetHashPos(RSSFetchUrls, At, &HKLen, &HK, &vData);
-       DeleteEntryFromHash(RSSFetchUrls, At);
-       pthread_mutex_unlock(&RSSQueueMutex);
 
-       DeleteHashPos(&At);
-*/
-       return eAbort;
+       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_FinishHttp,
+                              RSSAggregator_Terminate,
+                              RSSAggregator_TerminateDB,
+                              RSSAggregator_ShutdownAbort))
+       {
+               EVRSSCM_syslog(LOG_ALERT, "Unable to initialize libcurl.\n");
+               return 0;
+       }
+       chnd = IO->HttpReq.chnd;
+       OPT(HEADERDATA, IO);
+       OPT(HEADERFUNCTION, GetLocationString);
+       SetRSSState(IO, eRSSCreated);
+
+       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);
+
+       SetRSSState(IO, eRSSFetching);
+       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)
+void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneRNCFG)
 {
-       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 *rncptr = NULL;
-       rss_aggregator *use_this_rncptr = NULL;
+       const RSSCfgLine *RSSCfg = (RSSCfgLine *)OneRNCFG->NetConfigs[rssclient];
+       rss_aggregator *RSSAggr = NULL;
+       rss_aggregator *use_this_RSSAggr = NULL;
        void *vptr;
-       const char *CfgPtr, *lPtr;
-       const char *Err;
+
+       TRACE;
 
        pthread_mutex_lock(&RSSQueueMutex);
        if (GetHash(RSSQueueRooms, LKEY(qrbuf->QRnumber), &vptr))
        {
-               syslog(LOG_DEBUG, 
-                             "rssclient: [%ld] %s already in progress.\n", 
-                             qrbuf->QRnumber, 
+               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);
+       if (server_shutting_down) return;
 
-       if (server_shutting_down)
-               return;
-               
-       /* 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);
-               return;
-       }
+       while (RSSCfg != NULL)
+       {
+               pthread_mutex_lock(&RSSQueueMutex);
+               GetHash(RSSFetchUrls,
+                       SKEY(RSSCfg->Url),
+                       &vptr);
 
-       if (server_shutting_down)
-               return;
+               use_this_RSSAggr = (rss_aggregator *)vptr;
+               if (use_this_RSSAggr != NULL)
+               {
+                       pRSSConfig *pRSSCfg;
 
-       if (fstat(fd, &statbuf) == -1) {
-               syslog(LOG_DEBUG, "ERROR: could not stat configfile '%s' - %s\n",
-                      filename, strerror(errno));
-               return;
-       }
+                       StrBufAppendBufPlain(
+                               use_this_RSSAggr->rooms,
+                               qrbuf->QRname,
+                               -1, 0);
+                       if (use_this_RSSAggr->roomlist_parts==1)
+                       {
+                               use_this_RSSAggr->OtherQRnumbers
+                                       = NewHash(1, lFlathash);
+                       }
 
-       if (server_shutting_down)
-               return;
+                       pRSSCfg = (pRSSConfig *) malloc(sizeof(pRSSConfig));
 
-       CfgData = NewStrBufPlain(NULL, statbuf.st_size + 1);
+                       pRSSCfg->QRnumber = qrbuf->QRnumber;
+                       pRSSCfg->pCfg = RSSCfg;
 
-       if (StrBufReadBLOB(CfgData, &fd, 1, statbuf.st_size, &Err) < 0) {
-               close(fd);
-               FreeStrBuf(&CfgData);
-               syslog(LOG_DEBUG, "ERROR: reading config '%s' - %s<br>\n",
-                       filename, strerror(errno));
-               return;
-       }
-       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 ++;
-                   rncptr = (rss_aggregator *) malloc(sizeof(rss_aggregator));
-                   memset (rncptr, 0, sizeof(rss_aggregator));
-                   rncptr->roomlist_parts = 1;
-                   rncptr->Url = NewStrBuf();
-                   StrBufExtract_NextToken(rncptr->Url, Line, &lPtr, '|');
-
-                   pthread_mutex_lock(&RSSQueueMutex);
-                   GetHash(RSSFetchUrls, SKEY(rncptr->Url), &vptr);
-                   use_this_rncptr = (rss_aggregator *)vptr;
-                   if (use_this_rncptr != NULL)
-                   {
-                           /* mustn't attach to an active session */
-                           if (use_this_rncptr->RefCount > 0)
-                           {
-                                   DeleteRssCfg(rncptr);
-                                   Count->count--;
-                           }
-                           else 
-                           {
-                                   long *QRnumber;
-                                   StrBufAppendBufPlain(use_this_rncptr->rooms, 
-                                                        qrbuf->QRname, 
-                                                        -1, 0);
-                                   if (use_this_rncptr->roomlist_parts == 1)
-                                   {
-                                           use_this_rncptr->OtherQRnumbers = NewHash(1, lFlathash);
-                                   }
-                                   QRnumber = (long*)malloc(sizeof(long));
-                                   *QRnumber = qrbuf->QRnumber;
-                                   Put(use_this_rncptr->OtherQRnumbers, LKEY(qrbuf->QRnumber), QRnumber, NULL);
-                                   use_this_rncptr->roomlist_parts++;
-                           }
-                           pthread_mutex_unlock(&RSSQueueMutex);
-
-
-                           FreeStrBuf(&rncptr->Url);       
-                           free(rncptr);
-                           rncptr = NULL;
-                           continue;
-                   }
-                   pthread_mutex_unlock(&RSSQueueMutex);
-
-                   rncptr->ItemType = RSS_UNSET;
-                               
-                   rncptr->rooms = NewStrBufPlain(qrbuf->QRname, -1);
-
-                   pthread_mutex_lock(&RSSQueueMutex);
-                   Put(RSSFetchUrls, SKEY(rncptr->Url), rncptr, DeleteRssCfg);
-                   pthread_mutex_unlock(&RSSQueueMutex);
+                       Put(use_this_RSSAggr->OtherQRnumbers,
+                           LKEY(qrbuf->QRnumber),
+                           pRSSCfg,
+                           NULL);
+                       use_this_RSSAggr->roomlist_parts++;
+
+                       pthread_mutex_unlock(&RSSQueueMutex);
+
+                       RSSCfg = RSSCfg->next;
+                       continue;
                }
-           }
-       }
-       if (Count != NULL)
-       {
-               Count->QRnumber = qrbuf->QRnumber;
+               pthread_mutex_unlock(&RSSQueueMutex);
+
+               RSSAggr = (rss_aggregator *) malloc(
+                       sizeof(rss_aggregator));
+
+               memset (RSSAggr, 0, sizeof(rss_aggregator));
+               RSSAggr->Cfg.QRnumber = qrbuf->QRnumber;
+               RSSAggr->Cfg.pCfg = RSSCfg;
+               RSSAggr->roomlist_parts = 1;
+               RSSAggr->Url = NewStrBufDup(RSSCfg->Url);
+
+               RSSAggr->ItemType = RSS_UNSET;
+
+               RSSAggr->rooms = NewStrBufPlain(
+                       qrbuf->QRname, -1);
+
                pthread_mutex_lock(&RSSQueueMutex);
-               syslog(LOG_DEBUG, "rssclient: [%ld] %s now starting.\n", 
-                             qrbuf->QRnumber, qrbuf->QRname);
-               Put(RSSQueueRooms, LKEY(qrbuf->QRnumber), Count, NULL);
+
+               Put(RSSFetchUrls,
+                   SKEY(RSSAggr->Url),
+                   RSSAggr,
+                   DeleteRssCfg);
+
                pthread_mutex_unlock(&RSSQueueMutex);
+               RSSCfg = RSSCfg->next;
        }
-       FreeStrBuf(&CfgData);
-       FreeStrBuf(&CfgType);
-       FreeStrBuf(&Line);
 }
 
 /*
  * Scan for rooms that have RSS client requests configured
  */
 void rssclient_scan(void) {
-       static int doing_rssclient = 0;
+       int RSSRoomCount, RSSCount;
        rss_aggregator *rptr = NULL;
        void *vrptr = NULL;
-       HashPos  *it;
+       HashPos *it;
        long len;
        const char *Key;
-
-       /* Run no more than once every 15 minutes. * /
-       if ((time(NULL) - last_run) < 900) {
+       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);
 
-       syslog(LOG_DEBUG, "rssclient started\n");
-       CtdlForEachRoom(rssclient_scan_room, NULL);
+       if ((RSSRoomCount > 0) || (RSSCount > 0)) {
+               EVRSSQ_syslog(LOG_DEBUG,
+                             "rssclient: concurrency check failed; %d rooms and %d url's are queued",
+                             RSSRoomCount, RSSCount
+                       );
+               return;
+       }
 
-       pthread_mutex_lock(&RSSQueueMutex);
+       become_session(&rss_CC);
+       EVRSSQM_syslog(LOG_DEBUG, "rssclient started");
+       CtdlForEachNetCfgRoom(rssclient_scan_room, NULL, rssclient);
 
-       it = GetNewHashPos(RSSFetchUrls, 0);
-       while (!server_shutting_down &&
-              GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) && 
-              (vrptr != NULL)) {
-               rptr = (rss_aggregator *)vrptr;
-               if (rptr->RefCount == 0) 
+       if (GetCount(RSSFetchUrls) > 0)
+       {
+               pthread_mutex_lock(&RSSQueueMutex);
+               EVRSSQ_syslog(LOG_DEBUG,
+                              "rssclient starting %d Clients",
+                              GetCount(RSSFetchUrls));
+               
+               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);
        }
-       DeleteHashPos(&it);
-       pthread_mutex_unlock(&RSSQueueMutex);
+       else
+               EVRSSQM_syslog(LOG_DEBUG, "Nothing to do.");
 
-       syslog(LOG_DEBUG, "rssclient ended\n");
-       doing_rssclient = 0;
+       EVRSSQM_syslog(LOG_DEBUG, "rssclient ended\n");
        return;
 }
 
@@ -727,18 +927,109 @@ void rss_cleanup(void)
        DeleteHash(&RSSQueueRooms);
 }
 
+void LogDebugEnableRSSClient(const int n)
+{
+       RSSClientDebugEnabled = n;
+}
+
+
+typedef struct __RSSVetoInfo {
+       StrBuf *ErrMsg;
+       time_t Now;
+       int Veto;
+}RSSVetoInfo;
+
+void rssclient_veto_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneRNCFG)
+{
+       RSSVetoInfo *Info = (RSSVetoInfo *) data;
+       const RSSCfgLine *RSSCfg = (RSSCfgLine *)OneRNCFG->NetConfigs[rssclient];
+
+       while (RSSCfg != NULL)
+       {
+               if ((RSSCfg->last_known_good != 0) &&
+                   (RSSCfg->last_known_good + USETABLE_ANTIEXPIRE < Info->Now))
+               {
+                       StrBufAppendPrintf(Info->ErrMsg,
+                                          "RSS feed not seen for a %d days:: <",
+                                          (Info->Now - RSSCfg->last_known_good) / (24 * 60 * 60));
+
+                       StrBufAppendBuf(Info->ErrMsg, RSSCfg->Url, 0);
+                       StrBufAppendBufPlain(Info->ErrMsg, HKEY(">\n"), 0);
+               }
+               RSSCfg = RSSCfg->next;
+       }
+}
+
+int RSSCheckUsetableVeto(StrBuf *ErrMsg)
+{
+       RSSVetoInfo Info;
+
+       Info.ErrMsg = ErrMsg;
+       Info.Now = time (NULL);
+       Info.Veto = 0;
+
+       CtdlForEachNetCfgRoom(rssclient_veto_scan_room, &Info, rssclient);
+
+       return Info.Veto;;
+}
+
+
+
+
+void ParseRSSClientCfgLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
+{
+       RSSCfgLine *RSSCfg;
+
+       RSSCfg = (RSSCfgLine *) malloc (sizeof(RSSCfgLine));
+       RSSCfg->Url = NewStrBufPlain (NULL, StrLength (Line));
+       
+
+       StrBufExtract_NextToken(RSSCfg->Url, Line, &LinePos, '|');
+       RSSCfg->last_known_good = StrBufExtractNext_long(Line, &LinePos, '|');
+
+
+       RSSCfg->next = (RSSCfgLine *)OneRNCFG->NetConfigs[ThisOne->C];
+       OneRNCFG->NetConfigs[ThisOne->C] = (RoomNetCfgLine*) RSSCfg;
+}
+
+void SerializeRSSClientCfgLine(const CfgLineType *ThisOne, StrBuf *OutputBuffer, OneRoomNetCfg *RNCfg, RoomNetCfgLine *data)
+{
+       RSSCfgLine *RSSCfg = (RSSCfgLine*) data;
+
+       StrBufAppendBufPlain(OutputBuffer, CKEY(ThisOne->Str), 0);
+       StrBufAppendBufPlain(OutputBuffer, HKEY("|"), 0);
+       StrBufAppendBufPlain(OutputBuffer, SKEY(RSSCfg->Url), 0);
+       StrBufAppendPrintf(OutputBuffer, "|%ld\n", RSSCfg->last_known_good);
+}
+
+void DeleteRSSClientCfgLine(const CfgLineType *ThisOne, RoomNetCfgLine **data)
+{
+       RSSCfgLine *RSSCfg = (RSSCfgLine*) *data;
+
+       FreeStrBuf(&RSSCfg->Url);
+       free(*data);
+       *data = NULL;
+}
+
 
 CTDL_MODULE_INIT(rssclient)
 {
-       if (threading)
+       if (!threading)
        {
-               CtdlFillSystemContext(&rss_CC, "rssclient");
+               CtdlRegisterTDAPVetoHook (RSSCheckUsetableVeto, CDB_USETABLE, 0);
+
+               CtdlREGISTERRoomCfgType(rssclient, ParseRSSClientCfgLine, 0, 1, SerializeRSSClientCfgLine, DeleteRSSClientCfgLine);
                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);
-                CtdlRegisterCleanupHook(rss_cleanup);
+               CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER, PRIO_AGGR + 300);
+               CtdlRegisterEVCleanupHook(rss_cleanup);
+               CtdlRegisterDebugFlagHook(HKEY("rssclient"), LogDebugEnableRSSClient, &RSSClientDebugEnabled);
+       }
+       else
+       {
+               CtdlFillSystemContext(&rss_CC, "rssclient");
        }
        return "rssclient";
 }