]> code.citadel.org Git - citadel.git/blobdiff - citadel/modules/rssclient/serv_rssclient.c
* remove debugging output etc.
[citadel.git] / citadel / modules / rssclient / serv_rssclient.c
index 80fe3908c9f4e9501d2973d5fd79aaeda5d4600b..427a9726ed71bbfcfe01697fccbd2c5353564885 100644 (file)
@@ -1,8 +1,21 @@
 /*
- * $Id: serv_rssclient.c 5652 2007-10-29 20:14:48Z ajc $
- *
  * Bring external RSS feeds into rooms.
  *
+ * Copyright (c) 2007-2010 by the citadel.org team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <expat.h>
+#include <curl/curl.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "tools.h"
-#include "room_ops.h"
+#include "threads.h"
 #include "ctdl_module.h"
 #include "clientsocket.h"
 #include "msgbase.h"
+#include "parsedate.h"
 #include "database.h"
 #include "citadel_dirs.h"
 #include "md5.h"
+#include "context.h"
 
-#ifdef HAVE_EXPAT
-#include <expat.h>
-
-
+typedef struct rssnetcfg rssnetcfg;
 struct rssnetcfg {
-       struct rssnetcfg *next;
+       rssnetcfg *next;
        char url[256];
        char *rooms;
+       time_t last_error_when;
+       int ItemType;
 };
 
-struct rss_item {
-       char *chardata;
-       int chardata_len;
+#define RSS_UNSET       (1<<0)
+#define RSS_RSS         (1<<1)
+#define RSS_ATOM        (1<<2)
+#define RSS_REQUIRE_BUF (1<<3)
+
+typedef struct _rss_item {
        char *roomlist;
        int done_parsing;
-       char *guid;
-       char *title;
-       char *link;
-       char *description;
+       StrBuf *guid;
+       StrBuf *title;
+       StrBuf *link;
+       StrBuf *linkTitle;
+       StrBuf *reLink;
+       StrBuf *reLinkTitle;
+       StrBuf *description;
        time_t pubdate;
-};
+       StrBuf *channel_title;
+       int item_tag_nesting;
+       StrBuf *author_or_creator;
+       StrBuf *author_url;
+}rss_item;
+
+
+typedef void (*rss_handler_func)(StrBuf *CData, 
+                                rss_item *ri, 
+                                rssnetcfg *Cfg, 
+                                const char** Attr);
+
+typedef struct __rss_xml_handler {
+       int Flags;
+       rss_handler_func Handler;
+}rss_xml_handler;
+
+
+typedef struct _rsscollection {
+       StrBuf *CData;
+       StrBuf *Key;
+
+       rss_item *Item;
+       rssnetcfg *Cfg;
+       
+       rss_xml_handler *Current;
+} rsscollection;
 
 struct rssnetcfg *rnclist = NULL;
+HashList *StartHandlers;
+HashList *EndHandlers;
+HashList *KnownNameSpaces;
+void AddRSSStartHandler(rss_handler_func Handler, int Flags, const char *key, long len)
+{
+       rss_xml_handler *h;
+       h = (rss_xml_handler*) malloc(sizeof (rss_xml_handler));
+       h->Flags = Flags;
+       h->Handler = Handler;
+       Put(StartHandlers, key, len, h, NULL);
+}
+void AddRSSEndHandler(rss_handler_func Handler, int Flags, const char *key, long len)
+{
+       rss_xml_handler *h;
+       h = (rss_xml_handler*) malloc(sizeof (rss_xml_handler));
+       h->Flags = Flags;
+       h->Handler = Handler;
+       Put(EndHandlers, key, len, h, NULL);
+}
+
+#if 0
+#ifdef HAVE_ICONV
+#include <iconv.h>
+
 
+/* 
+ * dug this out of the trashcan of the midgard project, lets see if it works for us.
+ * original code by Alexander Bokovoy <bokovoy@avilink.ne> distributed under GPL V2 or later
+ */
+
+/* Returns: 
+ >= 0 - successfull, 0 means conversion doesn't use multibyte sequences 
+   -1 - error during iconv_open call 
+   -2 - error during iconv_close call 
+   ---------------------------------- 
+   This function expects that multibyte encoding in 'charset' wouldn't have 
+   characters with more than 3 bytes. It is not intended to convert UTF-8 because 
+   we'll never receive UTF-8 in our handler (it is handled by Exat itself). 
+*/ 
+static int 
+fill_encoding_info (const char *charset, XML_Encoding * info) 
+{ 
+  iconv_t cd = (iconv_t)(-1); 
+  int flag; 
+       CtdlLogPrintf(0, "RSS: fill encoding info ...\n");
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN 
+  cd = iconv_open ("UCS-2LE", charset); 
+#else 
+  cd = iconv_open ("UCS-2BE", charset); 
+#endif 
+  if (cd == (iconv_t) (-1)) 
+    { 
+      return -1; 
+    } 
+  { 
+    unsigned short out; 
+    unsigned char buf[4]; 
+    unsigned int i0, i1, i2; 
+    int result; 
+    flag = 0; 
+    for (i0 = 0; i0 < 0x100; i0++) 
+      { 
+        buf[0] = i0; 
+        info->map[i0] = 0; 
+        //result = try (cd, buf, 1, &out); 
+        if (result < 0) 
+          { 
+          } 
+        else if (result > 0) 
+          { 
+            info->map[i0] = out; 
+          } 
+        else 
+          { 
+            for (i1 = 0; i1 < 0x100; i1++) 
+              { 
+                buf[1] = i1; 
+                ///result = try (cd, buf, 2, &out); 
+                if (result < 0) 
+                  { 
+                  } 
+                else if (result > 0) 
+                  { 
+                    flag++; 
+                    info->map[i0] = -2; 
+                  } 
+                else 
+                  { 
+                    for (i2 = 0; i2 < 0x100; i2++) 
+                      { 
+                        buf[2] = i2; 
+                        ////result = try (cd, buf, 3, &out); 
+                        if (result < 0) 
+                          { 
+                          } 
+                        else if (result > 0) 
+                          { 
+                            flag++; 
+                            info->map[i0] = -3; 
+                          } 
+                      } 
+                  } 
+              } 
+          } 
+      } 
+  } 
+  if (iconv_close (cd) < 0) 
+    { 
+      return -2; 
+    } 
+  return flag; 
+} 
+
+static int 
+iconv_convertor (void *data, const char *s) 
+{ 
+  XML_Encoding *info = data; 
+  int res; 
+       CtdlLogPrintf(0, "RSS: Converting ...\n");
+
+  if (s == NULL) 
+    return -1; 
+/*
+  GByteArray *result; 
+  result = g_byte_array_new (); 
+  if (process_block (info->data, (char *) s, strlen (s), result) == 0) 
+    { 
+      res = *(result->data); 
+      g_byte_array_free (result, TRUE); 
+      return res; 
+    } 
+  g_byte_array_free (result, TRUE); 
+*/
+  return -1; 
+} 
+
+static void 
+my_release (void *data) 
+{ 
+  iconv_t cd = (iconv_t) data; 
+  if (iconv_close (cd) != 0) 
+    { 
+/// TODO: uh no.      exit (1); 
+    } 
+} 
+int 
+handle_unknown_xml_encoding (void *encodingHandleData, 
+                            const XML_Char * name, 
+                            XML_Encoding * info) 
+{ 
+  int result; 
+  CtdlLogPrintf(0, "RSS: unknown encoding ...\n");
+  result = fill_encoding_info (name, info); 
+  if (result >= 0) 
+    { 
+      /*  
+        Special case: client asked for reverse conversion, we'll provide him with 
+        iconv descriptor which handles it. Client should release it by himself. 
+      */ 
+      if(encodingHandleData != NULL) 
+            *((iconv_t *)encodingHandleData) = iconv_open(name, "UTF-8"); 
+      /*  
+         Optimization: we do not need conversion function if encoding is one-to-one,  
+         info->map table will be enough  
+       */ 
+      if (result == 0) 
+        { 
+          info->data = NULL; 
+          info->convert = NULL; 
+          info->release = NULL; 
+          return 1; 
+        } 
+      /*  
+         We do need conversion function because this encoding uses multibyte sequences 
+       */ 
+      info->data = (void *) iconv_open ("UTF-8", name); 
+      if ((int)info->data == -1) 
+        return -1; 
+      info->convert = iconv_convertor; 
+      info->release = my_release; 
+      return 1; 
+    } 
+  if(encodingHandleData != NULL)  
+    *(iconv_t *)encodingHandleData = NULL; 
+  return 0; 
+} 
+
+#endif
+#endif
 
 /*
  * Commit a fetched and parsed RSS item to disk
  */
-void rss_save_item(struct rss_item *ri) {
+void rss_save_item(rss_item *ri)
+{
 
        struct MD5Context md5context;
        u_char rawdigest[MD5_DIGEST_LEN];
@@ -82,6 +323,7 @@ void rss_save_item(struct rss_item *ri) {
        recp = (struct recptypes *) malloc(sizeof(struct recptypes));
        if (recp == NULL) return;
        memset(recp, 0, sizeof(struct recptypes));
+       memset(&ut, 0, sizeof(struct UseTable));
        recp->recp_room = strdup(ri->roomlist);
        recp->num_room = num_tokens(ri->roomlist, '|');
        recp->recptypes_magic = RECPTYPES_MAGIC;
@@ -90,15 +332,17 @@ void rss_save_item(struct rss_item *ri) {
         * If one is not present in the item itself, make one up.
         */
        if (ri->guid != NULL) {
-               snprintf(utmsgid, sizeof utmsgid, "rss/%s", ri->guid);
+               StrBufSpaceToBlank(ri->guid);
+               StrBufTrim(ri->guid);
+               snprintf(utmsgid, sizeof utmsgid, "rss/%s", ChrPtr(ri->guid));
        }
        else {
                MD5Init(&md5context);
                if (ri->title != NULL) {
-                       MD5Update(&md5context, ri->title, strlen(ri->title));
+                       MD5Update(&md5context, (const unsigned char*)ChrPtr(ri->title), StrLength(ri->title));
                }
                if (ri->link != NULL) {
-                       MD5Update(&md5context, ri->link, strlen(ri->link));
+                       MD5Update(&md5context, (const unsigned char*)ChrPtr(ri->link), StrLength(ri->link));
                }
                MD5Final(rawdigest, &md5context);
                for (i=0; i<MD5_DIGEST_LEN; i++) {
@@ -110,10 +354,12 @@ void rss_save_item(struct rss_item *ri) {
        }
 
        /* Find out if we've already seen this item */
+
        cdbut = cdb_fetch(CDB_USETABLE, utmsgid, strlen(utmsgid));
+#ifndef DEBUG_RSS
        if (cdbut != NULL) {
                /* Item has already been seen */
-               lprintf(CTDL_DEBUG, "%s has already been seen\n", utmsgid);
+               CtdlLogPrintf(CTDL_DEBUG, "%s has already been seen\n", utmsgid);
                cdb_free(cdbut);
 
                /* rewrite the record anyway, to update the timestamp */
@@ -121,48 +367,108 @@ void rss_save_item(struct rss_item *ri) {
                ut.ut_timestamp = time(NULL);
                cdb_store(CDB_USETABLE, utmsgid, strlen(utmsgid), &ut, sizeof(struct UseTable) );
        }
-       else {
+       else 
+#endif
+{
                /* Item has not been seen, so save it. */
-
-               for (i=strlen(ri->description); i>=0; --i) {
-                       if (isspace(ri->description[i])) {
-                               ri->description[i] = ' ';
-                       }
-               }
-
+               CtdlLogPrintf(CTDL_DEBUG, "RSS: saving item...\n");
+               if (ri->description == NULL) ri->description = NewStrBufPlain(HKEY(""));
+               StrBufSpaceToBlank(ri->description);
                msg = malloc(sizeof(struct CtdlMessage));
                memset(msg, 0, sizeof(struct CtdlMessage));
                msg->cm_magic = CTDLMESSAGE_MAGIC;
                msg->cm_anon_type = MES_NORMAL;
                msg->cm_format_type = FMT_RFC822;
-               msg->cm_fields['A'] = strdup("rss");
+
+               if (ri->guid != NULL) {
+                       msg->cm_fields['E'] = strdup(ChrPtr(ri->guid));
+               }
+
+               if (ri->author_or_creator != NULL) {
+                       char *From;
+                       StrBuf *Encoded, *QPEncoded;
+                       StrBuf *UserName;
+                       StrBuf *EmailAddress;
+                       StrBuf *EncBuf;
+                       
+                       UserName = NewStrBuf();
+                       EmailAddress = NewStrBuf();
+                       EncBuf = NewStrBuf();
+////TODO!
+                       From = html_to_ascii(ChrPtr(ri->author_or_creator),
+                                            StrLength(ri->author_or_creator), 
+                                            512, 0);
+
+                       Encoded = NewStrBufPlain(From, -1);
+                       free(From);
+                       StrBufTrim(Encoded);
+                       QPEncoded = StrBufSanitizeEmailRecipientVector(Encoded, UserName, EmailAddress, EncBuf);
+                       msg->cm_fields['A'] = SmashStrBuf(&QPEncoded);
+
+                       FreeStrBuf(&Encoded);
+                       FreeStrBuf(&UserName);
+                       FreeStrBuf(&EmailAddress);
+                       FreeStrBuf(&EncBuf);
+
+               }
+               else {
+                       msg->cm_fields['A'] = strdup("rss");
+               }
+
                msg->cm_fields['N'] = strdup(NODENAME);
-               msg->cm_fields['U'] = strdup(ri->title);
+               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);
+                       Encoded = NewStrBufPlain(Sbj, -1);
+                       free(Sbj);
+
+                       StrBufTrim(Encoded);
+                       StrBufRFC2047encode(&QPEncoded, Encoded);
+
+                       msg->cm_fields['U'] = SmashStrBuf(&QPEncoded);
+                       FreeStrBuf(&Encoded);
+               }
                msg->cm_fields['T'] = malloc(64);
                snprintf(msg->cm_fields['T'], 64, "%ld", ri->pubdate);
-
-               msglen = 1024 + strlen(ri->link) + strlen(ri->description) ;
+               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(""));
+               msglen += 1024 + StrLength(ri->link) + StrLength(ri->description) ;
                msg->cm_fields['M'] = malloc(msglen);
                snprintf(msg->cm_fields['M'], msglen,
-                       "Content-type: text/html\r\n\r\n"
-                       "<html><body>\n"
-                       "%s<br><br>\n"
-                       "<a href=\"%s\">%s</a>\n"
-                       "</body></html>\n"
-                       ,
-                       ri->description,
-                       ri->link, ri->link
+                        "Content-type: text/html; charset=\"UTF-8\"\r\n\r\n"
+                        "<html><body>\n"
+                        "%s<br><br>\n"
+                        "<a href=\"%s\">%s</a><br>\n"
+                        "<a href=\"%s\">%s</a>\n"
+                        "</body></html>\n"
+                        ,
+                        ChrPtr(ri->description),
+                        ChrPtr(ri->link),
+                        (StrLength(ri->linkTitle)>0)?ChrPtr(ri->linkTitle):ChrPtr(ri->link),
+                        ChrPtr(ri->reLink),
+                        (StrLength(ri->reLinkTitle)>0)?ChrPtr(ri->reLinkTitle):"Reply to this"
                );
 
-               CtdlSubmitMsg(msg, recp, NULL);
+               CtdlSubmitMsg(msg, recp, NULL, 0);
                CtdlFreeMessage(msg);
-               free_recipients(recp);
 
                /* write the uidl to the use table so we don't store this item again */
                strcpy(ut.ut_msgid, utmsgid);
                ut.ut_timestamp = time(NULL);
                cdb_store(CDB_USETABLE, utmsgid, strlen(utmsgid), &ut, sizeof(struct UseTable) );
        }
+       free_recipients(recp);
 }
 
 
@@ -170,16 +476,22 @@ void rss_save_item(struct rss_item *ri) {
 /*
  * Convert an RDF/RSS datestamp into a time_t
  */
-time_t rdf_parsedate(char *p)
+time_t rdf_parsedate(const char *p)
 {
        struct tm tm;
+       time_t t = 0;
 
        if (!p) return 0L;
        if (strlen(p) < 10) return 0L;
 
        memset(&tm, 0, sizeof tm);
 
-       /* YYYY-MM-DDTHH:MM format...
+       /*
+        * If the timestamp appears to be in W3C datetime format, try to
+        * parse it.  See also: http://www.w3.org/TR/NOTE-datetime
+        *
+        * This code, along with parsedate.c, is a potential candidate for
+        * moving into libcitadel.
         */
        if ( (p[4] == '-') && (p[7] == '-') ) {
                tm.tm_year = atoi(&p[0]) - 1900;
@@ -189,287 +501,570 @@ time_t rdf_parsedate(char *p)
                        tm.tm_hour = atoi(&p[11]);
                        tm.tm_min = atoi(&p[14]);
                }
+               return mktime(&tm);
        }
 
-       else {
-               /* FIXME try an imap timestamp conversion */
-       }
+       /* hmm... try RFC822 date stamp format */
+
+       t = parsedate(p);
+       if (t > 0) return(t);
 
-       return mktime(&tm);
+       /* yeesh.  ok, just return the current date and time. */
+       return(time(NULL));
 }
 
+void flush_rss_item(rss_item *ri)
+{
+       /* Initialize the feed item data structure */
+       FreeStrBuf(&ri->guid);
+       FreeStrBuf(&ri->title);
+       FreeStrBuf(&ri->link);
+       FreeStrBuf(&ri->author_or_creator);
+       FreeStrBuf(&ri->author_url);
+       FreeStrBuf(&ri->description);
+}
+
+void rss_xml_start(void *data, const char *supplied_el, const char **attr)
+{
+       rss_xml_handler *h;
+       rsscollection   *rssc = (rsscollection*) data;
+       rssnetcfg       *Cfg = rssc->Cfg;
+       rss_item        *ri = rssc->Item;
+       void            *pv;
+       const char      *pel;
+       char            *sep = NULL;
+
+       /* Axe the namespace, we don't care about it */
+///    CtdlLogPrintf(0, "RSS: supplied el %d: %s...\n", rssc->Cfg->ItemType, supplied_el);
+       pel = supplied_el;
+       while (sep = strchr(pel, ':'), sep) {
+               pel = sep + 1;
+       }
+
+       if (pel != supplied_el)
+       {
+               void *v;
+               
+               if (!GetHash(KnownNameSpaces, 
+                            supplied_el, 
+                            pel - supplied_el - 1,
+                            &v))
+               {
+#ifdef DEBUG_RSS
+                       CtdlLogPrintf(0, "RSS: START ignoring because of wrong namespace [%s] = [%s]\n", 
+                                     supplied_el);
+#endif
+                       return;
+               }
+       }
 
+       StrBufPlain(rssc->Key, pel, -1);
+       StrBufLowerCase(rssc->Key);
+       if (GetHash(StartHandlers, SKEY(rssc->Key), &pv))
+       {
+               rssc->Current = h = (rss_xml_handler*) pv;
 
-void rss_xml_start(void *data, const char *el, const char **attr) {
-       struct rss_item *ri = (struct rss_item *) data;
+               if (((h->Flags & RSS_UNSET) != 0) && 
+                   (Cfg->ItemType == RSS_UNSET))
+               {
+                       h->Handler(rssc->CData, ri, Cfg, attr);
+               }
+               else if (((h->Flags & RSS_RSS) != 0) &&
+                   (Cfg->ItemType == RSS_RSS))
+               {
+                       h->Handler(rssc->CData, ri, Cfg, attr);
+               }
+               else if (((h->Flags & RSS_ATOM) != 0) &&
+                        (Cfg->ItemType == RSS_ATOM))
+               {
+                       h->Handler(rssc->CData, ri, Cfg, attr);                 
+               }
+#ifdef DEBUG_RSS
+               else 
+                       CtdlLogPrintf(0, "RSS: START unhandled: [%s] [%s]...\n", pel, supplied_el);
+#endif
+       }
+#ifdef DEBUG_RSS
+       else 
+               CtdlLogPrintf(0, "RSS: START unhandled: [%s] [%s]...\n", pel,  supplied_el);
+#endif
+}
+
+void rss_xml_end(void *data, const char *supplied_el)
+{
+       rss_xml_handler *h;
+       rsscollection   *rssc = (rsscollection*) data;
+       rssnetcfg       *Cfg = rssc->Cfg;
+       rss_item        *ri = rssc->Item;
+       const char      *pel;
+       char            *sep = NULL;
+       void            *pv;
 
-       if (!strcasecmp(el, "item")) {
+       /* Axe the namespace, we don't care about it */
+       pel = supplied_el;
+       while (sep = strchr(pel, ':'), sep) {
+               pel = sep + 1;
+       }
+//     CtdlLogPrintf(0, "RSS: END %s...\n", el);
+       if (pel != supplied_el)
+       {
+               void *v;
+               
+               if (!GetHash(KnownNameSpaces, 
+                            supplied_el, 
+                            pel - supplied_el - 1,
+                            &v))
+               {
+#ifdef DEBUG_RSS
+                       CtdlLogPrintf(0, "RSS: END ignoring because of wrong namespace [%s] = [%s]\n", 
+                                     supplied_el, ChrPtr(rssc->CData));
+#endif
+                       FlushStrBuf(rssc->CData);
+                       return;
+               }
+       }
 
-               /* Initialize the feed item data structure */
-               if (ri->guid != NULL) free(ri->guid);
-               ri->guid = NULL;
-               if (ri->title != NULL) free(ri->title);
-               ri->title = NULL;
-               if (ri->link != NULL) free(ri->link);
-               ri->link = NULL;
-               if (ri->description != NULL) free(ri->description);
-               ri->description = NULL;
+       StrBufPlain(rssc->Key, pel, -1);
+       StrBufLowerCase(rssc->Key);
+       if (GetHash(EndHandlers, SKEY(rssc->Key), &pv))
+       {
+               h = (rss_xml_handler*) pv;
 
-               /* Throw away any existing character data */
-               if (ri->chardata_len > 0) {
-                       free(ri->chardata);
-                       ri->chardata = 0;
-                       ri->chardata_len = 0;
+               if (((h->Flags & RSS_UNSET) != 0) && 
+                   (Cfg->ItemType == RSS_UNSET))
+               {
+                       h->Handler(rssc->CData, ri, Cfg, NULL);
+               }
+               else if (((h->Flags & RSS_RSS) != 0) &&
+                   (Cfg->ItemType == RSS_RSS))
+               {
+                       h->Handler(rssc->CData, ri, Cfg, NULL);
                }
+               else if (((h->Flags & RSS_ATOM) != 0) &&
+                        (Cfg->ItemType == RSS_ATOM))
+               {
+                       h->Handler(rssc->CData, ri, Cfg, NULL);
+               }
+#ifdef DEBUG_RSS
+               else 
+                       CtdlLogPrintf(0, "RSS: END   unhandled: [%s]  [%s] = [%s]...\n", pel, supplied_el, ChrPtr(rssc->CData));
+#endif
        }
+#ifdef DEBUG_RSS
+       else 
+               CtdlLogPrintf(0, "RSS: END   unhandled: [%s]  [%s] = [%s]...\n", pel, supplied_el, ChrPtr(rssc->CData));
+#endif
+       FlushStrBuf(rssc->CData);
+       rssc->Current = NULL;
+}
+
+
 
 
 
+void RSS_item_rss_start (StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       CtdlLogPrintf(CTDL_DEBUG, "RSS: This is an RSS feed.\n");
+       Cfg->ItemType = RSS_RSS;
+}
+
+void RSS_item_rdf_start(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       CtdlLogPrintf(CTDL_DEBUG, "RSS: This is an RDF feed.\n");
+       Cfg->ItemType = RSS_RSS;
+}
+
+void ATOM_item_feed_start(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       CtdlLogPrintf(CTDL_DEBUG, "RSS: This is an ATOM feed.\n");
+       Cfg->ItemType = RSS_ATOM;
 }
 
-void rss_xml_end(void *data, const char *supplied_el) {
-       struct rss_item *ri = (struct rss_item *) data;
-       char el[256];
-       char *sep = NULL;
 
+void RSS_item_item_start(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       ri->item_tag_nesting ++;
+       flush_rss_item(ri);
+}
 
-       /* Axe the namespace, we don't care about it */
+void ATOM_item_entry_start(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+/* Atom feed... */
+       ri->item_tag_nesting ++;
+       flush_rss_item(ri);
+}
 
-       safestrncpy(el, supplied_el, sizeof el);
-       while (sep = strchr(el, ':'), sep) {
-               strcpy(el, ++sep);
+void ATOM_item_link_start (StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       int i;
+       const char *pHref = NULL;
+       const char *pType = NULL;
+       const char *pRel = NULL;
+       const char *pTitle = NULL;
+
+       for (i = 0; Attr[i] != NULL; i+=2)
+       {
+               if (!strcmp(Attr[i], "href"))
+               {
+                       pHref = Attr[i+1];
+               }
+               else if (!strcmp(Attr[i], "rel"))
+               {
+                       pRel = Attr[i+1];
+               }
+               else if (!strcmp(Attr[i], "type"))
+               {
+                       pType = Attr[i+1];
+               }
+               else if (!strcmp(Attr[i], "title"))
+               {
+                       pTitle = Attr[i+1];
+               }
        }
+       if (pHref == NULL)
+               return; /* WHUT? Pointing... where? */
+       if ((pType != NULL) && !strcasecmp(pType, "application/atom+xml"))
+               return; /* these just point to other rss resources, we're not interested in them. */
+       if (pRel != NULL)
+       {
+               if (!strcasecmp (pRel, "replies"))
+               {
+                       NewStrBufDupAppendFlush(&ri->reLink, NULL, pHref, -1);
+                       StrBufTrim(ri->link);
+                       NewStrBufDupAppendFlush(&ri->reLinkTitle, NULL, pTitle, -1);
+               }
+               else if (!strcasecmp(pRel, "alternate")) /* Alternative representation of this Item... */
+               {
+                       NewStrBufDupAppendFlush(&ri->link, NULL, pHref, -1);
+                       StrBufTrim(ri->link);
+                       NewStrBufDupAppendFlush(&ri->linkTitle, NULL, pTitle, -1);
 
-       if (!strcasecmp(el, "guid")) {
-               if (ri->guid != NULL) free(ri->guid);
-               striplt(ri->chardata);
-               ri->guid = strdup(ri->chardata);
+               }
+#if 0 /* these are also defined, but dunno what to do with them.. */
+               else if (!strcasecmp(pRel, "related"))
+               {
+               }
+               else if (!strcasecmp(pRel, "self"))
+               {
+               }
+               else if (!strcasecmp(pRel, "enclosure"))
+               {/* this reference can get big, and is probably the full article... */
+               }
+               else if (!strcasecmp(pRel, "via"))
+               {/* this article was provided via... */
+               }
+#endif
+       }
+       else if (StrLength(ri->link) == 0)
+       {
+               NewStrBufDupAppendFlush(&ri->link, NULL, pHref, -1);
+               StrBufTrim(ri->link);
+               NewStrBufDupAppendFlush(&ri->linkTitle, NULL, pTitle, -1);
        }
+}
+
+
+
 
-       if (!strcasecmp(el, "title")) {
-               if (ri->title != NULL) free(ri->title);
-               striplt(ri->chardata);
-               ri->title = strdup(ri->chardata);
+void ATOMRSS_item_title_end(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if ((ri->item_tag_nesting == 0) && (StrLength(CData) > 0)) {
+               NewStrBufDupAppendFlush(&ri->channel_title, CData, NULL, 0);
+               StrBufTrim(ri->channel_title);
        }
+}
 
-       if (!strcasecmp(el, "link")) {
-               if (ri->link != NULL) free(ri->link);
-               striplt(ri->chardata);
-               ri->link = strdup(ri->chardata);
+void RSS_item_guid_end(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if (StrLength(CData) > 0) {
+               NewStrBufDupAppendFlush(&ri->guid, CData, NULL, 0);
        }
+}
 
-       if (!strcasecmp(el, "description")) {
-               if (ri->description != NULL) free(ri->description);
-               ri->description = strdup(ri->chardata);
+void ATOM_item_id_end(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if (StrLength(CData) > 0) {
+               NewStrBufDupAppendFlush(&ri->guid, CData, NULL, 0);
        }
+}
+
 
-       if ( (!strcasecmp(el, "pubdate")) || (!strcasecmp(el, "date")) ) {
-               striplt(ri->chardata);
-               ri->pubdate = rdf_parsedate(ri->chardata);
+void RSS_item_link_end (StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if (StrLength(CData) > 0) {
+               NewStrBufDupAppendFlush(&ri->link, CData, NULL, 0);
+               StrBufTrim(ri->link);
        }
+}
 
-       if (!strcasecmp(el, "item")) {
-               rss_save_item(ri);
+void RSSATOM_item_title_end (StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if (StrLength(CData) > 0) {
+               NewStrBufDupAppendFlush(&ri->title, CData, NULL, 0);
+               StrBufTrim(ri->title);
        }
+}
+
+void ATOM_item_content_end (StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if (StrLength(CData) > 0) {
+               NewStrBufDupAppendFlush(&ri->description, CData, NULL, 0);
+               StrBufTrim(ri->description);
+       }
+}
+void ATOM_item_summary_end (StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       /* this can contain an abstract of the article. but we don't want to verwrite a full document if we already have it. */
+       if ((StrLength(CData) > 0) && (StrLength(ri->description) == 0))
+       {
+               NewStrBufDupAppendFlush(&ri->description, CData, NULL, 0);
+               StrBufTrim(ri->description);
+       }
+}
 
-       if ( (!strcasecmp(el, "rss")) || (!strcasecmp(el, "rdf")) ) {
-               lprintf(CTDL_DEBUG, "End of feed detected.  Closing parser.\n");
-               ri->done_parsing = 1;
+void RSS_item_description_end (StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if (StrLength(CData) > 0) {
+               NewStrBufDupAppendFlush(&ri->description, CData, NULL, 0);
        }
+}
 
-       if (ri->chardata_len > 0) {
-               free(ri->chardata);
-               ri->chardata = 0;
-               ri->chardata_len = 0;
+void ATOM_item_published_end (StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{                
+       if (StrLength(CData) > 0) {
+               StrBufTrim(CData);
+               ri->pubdate = rdf_parsedate(ChrPtr(CData));
        }
+}
 
+void ATOM_item_updated_end (StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if (StrLength(CData) > 0) {
+               StrBufTrim(CData);
+               ri->pubdate = rdf_parsedate(ChrPtr(CData));
+       }
 }
 
+void RSS_item_pubdate_end (StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if (StrLength(CData) > 0) {
+               StrBufTrim(CData);
+               ri->pubdate = rdf_parsedate(ChrPtr(CData));
+       }
+}
 
-/*
- * This callback stores up the data which appears in between tags.
- */
-void rss_xml_chardata(void *data, const XML_Char *s, int len) {
-       struct rss_item *ri = (struct rss_item *) data;
-       int old_len;
-       int new_len;
-       char *new_buffer;
 
-       old_len = ri->chardata_len;
-       new_len = old_len + len;
-       new_buffer = realloc(ri->chardata, new_len + 1);
-       if (new_buffer != NULL) {
-               memcpy(&new_buffer[old_len], s, len);
-               new_buffer[new_len] = 0;
-               ri->chardata = new_buffer;
-               ri->chardata_len = new_len;
+void RSS_item_date_end (StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if (StrLength(CData) > 0) {
+               StrBufTrim(CData);
+               ri->pubdate = rdf_parsedate(ChrPtr(CData));
        }
 }
 
 
 
-/* 
- * Parse a URL into host, port number, and resource identifier.
- */
-int parse_url(char *url, char *hostname, int *port, char *identifier)
+void RSS_item_author_end(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
 {
-       char protocol[1024];
-       char scratch[1024];
-       char *ptr = NULL;
-       char *nptr = NULL;
-       
-       strcpy(scratch, url);
-       ptr = (char *)strchr(scratch, ':');
-       if (!ptr) {
-               return(1);      /* no protocol specified */
+       if (StrLength(CData) > 0) {
+               NewStrBufDupAppendFlush(&ri->author_or_creator, CData, NULL, 0);
+               StrBufTrim(ri->author_or_creator);
        }
+}
 
-       strcpy(ptr, "");
-       strcpy(protocol, scratch);
-       if (strcmp(protocol, "http")) {
-               return(2);      /* not HTTP */
-       }
 
-       strcpy(scratch, url);
-       ptr = (char *) strstr(scratch, "//");
-       if (!ptr) {
-               return(3);      /* no server specified */
+void ATOM_item_name_end(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if (StrLength(CData) > 0) {
+               NewStrBufDupAppendFlush(&ri->author_or_creator, CData, NULL, 0);
+               StrBufTrim(ri->author_or_creator);
        }
-       ptr += 2;
+}
 
-       strcpy(hostname, ptr);
-       nptr = (char *)strchr(ptr, ':');
-       if (!nptr) {
-               *port = 80;     /* default */
-               nptr = (char *)strchr(hostname, '/');
-       }
-       else {
-               sscanf(nptr, ":%d", port);
-               nptr = (char *)strchr(hostname, ':');
+void RSS_item_creator_end(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if ((StrLength(CData) > 0) && 
+           (StrLength(ri->author_or_creator) == 0))
+       {
+               NewStrBufDupAppendFlush(&ri->author_or_creator, CData, NULL, 0);
+               StrBufTrim(ri->author_or_creator);
        }
+}
 
-       if (nptr) {
-               *nptr = '\0';
-       }
 
-       nptr = (char *)strchr(ptr, '/');
-       
-       if (!nptr) {
-               return(4);      /* no url specified */
+void ATOM_item_uri_end(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       if (StrLength(CData) > 0) {
+               NewStrBufDupAppendFlush(&ri->author_url, CData, NULL, 0);
+               StrBufTrim(ri->author_url);
        }
+}
+
+void RSS_item_item_end(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       --ri->item_tag_nesting;
+       rss_save_item(ri);
+}
+
+
+void ATOM_item_entry_end(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+       --ri->item_tag_nesting;
+       rss_save_item(ri);
+}
+
+void RSS_item_rss_end(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+//             CtdlLogPrintf(CTDL_DEBUG, "End of feed detected.  Closing parser.\n");
+       ri->done_parsing = 1;
        
-       strcpy(identifier, nptr);
-       return(0);
 }
+void RSS_item_rdf_end(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+//             CtdlLogPrintf(CTDL_DEBUG, "End of feed detected.  Closing parser.\n");
+       ri->done_parsing = 1;
+}
+
+
+void RSSATOM_item_ignore(StrBuf *CData, rss_item *ri, rssnetcfg *Cfg, const char** Attr)
+{
+}
+
+
+
+/*
+ * This callback stores up the data which appears in between tags.
+ */
+void rss_xml_cdata_start(void *data) 
+{
+       rsscollection *rssc = (rsscollection*) data;
+
+       FlushStrBuf(rssc->CData);
+}
+
+void rss_xml_cdata_end(void *data) 
+{
+}
+void rss_xml_chardata(void *data, const XML_Char *s, int len) 
+{
+       rsscollection *rssc = (rsscollection*) data;
+
+       StrBufAppendBufPlain (rssc->CData, s, len, 0);
+}
+
+/*
+ * Callback function for passing libcurl's output to expat for parsing
+ */
+size_t rss_libcurl_callback(void *ptr, size_t size, size_t nmemb, void *stream)
+{
+       XML_Parse((XML_Parser)stream, ptr, (size * nmemb), 0);
+       return (size*nmemb);
+}
+
 
 
 /*
  * Begin a feed parse
  */
-void rss_do_fetching(char *url, char *rooms) {
-       char buf[1024];
-       char rsshost[1024];
-       int rssport = 80;
-       char rssurl[1024];
-       struct rss_item ri;
+void rss_do_fetching(rssnetcfg *Cfg) {
+       rsscollection rssc;
+       rss_item ri;
        XML_Parser xp;
-       int sock = (-1);
-       int got_bytes = (-1);
-       int redirect_count = 0;
 
-       /* Parse the URL */
-       if (parse_url(url, rsshost, &rssport, rssurl) != 0) {
-               lprintf(CTDL_ALERT, "Invalid URL: %s\n", url);
+       CURL *curl;
+       CURLcode res;
+       char errmsg[1024] = "";
+
+       memset(&ri, 0, sizeof(rss_item));
+       rssc.Item = &ri;
+       rssc.Cfg = Cfg;
+
+       CtdlLogPrintf(CTDL_DEBUG, "Fetching RSS feed <%s>\n", Cfg->url);
+
+       curl = curl_easy_init();
+       if (!curl) {
+               CtdlLogPrintf(CTDL_ALERT, "Unable to initialize libcurl.\n");
+               return;
        }
 
        xp = XML_ParserCreateNS("UTF-8", ':');
        if (!xp) {
-               lprintf(CTDL_ALERT, "Cannot create XML parser!\n");
+               CtdlLogPrintf(CTDL_ALERT, "Cannot create XML parser!\n");
+               curl_easy_cleanup(curl);
                return;
        }
+       rssc.CData = NewStrBufPlain(NULL, SIZ);
+       rssc.Key = NewStrBuf();
+       curl_easy_setopt(curl, CURLOPT_URL, Cfg->url);
+       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
+       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
+       curl_easy_setopt(curl, CURLOPT_WRITEDATA, xp);
+       curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, rss_libcurl_callback);
+       curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg);
+       curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+#ifdef CURLOPT_HTTP_CONTENT_DECODING
+       curl_easy_setopt(curl, CURLOPT_HTTP_CONTENT_DECODING, 1);
+       curl_easy_setopt(curl, CURLOPT_ENCODING, "");
+#endif
+       curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
+       curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180);           /* die after 180 seconds */
+       if (
+               (!IsEmptyStr(config.c_ip_addr))
+               && (strcmp(config.c_ip_addr, "*"))
+               && (strcmp(config.c_ip_addr, "::"))
+               && (strcmp(config.c_ip_addr, "0.0.0.0"))
+       ) {
+               curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
+       }
 
-       memset(&ri, 0, sizeof(struct rss_item));
-       ri.roomlist = rooms;
+       memset(&ri, 0, sizeof(rss_item));
+       ri.roomlist = Cfg->rooms;
+#ifdef HAVE_ICONV
+#if 0
+       XML_SetUnknownEncodingHandler(xp,
+                                     handle_unknown_xml_encoding,
+                                     NULL);
+#endif
+#endif
        XML_SetElementHandler(xp, rss_xml_start, rss_xml_end);
        XML_SetCharacterDataHandler(xp, rss_xml_chardata);
-       XML_SetUserData(xp, &ri);
-
-retry: lprintf(CTDL_NOTICE, "Connecting to <%s>\n", rsshost);
-       sprintf(buf, "%d", rssport);
-       sock = sock_connect(rsshost, buf, "tcp");
-       if (sock >= 0) {
-               lprintf(CTDL_DEBUG, "Connected!\n");
-
-               snprintf(buf, sizeof buf, "GET %s HTTP/1.0", rssurl);
-               lprintf(CTDL_DEBUG, "<%s\n", buf);
-               sock_puts(sock, buf);
-
-               snprintf(buf, sizeof buf, "Host: %s", rsshost);
-               lprintf(CTDL_DEBUG, "<%s\n", buf);
-               sock_puts(sock, buf);
+       XML_SetUserData(xp, &rssc);
+       XML_SetCdataSectionHandler(xp,
+                                  rss_xml_cdata_start,
+                                  rss_xml_cdata_end);
+       if (CtdlThreadCheckStop())
+       {
+               XML_ParserFree(xp);
+               curl_easy_cleanup(curl);
+               return;
+       }
+       
+       if (CtdlThreadCheckStop())
+               goto shutdown ;
 
-               sock_puts(sock, "");
+       res = curl_easy_perform(curl);
+       if (res) {
+               CtdlLogPrintf(CTDL_ALERT, "libcurl error %d: %s\n", res, errmsg);
+       }
 
-               if (sock_getln(sock, buf, sizeof buf) >= 0) {
-               lprintf(CTDL_DEBUG, ">%s\n", buf);
-                       remove_token(buf, 0, ' ');
+       if (CtdlThreadCheckStop())
+               goto shutdown ;
 
-                       /* 200 OK */
-                       if (buf[0] == '2') {
+       if (ri.done_parsing == 0)
+               XML_Parse(xp, "", 0, 1);
 
-                               while (got_bytes = sock_getln(sock, buf, sizeof buf),
-                                     (got_bytes >= 0 && (strcmp(buf, "")) && (strcmp(buf, "\r"))) ) {
-                                       /* discard headers */
-                               }
 
-                               while (got_bytes = sock_read(sock, buf, sizeof buf, 0),
-                                     ((got_bytes>=0) && (ri.done_parsing == 0)) ) {
-                                       XML_Parse(xp, buf, got_bytes, 0);
-                               }
-                               if (ri.done_parsing == 0) XML_Parse(xp, "", 0, 1);
-                       }
-
-                       /* 30X redirect */
-                       else if ( (!strncmp(buf, "30", 2)) && (redirect_count < 16) ) {
-                               while (got_bytes = sock_getln(sock, buf, sizeof buf),
-                                     (got_bytes >= 0 && (strcmp(buf, "")) && (strcmp(buf, "\r"))) ) {
-                                       if (!strncasecmp(buf, "Location:", 9)) {
-                                               ++redirect_count;
-                                               strcpy(buf, &buf[9]);
-                                               striplt(buf);
-                                               if (parse_url(buf, rsshost, &rssport, rssurl) == 0) {
-                                                       goto retry;
-                                               }
-                                               else {
-                                                       lprintf(CTDL_ALERT, "Invalid URL: %s\n", buf);
-                                               }
-                                       }
-                               }
-                       }
-
-               }
-               sock_close(sock);
-       }
-       else {
-               lprintf(CTDL_ERR, "Could not connect: %s\n", strerror(errno));
-       }
+       CtdlLogPrintf(CTDL_ALERT, "RSS: XML Status [%s] \n", 
+                     XML_ErrorString(
+                             XML_GetErrorCode(xp)));
 
+shutdown:
+       curl_easy_cleanup(curl);
        XML_ParserFree(xp);
 
-       /* Free the feed item data structure */
-       if (ri.guid != NULL) free(ri.guid);
-       ri.guid = NULL;
-       if (ri.title != NULL) free(ri.title);
-       ri.title = NULL;
-       if (ri.link != NULL) free(ri.link);
-       ri.link = NULL;
-       if (ri.description != NULL) free(ri.description);
-       ri.description = NULL;
-       if (ri.chardata_len > 0) {
-               free(ri.chardata);
-               ri.chardata = 0;
-               ri.chardata_len = 0;
-       }
+       flush_rss_item(&ri);
+       FreeStrBuf(&rssc.CData);
+       FreeStrBuf(&rssc.Key);
 }
 
 
@@ -483,24 +1078,30 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
        char instr[32];
        FILE *fp;
        char feedurl[256];
-       struct rssnetcfg *rncptr = NULL;
-       struct rssnetcfg *use_this_rncptr = NULL;
+       rssnetcfg *rncptr = NULL;
+       rssnetcfg *use_this_rncptr = NULL;
        int len = 0;
        char *ptr = NULL;
 
        assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
 
+       if (CtdlThreadCheckStop())
+               return;
+               
        /* Only do net processing for rooms that have netconfigs */
        fp = fopen(filename, "r");
        if (fp == NULL) {
                return;
        }
 
-       while (fgets(buf, sizeof buf, fp) != NULL) {
+       while (fgets(buf, sizeof buf, fp) != NULL && !CtdlThreadCheckStop()) {
                buf[strlen(buf)-1] = 0;
 
                extract_token(instr, buf, 0, '|', sizeof instr);
                if (!strcasecmp(instr, "rssclient")) {
+
+                       use_this_rncptr = NULL;
+
                        extract_token(feedurl, buf, 1, '|', sizeof feedurl);
 
                        /* If any other rooms have requested the same feed, then we will just add this
@@ -514,7 +1115,8 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
 
                        /* Otherwise create a new client request */
                        if (use_this_rncptr == NULL) {
-                               rncptr = (struct rssnetcfg *) malloc(sizeof(struct rssnetcfg));
+                               rncptr = (rssnetcfg *) malloc(sizeof(rssnetcfg));
+                               rncptr->ItemType = RSS_UNSET;
                                if (rncptr != NULL) {
                                        rncptr->next = rnclist;
                                        safestrncpy(rncptr->url, feedurl, sizeof rncptr->url);
@@ -550,17 +1152,15 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
 /*
  * Scan for rooms that have RSS client requests configured
  */
-void rssclient_scan(void) {
+void *rssclient_scan(void *args) {
        static time_t last_run = 0L;
        static int doing_rssclient = 0;
-       struct rssnetcfg *rptr = NULL;
+       rssnetcfg *rptr = NULL;
+       CitContext rssclientCC;
 
-       /*
-        * Run RSS client no more frequently than once every n seconds
-        */
-       if ( (time(NULL) - last_run) < config.c_net_freq ) {
-               return;
-       }
+       /* Give this thread its own private CitContext */
+       CtdlFillSystemContext(&rssclientCC, "rssclient");
+       citthread_setspecific(MyConKey, (void *)&rssclientCC );
 
        /*
         * This is a simple concurrency check to make sure only one rssclient run
@@ -568,35 +1168,113 @@ void rssclient_scan(void) {
         * don't really require extremely fine granularity here, we'll do it
         * with a static variable instead.
         */
-       if (doing_rssclient) return;
+       if (doing_rssclient) return NULL;
        doing_rssclient = 1;
 
-       lprintf(CTDL_DEBUG, "rssclient started\n");
-       ForEachRoom(rssclient_scan_room, NULL);
+       CtdlLogPrintf(CTDL_DEBUG, "rssclient started\n");
+       CtdlForEachRoom(rssclient_scan_room, NULL);
 
-       while (rnclist != NULL) {
-               rss_do_fetching(rnclist->url, rnclist->rooms);
+       while (rnclist != NULL && !CtdlThreadCheckStop()) {
+               rss_do_fetching(rnclist);
                rptr = rnclist;
                rnclist = rnclist->next;
                if (rptr->rooms != NULL) free(rptr->rooms);
                free(rptr);
        }
 
-       lprintf(CTDL_DEBUG, "rssclient ended\n");
+       CtdlLogPrintf(CTDL_DEBUG, "rssclient ended\n");
        last_run = time(NULL);
        doing_rssclient = 0;
+       if (!CtdlThreadCheckStop())
+               CtdlThreadSchedule ("RSS Client", CTDLTHREAD_BIGSTACK, rssclient_scan, NULL, last_run + config.c_net_freq);
+       else
+               CtdlLogPrintf(CTDL_DEBUG, "rssclient: Task STOPPED.\n");
+       CtdlClearSystemContext();
+       return NULL;
 }
 
 
-#endif /* HAVE_EXPAT */
-
 CTDL_MODULE_INIT(rssclient)
 {
-#ifdef HAVE_EXPAT
-       CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER);
-#else
-        lprintf(CTDL_INFO, "This server is missing the Expat XML parser.  RSS client will be disabled.\n");
+       if (threading)
+       {
+               CtdlLogPrintf(CTDL_INFO, "%s\n", curl_version());
+               CtdlThreadSchedule ("RSS Client", CTDLTHREAD_BIGSTACK, rssclient_scan, NULL, 0);
+       }
+
+       StartHandlers = NewHash(1, NULL);
+       EndHandlers = NewHash(1, NULL);
+
+       AddRSSStartHandler(RSS_item_rss_start,     RSS_UNSET, HKEY("rss"));
+       AddRSSStartHandler(RSS_item_rdf_start,     RSS_UNSET, HKEY("rdf"));
+       AddRSSStartHandler(ATOM_item_feed_start,    RSS_UNSET, HKEY("feed"));
+       AddRSSStartHandler(RSS_item_item_start,    RSS_RSS, HKEY("item"));
+       AddRSSStartHandler(ATOM_item_entry_start,  RSS_ATOM, HKEY("entry"));
+       AddRSSStartHandler(ATOM_item_link_start,   RSS_ATOM, HKEY("link"));
+
+       AddRSSEndHandler(ATOMRSS_item_title_end,   RSS_ATOM|RSS_RSS|RSS_REQUIRE_BUF, HKEY("title"));
+       AddRSSEndHandler(RSS_item_guid_end,        RSS_RSS|RSS_REQUIRE_BUF, HKEY("guid"));
+       AddRSSEndHandler(ATOM_item_id_end,         RSS_ATOM|RSS_REQUIRE_BUF, HKEY("id"));
+       AddRSSEndHandler(RSS_item_link_end,        RSS_RSS|RSS_REQUIRE_BUF, HKEY("link"));
+       AddRSSEndHandler(RSSATOM_item_title_end,   RSS_ATOM|RSS_RSS|RSS_REQUIRE_BUF, HKEY("title"));
+       AddRSSEndHandler(ATOM_item_content_end,    RSS_ATOM|RSS_REQUIRE_BUF, HKEY("content"));
+       AddRSSEndHandler(RSS_item_description_end, RSS_RSS|RSS_REQUIRE_BUF, HKEY("encoded"));
+       AddRSSEndHandler(ATOM_item_summary_end,    RSS_ATOM|RSS_REQUIRE_BUF, HKEY("summary"));
+       AddRSSEndHandler(RSS_item_description_end, RSS_RSS|RSS_REQUIRE_BUF, HKEY("description"));
+       AddRSSEndHandler(ATOM_item_published_end,  RSS_ATOM|RSS_REQUIRE_BUF, HKEY("published"));
+       AddRSSEndHandler(ATOM_item_updated_end,    RSS_ATOM|RSS_REQUIRE_BUF, HKEY("updated"));
+       AddRSSEndHandler(RSS_item_pubdate_end,     RSS_RSS|RSS_REQUIRE_BUF, HKEY("pubdate"));
+       AddRSSEndHandler(RSS_item_date_end,        RSS_RSS|RSS_REQUIRE_BUF, HKEY("date"));
+       AddRSSEndHandler(RSS_item_author_end,      RSS_RSS|RSS_REQUIRE_BUF, HKEY("author"));
+       AddRSSEndHandler(RSS_item_creator_end,     RSS_RSS|RSS_REQUIRE_BUF, HKEY("creator"));
+       AddRSSEndHandler(ATOM_item_name_end,       RSS_ATOM|RSS_REQUIRE_BUF, HKEY("name"));
+       AddRSSEndHandler(ATOM_item_uri_end,        RSS_ATOM|RSS_REQUIRE_BUF, HKEY("uri"));
+
+       AddRSSEndHandler(RSS_item_item_end,        RSS_RSS, HKEY("item"));
+       AddRSSEndHandler(RSS_item_rss_end,         RSS_RSS, HKEY("rss"));
+       AddRSSEndHandler(RSS_item_rdf_end,         RSS_RSS, HKEY("rdf"));
+       AddRSSEndHandler(ATOM_item_entry_end,      RSS_ATOM, HKEY("entry"));
+
+
+/* at the start of atoms: <seq> <li>link to resource</li></seq> ignore them. */
+       AddRSSStartHandler(RSSATOM_item_ignore,      RSS_RSS|RSS_ATOM, HKEY("seq"));
+       AddRSSEndHandler  (RSSATOM_item_ignore,      RSS_RSS|RSS_ATOM, HKEY("seq"));
+       AddRSSStartHandler(RSSATOM_item_ignore,      RSS_RSS|RSS_ATOM, HKEY("li"));
+       AddRSSEndHandler  (RSSATOM_item_ignore,      RSS_RSS|RSS_ATOM, HKEY("li"));
+
+/* links to other feed generators... */
+       AddRSSStartHandler(RSSATOM_item_ignore,      RSS_RSS|RSS_ATOM, HKEY("feedflare"));
+       AddRSSEndHandler  (RSSATOM_item_ignore,      RSS_RSS|RSS_ATOM, HKEY("feedflare"));
+       AddRSSStartHandler(RSSATOM_item_ignore,      RSS_RSS|RSS_ATOM, HKEY("browserfriendly"));
+       AddRSSEndHandler  (RSSATOM_item_ignore,      RSS_RSS|RSS_ATOM, HKEY("browserfriendly"));
+
+       KnownNameSpaces = NewHash(1, NULL);
+       Put(KnownNameSpaces, HKEY("http://a9.com/-/spec/opensearch/1.1/"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://a9.com/-/spec/opensearchrss/1.0/"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://backend.userland.com/creativeCommonsRssModule"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://purl.org/atom/ns#"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://purl.org/dc/elements/1.1/"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://purl.org/rss/1.0/"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://purl.org/rss/1.0/modules/content/"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://purl.org/rss/1.0/modules/slash/"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://purl.org/rss/1.0/modules/syndication/"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://purl.org/rss/1.0/"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://purl.org/syndication/thread/1.0"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://rssnamespace.org/feedburner/ext/1.0"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://schemas.google.com/g/2005"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://webns.net/mvcb/"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://web.resource.org/cc/"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://wellformedweb.org/CommentAPI/"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://www.georss.org/georss"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://www.w3.org/1999/xhtml"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://www.w3.org/1999/02/22-rdf-syntax-ns#"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://www.w3.org/1999/02/22-rdf-syntax-ns#"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://www.w3.org/2003/01/geo/wgs84_pos#"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("http://www.w3.org/2005/Atom"), NULL, reference_free_handler);
+       Put(KnownNameSpaces, HKEY("urn:flickr:"), NULL, reference_free_handler);
+#if 0
+       /* we don't like these namespaces because of they shadow our usefull parameters. */
+       Put(KnownNameSpaces, HKEY("http://search.yahoo.com/mrss/"), NULL, reference_free_handler);
 #endif
-       /* return our Subversion id for the Log */
-        return "$Id: serv_rssclient.c 5652 2007-10-29 20:14:48Z ajc $";
+       return "rssclient";
 }