Netconfigs: start abstracting handling of network config files
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 27 Dec 2012 23:02:12 +0000 (00:02 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 27 Dec 2012 23:02:12 +0000 (00:02 +0100)
citadel/modules/network/netspool.h
citadel/modules/network/serv_netmail.c
citadel/modules/network/serv_netspool.c
citadel/modules/network/serv_network.c
citadel/modules/network/serv_network.h

index e52829bce1e3b4fd639f412c81585668b9e7a2ae..ae01838879d1fcf59f48f7ae05e0b64e56363384 100644 (file)
@@ -31,8 +31,8 @@ typedef struct maplist maplist;
 
 struct maplist {
        struct maplist *next;
-       char remote_nodename[SIZ];
-       char remote_roomname[SIZ];
+       StrBuf *remote_nodename;
+       StrBuf *remote_roomname;
 };
 
 
@@ -40,11 +40,10 @@ typedef struct SpoolControl SpoolControl;
 
 struct SpoolControl {
        long lastsent;
-       namelist *listrecps;
-       namelist *digestrecps;
-       namelist *participates;
-       maplist *ignet_push_shares;
-       char *misc;
+       StrBuf *Sender;
+       StrBuf *RoomInfo;
+       namelist *NetConfigs[maxRoomNetCfg];
+       StrBuf *misc;
        FILE *digestfp;
        int num_msgs_spooled;
 
index a793c5f600b0151984a576213cb944d43f39bfed..faf62a01cd4482e8cfac889900edf05683575b2d 100644 (file)
@@ -91,7 +91,8 @@ void network_deliver_digest(SpoolControl *sc) {
        int i;
        struct CtdlMessage *msg = NULL;
        long msglen;
-       char *recps = NULL;
+       StrBuf *recps = NULL;
+       char *precps;
        size_t recps_len = SIZ;
        struct recptypes *valid;
        namelist *nptr;
@@ -150,11 +151,11 @@ void network_deliver_digest(SpoolControl *sc) {
        /*
         * Figure out how big a buffer we need to allocate
         */
-       for (nptr = sc->digestrecps; nptr != NULL; nptr = nptr->next) {
-               recps_len = recps_len + strlen(nptr->name) + 2;
+       for (nptr = sc->NetConfigs[digestrecp]; nptr != NULL; nptr = nptr->next) {
+               recps_len = recps_len + StrLength(nptr->Value) + 2;
        }
 
-       recps = malloc(recps_len);
+       recps = NewStrBufPlain(NULL, recps_len);
 
        if (recps == NULL) {
                QN_syslog(LOG_EMERG,
@@ -163,14 +164,12 @@ void network_deliver_digest(SpoolControl *sc) {
                abort();
        }
 
-       strcpy(recps, "");
-
        /* Each recipient */
-       for (nptr = sc->digestrecps; nptr != NULL; nptr = nptr->next) {
-               if (nptr != sc->digestrecps) {
-                       strcat(recps, ",");
+       for (nptr = sc->NetConfigs[digestrecp]; nptr != NULL; nptr = nptr->next) {
+               if (nptr != sc->NetConfigs[digestrecp]) {
+                       StrBufAppendBufPlain(recps, HKEY(","), 0);
                }
-               strcat(recps, nptr->name);
+               StrBufAppendBuf(recps, nptr->Value, 0);
        }
 
        /* Where do we want bounces and other noise to be heard?
@@ -178,8 +177,9 @@ void network_deliver_digest(SpoolControl *sc) {
        snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
 
        /* Now submit the message */
-       valid = validate_recipients(recps, NULL, 0);
-       free(recps);
+       precps = SmashStrBuf(&recps);
+       valid = validate_recipients(precps, NULL, 0);
+       free(precps);
        if (valid != NULL) {
                valid->bounce_to = strdup(bounce_to);
                valid->envelope_from = strdup(bounce_to);
@@ -196,25 +196,26 @@ void network_deliver_digest(SpoolControl *sc) {
 void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char *RoomName)
 {
        struct CitContext *CCC = CC;
-       char *recps = NULL;
+       StrBuf *recps = NULL;
+       char *precps = NULL;
        size_t recps_len = SIZ;
        struct recptypes *valid;
        namelist *nptr;
        char bounce_to[256];
 
        /* Don't do this if there were no recipients! */
-       if (sc->listrecps == NULL) return;
+       if (sc->NetConfigs[listrecp] == NULL) return;
 
        /* Now generate the delivery instructions */
 
        /*
         * Figure out how big a buffer we need to allocate
         */
-       for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
-               recps_len = recps_len + strlen(nptr->name) + 2;
+       for (nptr = sc->NetConfigs[listrecp]; nptr != NULL; nptr = nptr->next) {
+               recps_len = recps_len + StrLength(nptr->Value) + 2;
        }
 
-       recps = malloc(recps_len);
+       recps = NewStrBufPlain(NULL, recps_len);
 
        if (recps == NULL) {
                QN_syslog(LOG_EMERG,
@@ -223,14 +224,12 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char
                abort();
        }
 
-       strcpy(recps, "");
-
        /* Each recipient */
-       for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
-               if (nptr != sc->listrecps) {
-                       strcat(recps, ",");
+       for (nptr = sc->NetConfigs[listrecp]; nptr != NULL; nptr = nptr->next) {
+               if (nptr != sc->NetConfigs[listrecp]) {
+                       StrBufAppendBufPlain(recps, HKEY(","), 0);
                }
-               strcat(recps, nptr->name);
+               StrBufAppendBuf(recps, nptr->Value, 0);
        }
 
        /* Where do we want bounces and other noise to be heard?
@@ -238,8 +237,9 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char
        snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
 
        /* Now submit the message */
-       valid = validate_recipients(recps, NULL, 0);
-       free(recps);
+       precps = SmashStrBuf(&recps);
+       valid = validate_recipients(precps, NULL, 0);
+       free(precps);
        if (valid != NULL) {
                valid->bounce_to = strdup(bounce_to);
                valid->envelope_from = strdup(bounce_to);
@@ -280,7 +280,7 @@ void network_spool_msg(long msgnum,
        /*
         * Process mailing list recipients
         */
-       if (sc->listrecps != NULL) {
+       if (sc->NetConfigs[listrecp] != NULL) {
                /* Fetch the message.  We're going to need to modify it
                 * in order to insert the [list name] in it, etc.
                 */
@@ -393,7 +393,7 @@ void network_spool_msg(long msgnum,
        /*
         * Process digest recipients
         */
-       if ((sc->digestrecps != NULL) && (sc->digestfp != NULL)) {
+       if ((sc->NetConfigs[digestrecp] != NULL) && (sc->digestfp != NULL)) {
                msg = CtdlFetchMessage(msgnum, 1);
                if (msg != NULL) {
                        fprintf(sc->digestfp,
@@ -449,7 +449,7 @@ void network_spool_msg(long msgnum,
        /*
         * Process client-side list participations for this room
         */
-       if (sc->participates != NULL) {
+       if (sc->NetConfigs[participate] != NULL) {
                msg = CtdlFetchMessage(msgnum, 1);
                if (msg != NULL) {
 
@@ -498,7 +498,7 @@ void network_spool_msg(long msgnum,
                                /*
                                 * Figure out how big a buffer we need to alloc
                                 */
-                               for (nptr = sc->participates;
+                               for (nptr = sc->NetConfigs[participate];
                                     nptr != NULL;
                                     nptr = nptr->next)
                                {
@@ -506,9 +506,9 @@ void network_spool_msg(long msgnum,
                                                free(msg->cm_fields['R']);
                                        }
                                        msg->cm_fields['R'] =
-                                               strdup(nptr->name);
+                                               strdup(ChrPtr(nptr->Value));
 
-                                       valid = validate_recipients(nptr->name,
+                                       valid = validate_recipients(msg->cm_fields['R'],
                                                                    NULL, 0);
 
                                        CtdlSubmitMsg(msg, valid, "", 0);
@@ -551,15 +551,13 @@ void network_spool_msg(long msgnum,
                }
 
                /* Now send it to every node */
-               if (sc->ignet_push_shares != NULL)
-                 for (mptr = sc->ignet_push_shares; mptr != NULL;
+               if (sc->NetConfigs[ignet_push_share] != NULL)
+               for (mptr = (maplist*)sc->NetConfigs[ignet_push_share]; mptr != NULL;
                    mptr = mptr->next) {
 
                        send = 1;
-                       if (Buf == NULL)
-                               Buf = NewStrBufPlain(mptr->remote_nodename, -1);
-                       else
-                               StrBufPlain(Buf, mptr->remote_nodename, -1);
+                       NewStrBufDupAppendFlush(&Buf, mptr->remote_nodename, NULL, 1);
+
                        /* Check for valid node name */
                        if (is_valid_node(NULL,
                                          NULL,
@@ -569,7 +567,7 @@ void network_spool_msg(long msgnum,
                        {
                                QN_syslog(LOG_ERR,
                                          "Invalid node <%s>\n",
-                                         mptr->remote_nodename);
+                                         ChrPtr(mptr->remote_nodename));
 
                                send = 0;
                        }
@@ -585,8 +583,8 @@ void network_spool_msg(long msgnum,
                                                      sizeof buf);
                                        
                                        QN_syslog(LOG_DEBUG, "Compare <%s> to <%s>\n",
-                                                 buf, mptr->remote_nodename) ;
-                                       if (!strcasecmp(buf, mptr->remote_nodename)) {
+                                                 buf, ChrPtr(mptr->remote_nodename)) ;
+                                       if (!strcasecmp(buf, ChrPtr(mptr->remote_nodename))) {
                                                send = 0;
                                                break;
                                        }
@@ -595,7 +593,7 @@ void network_spool_msg(long msgnum,
                                QN_syslog(LOG_INFO,
                                          "%sSending to %s\n",
                                          (send)?"":"Not ",
-                                         mptr->remote_nodename);
+                                         ChrPtr(mptr->remote_nodename));
                        }
 
                        /* Send the message */
@@ -609,9 +607,9 @@ void network_spool_msg(long msgnum,
                                if (msg->cm_fields['C'] != NULL) {
                                        free(msg->cm_fields['C']);
                                }
-                               if (!IsEmptyStr(mptr->remote_roomname)) {
+                               if (StrLength(mptr->remote_roomname) > 0) {
                                        msg->cm_fields['C'] =
-                                               strdup(mptr->remote_roomname);
+                                               strdup(ChrPtr(mptr->remote_roomname));
                                }
                                else {
                                        msg->cm_fields['C'] =
@@ -627,7 +625,7 @@ void network_spool_msg(long msgnum,
                                                 sizeof(filename),
                                                 "%s/%s@%lx%x",
                                                 ctdl_netout_dir,
-                                                mptr->remote_nodename,
+                                                ChrPtr(mptr->remote_nodename),
                                                 time(NULL),
                                                 rand()
                                        );
index f333e4bb180a1c5281a13ad8b39847c0f05abe03..185c739a441638b157bc62549d907dc44216ba72 100644 (file)
 #include "netmail.h"
 #include "ctdl_module.h"
 
+
+HashList *CfgTypeHash = NULL;
+typedef struct CfgLineType CfgLineType;
+typedef void (*CfgLineParser)(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, SpoolControl *sc);
+typedef void (*CfgLineSerializer)(const CfgLineType *ThisOne, StrBuf *OuptputBuffer, SpoolControl *sc, namelist *data);
+typedef void (*CfgLineDeAllocator)(const CfgLineType *ThisOne, namelist **data);
+struct CfgLineType {
+       RoomNetCfg C;
+       CfgLineParser Parser;
+       CfgLineSerializer Serializer;
+       CfgLineDeAllocator DeAllocator;
+       ConstStr Str;
+       int IsSingleLine;
+};
+#define REGISTERRoomCfgType(a, p, uniq, s, d) RegisterRoomCfgType(#a, sizeof(#a) - 1, a, p, uniq, s, d);
+
+void RegisterRoomCfgType(const char* Name, long len, RoomNetCfg eCfg, CfgLineParser p, int uniq, CfgLineSerializer s, CfgLineDeAllocator d)
+{
+       CfgLineType *pCfg;
+
+       pCfg = (CfgLineType*) malloc(sizeof(CfgLineType));
+       pCfg->Parser = p;
+       pCfg->Serializer = s;
+       pCfg->C = eCfg;
+       pCfg->Str.Key = Name;
+       pCfg->Str.len = len;
+       pCfg->IsSingleLine = uniq;
+
+       if (CfgTypeHash == NULL)
+               CfgTypeHash = NewHash(1, NULL);
+       Put(CfgTypeHash, Name, len, pCfg, NULL);
+}
+
+const CfgLineType *GetCfgTypeByStr(const char *Key, long len)
+{
+       void *pv;
+       
+       if (GetHash(CfgTypeHash, Key, len, &pv) && (pv != NULL))
+       {
+               return (const CfgLineType *) pv;
+       }
+       else
+       {
+               return NULL;
+       }
+}
+
+const CfgLineType *GetCfgTypeByEnum(RoomNetCfg eCfg, HashPos *It)
+{
+       const char *Key;
+       long len;
+       void *pv;
+       CfgLineType *pCfg;
+
+       RewindHashPos(CfgTypeHash, It, 1);
+       while (GetNextHashPos(CfgTypeHash, It, &len, &Key, &pv) && (pv != NULL))
+       {
+               pCfg = (CfgLineType*) pv;
+               if (pCfg->C == eCfg)
+                       return pCfg;
+       }
+       return NULL;
+}
+void ParseDefault(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, SpoolControl *sc)
+{
+       namelist *nptr;
+
+       nptr = (namelist *)
+               malloc(sizeof(namelist));
+       nptr->next = sc->NetConfigs[ThisOne->C];
+       nptr->Value = NewStrBufPlain(LinePos, StrLength(Line) - ( LinePos - ChrPtr(Line)) );
+       sc->NetConfigs[ThisOne->C] = nptr;
+}
+
+void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, SpoolControl *sc)
+{
+       sc->lastsent = extract_long(LinePos, 0);
+}
+void ParseIgnetPushShare(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, SpoolControl *sc)
+{
+/*
+       extract_token(nodename, LinePos, 0, '|', sizeof nodename);
+       extract_token(roomname, LinePos, 1, '|', sizeof roomname);
+       mptr = (maplist *) malloc(sizeof(maplist));
+       mptr->next = sc->ignet_push_shares;
+       strcpy(mptr->remote_nodename, nodename);
+       strcpy(mptr->remote_roomname, roomname);
+       sc->ignet_push_shares = mptr;
+*/
+}
+
+void ParseRoomAlias(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, SpoolControl *sc)
+{
+/*
+       if (sc->sender != NULL)
+               continue; / * just one alowed... * /
+       extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
+       sc->sender = nptr;
+*/
+}
+
+void ParseSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, SpoolControl *sc)
+{
+
+       if (time(NULL) - extract_long(LinePos, 3) > EXP) {
+               //      skipthisline = 1;
+       }
+       else
+       {
+       }
+
+}
+void ParseUnSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, SpoolControl *sc)
+{
+       ///int skipthisline = 0;
+       if (time(NULL) - extract_long(LinePos, 2) > EXP) {
+               //      skipthisline = 1;
+       }
+
+}
+
+void DeleteGenericCfgLine(const CfgLineType *ThisOne, namelist **data)
+{
+       FreeStrBuf(&(*data)->Value);
+       free(*data);
+       *data = NULL;
+}
 int read_spoolcontrol_file(SpoolControl **scc, char *filename)
 {
-       FILE *fp;
-       char instr[SIZ];
-       char buf[SIZ];
-       char nodename[256];
-       char roomname[ROOMNAMELEN];
-       size_t miscsize = 0;
-       size_t linesize = 0;
-       int skipthisline = 0;
-       namelist *nptr = NULL;
-       maplist *mptr = NULL;
+       int fd;
+       const char *ErrStr = NULL;
+       const char *Pos;
+       const CfgLineType *pCfg;
+       StrBuf *Line;
+       StrBuf *InStr;
        SpoolControl *sc;
 
-       fp = fopen(filename, "r");
-       if (fp == NULL) {
+       fd = open(filename, O_NONBLOCK|O_RDONLY);
+       if (fd == -1) {
+               *scc = NULL;
                return 0;
        }
        sc = malloc(sizeof(SpoolControl));
        memset(sc, 0, sizeof(SpoolControl));
        *scc = sc;
 
-       while (fgets(buf, sizeof buf, fp) != NULL) {
-               buf[strlen(buf)-1] = 0;
+       while (StrBufTCP_read_line(Line, &fd, 0, &ErrStr) >= 0) {
+               if (StrLength(Line) == 0)
+                       continue;
+               Pos = NULL;
+               InStr = NewStrBufPlain(NULL, StrLength(Line));
+               StrBufExtract_NextToken(InStr, Line, &Pos, '|');
 
-               extract_token(instr, buf, 0, '|', sizeof instr);
-               if (!strcasecmp(instr, strof(lastsent))) {
-                       sc->lastsent = extract_long(buf, 1);
-               }
-               else if (!strcasecmp(instr, strof(listrecp))) {
-                       nptr = (namelist *)
-                               malloc(sizeof(namelist));
-                       nptr->next = sc->listrecps;
-                       extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
-                       sc->listrecps = nptr;
-               }
-               else if (!strcasecmp(instr, strof(participate))) {
-                       nptr = (namelist *)
-                               malloc(sizeof(namelist));
-                       nptr->next = sc->participates;
-                       extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
-                       sc->participates = nptr;
+               pCfg = GetCfgTypeByStr(SKEY(InStr));
+               if (pCfg != NULL)
+               {
+                       pCfg->Parser(pCfg, Line, Pos, sc);
                }
-               else if (!strcasecmp(instr, strof(digestrecp))) {
-                       nptr = (namelist *)
-                               malloc(sizeof(namelist));
-                       nptr->next = sc->digestrecps;
-                       extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
-                       sc->digestrecps = nptr;
+               else
+               {
+                       if (sc->misc == NULL)
+                       {
+                               sc->misc = NewStrBufDup(Line);
+                       }
+                       else
+                       {
+                               if(StrLength(sc->misc) > 0)
+                                       StrBufAppendBufPlain(sc->misc, HKEY("\n"), 0);
+                               StrBufAppendBuf(sc->misc, Line, 0);
+                       }
                }
-               else if (!strcasecmp(instr, strof(ignet_push_share))) {
-                       extract_token(nodename, buf, 1, '|', sizeof nodename);
-                       extract_token(roomname, buf, 2, '|', sizeof roomname);
-                       mptr = (maplist *) malloc(sizeof(maplist));
-                       mptr->next = sc->ignet_push_shares;
-                       strcpy(mptr->remote_nodename, nodename);
-                       strcpy(mptr->remote_roomname, roomname);
+       }
+       if (fd > 0)
+               close(fd);
+       FreeStrBuf(&InStr);
+       FreeStrBuf(&Line);
+       return 1;
+}
+
+void SerializeLastSent(const CfgLineType *ThisOne, StrBuf *OutputBuffer, SpoolControl *sc, namelist *data)
+{
+       StrBufAppendBufPlain(OutputBuffer, CKEY(ThisOne->Str), 0);
+       StrBufAppendPrintf(OutputBuffer, "|%ld\n", sc->lastsent);
+}
+
+void SerializeGeneric(const CfgLineType *ThisOne, StrBuf *OutputBuffer, SpoolControl *sc, namelist *data)
+{
+       StrBufAppendBufPlain(OutputBuffer, CKEY(ThisOne->Str), 0);
+       StrBufAppendBuf(OutputBuffer, data->Value, 0);
+       StrBufAppendBufPlain(OutputBuffer, HKEY("\n"), 0);
+}
+void SerializeIgnetPushShare(const CfgLineType *ThisOne, StrBuf *OutputBuffer, SpoolControl *sc, namelist *data)
+{
+       StrBufAppendBufPlain(OutputBuffer, CKEY(ThisOne->Str), 0);
+/*
+                       StrBufAppendPrintf(Cfg, "ignet_push_share|%s", sc->ignet_push_shares->remote_nodename);
+                       if (!IsEmptyStr(sc->ignet_push_shares->remote_roomname)) {
+                               StrBufAppendPrintf(Cfg, "|%s", sc->ignet_push_shares->remote_roomname);
+                       }
+                       StrBufAppendPrintf(Cfg, "\n");
+                       mptr = sc->ignet_push_shares->next;
+                       free(sc->ignet_push_shares);
                        sc->ignet_push_shares = mptr;
-               }
-               else {
-                       /* Preserve 'other' lines ... *unless* they happen to
-                        * be subscribe/unsubscribe pendings with expired
-                        * timestamps.
-                        */
-                       skipthisline = 0;
-                       if (!strncasecmp(buf, strof(subpending)"|", 11)) {
-                               if (time(NULL) - extract_long(buf, 4) > EXP) {
-                                       skipthisline = 1;
-                               }
+*/
+       StrBufAppendBuf(OutputBuffer, data->Value, 0);
+       StrBufAppendBufPlain(OutputBuffer, HKEY("\n"), 0);
+}
+
+int save_spoolcontrol_file(SpoolControl *sc, char *filename)
+{
+       RoomNetCfg eCfg;
+       StrBuf *Cfg;
+       char tempfilename[PATH_MAX];
+       int TmpFD;
+       long len;
+       time_t unixtime;
+       struct timeval tv;
+       long reltid; /* if we don't have SYS_gettid, use "random" value */
+       StrBuf *OutBuffer;
+       int rc;
+       HashPos *CfgIt;
+
+       len = strlen(filename);
+       memcpy(tempfilename, filename, len + 1);
+
+
+#if defined(HAVE_SYSCALL_H) && defined (SYS_gettid)
+       reltid = syscall(SYS_gettid);
+#endif
+       gettimeofday(&tv, NULL);
+       /* Promote to time_t; types differ on some OSes (like darwin) */
+       unixtime = tv.tv_sec;
+
+       sprintf(tempfilename + len, ".%ld-%ld", reltid, unixtime);
+       errno = 0;
+       TmpFD = open(tempfilename, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR);
+       Cfg = NewStrBuf();
+       if ((TmpFD < 0) || (errno != 0)) {
+               syslog(LOG_CRIT, "ERROR: cannot open %s: %s\n",
+                       filename, strerror(errno));
+               unlink(tempfilename);
+               return 0;
+       }
+       else {
+               CfgIt = GetNewHashPos(CfgTypeHash, 1);
+               fchown(TmpFD, config.c_ctdluid, 0);
+               for (eCfg = subpending; eCfg < maxRoomNetCfg; eCfg ++)
+               {
+                       const CfgLineType *pCfg;
+                       pCfg = GetCfgTypeByEnum(eCfg, CfgIt);
+                       if (pCfg->IsSingleLine)
+                       {
+                               pCfg->Serializer(pCfg, OutBuffer, sc, NULL);
                        }
-                       if (!strncasecmp(buf, strof(unsubpending)"|", 13)) {
-                               if (time(NULL) - extract_long(buf, 3) > EXP) {
-                                       skipthisline = 1;
+                       else
+                       {
+                               namelist *pName = sc->NetConfigs[pCfg->C];
+                               while (pName != NULL)
+                               {
+                                       pCfg->Serializer(pCfg, OutBuffer, sc, pName);
+                                       pName = pName->next;
                                }
+                               
+                               
                        }
 
-                       if (skipthisline == 0) {
-                               linesize = strlen(buf);
-                               sc->misc = realloc(sc->misc,
-                                       (miscsize + linesize + 2) );
-                               sprintf(&sc->misc[miscsize], "%s\n", buf);
-                               miscsize = miscsize + linesize + 1;
-                       }
                }
+               DeleteHashPos(&CfgIt);
+
 
+               if (sc->misc != NULL) {
+                       StrBufAppendBuf(OutBuffer, sc->misc, 0);
+               }
 
+               rc = write(TmpFD, ChrPtr(OutBuffer), StrLength(OutBuffer));
+               if ((rc >=0 ) && (rc == StrLength(Cfg))) 
+               {
+                       close(TmpFD);
+                       rename(tempfilename, filename);
+                       rc = 1;
+               }
+               else {
+                       syslog(LOG_EMERG, 
+                                     "unable to write %s; [%s]; not enough space on the disk?\n", 
+                                     tempfilename, 
+                                     strerror(errno));
+                       close(TmpFD);
+                       unlink(tempfilename);
+                       rc = 0;
+               }
+               FreeStrBuf(&OutBuffer);
+               
        }
-       fclose(fp);
-       return 1;
+       return rc;
 }
 
+
+
 void free_spoolcontrol_struct(SpoolControl **scc)
 {
+       RoomNetCfg eCfg;
+       HashPos *CfgIt;
        SpoolControl *sc;
-       namelist *nptr = NULL;
-       maplist *mptr = NULL;
 
        sc = *scc;
-       while (sc->listrecps != NULL) {
-               nptr = sc->listrecps->next;
-               free(sc->listrecps);
-               sc->listrecps = nptr;
-       }
-       /* Do the same for digestrecps */
-       while (sc->digestrecps != NULL) {
-               nptr = sc->digestrecps->next;
-               free(sc->digestrecps);
-               sc->digestrecps = nptr;
-       }
-       /* Do the same for participates */
-       while (sc->participates != NULL) {
-               nptr = sc->participates->next;
-               free(sc->participates);
-               sc->participates = nptr;
-       }
-       while (sc->ignet_push_shares != NULL) {
-               mptr = sc->ignet_push_shares->next;
-               free(sc->ignet_push_shares);
-               sc->ignet_push_shares = mptr;
-       }
-       free(sc->misc);
+       CfgIt = GetNewHashPos(CfgTypeHash, 1);
+       for (eCfg = subpending; eCfg < maxRoomNetCfg; eCfg ++)
+       {
+               const CfgLineType *pCfg;
+               namelist *pNext, *pName;
+               
+               pCfg = GetCfgTypeByEnum(eCfg, CfgIt);
+               pName= sc->NetConfigs[pCfg->C];
+               while (pName != NULL)
+               {
+                       pNext = pName->next;
+                       pCfg->DeAllocator(pCfg, &pName);
+                       pName = pNext;
+               }
+       }
+       DeleteHashPos(&CfgIt);
+
+       FreeStrBuf(&sc->Sender);
+       FreeStrBuf(&sc->RoomInfo);
+       FreeStrBuf(&sc->misc);
        free(sc);
        *scc=NULL;
 }
 
+#if 0
 int writenfree_spoolcontrol_file(SpoolControl **scc, char *filename)
 {
        char tempfilename[PATH_MAX];
@@ -304,31 +509,34 @@ int writenfree_spoolcontrol_file(SpoolControl **scc, char *filename)
        }
        return 1;
 }
+#endif
 int is_recipient(SpoolControl *sc, const char *Name)
 {
+       const RoomNetCfg RecipientCfgs[] = {
+               listrecp,
+               digestrecp,
+               participate,
+               maxRoomNetCfg
+       };
+       int i;
        namelist *nptr;
        size_t len;
-
+       
        len = strlen(Name);
-       nptr = sc->listrecps;
-       while (nptr != NULL) {
-               if (strncmp(Name, nptr->name, len)==0)
-                       return 1;
-               nptr = nptr->next;
-       }
-       /* Do the same for digestrecps */
-       nptr = sc->digestrecps;
-       while (nptr != NULL) {
-               if (strncmp(Name, nptr->name, len)==0)
-                       return 1;
-               nptr = nptr->next;
-       }
-       /* Do the same for participates */
-       nptr = sc->participates;
-       while (nptr != NULL) {
-               if (strncmp(Name, nptr->name, len)==0)
-                       return 1;
-               nptr = nptr->next;
+       i = 0;
+       while (RecipientCfgs[i] != maxRoomNetCfg)
+       {
+               nptr = sc->NetConfigs[RecipientCfgs[i]];
+               
+               while (nptr != NULL)
+               {
+                       if ((StrLength(nptr->Value) == len) && 
+                           (!strcmp(Name, ChrPtr(nptr->Value))))
+                       {
+                               return 1;
+                       }
+                       nptr = nptr->next;
+               }
        }
        return 0;
 }
@@ -371,7 +579,7 @@ void network_spoolout_room(RoomProcList *room_to_spool,
        sc->the_netmap = the_netmap;
 
        /* If there are digest recipients, we have to build a digest */
-       if (sc->digestrecps != NULL) {
+       if (sc->NetConfigs[digestrecp] != NULL) {
                sc->digestfp = tmpfile();
                fprintf(sc->digestfp, "Content-type: text/plain\n\n");
        }
@@ -400,7 +608,7 @@ void network_spoolout_room(RoomProcList *room_to_spool,
        }
 
        /* Now rewrite the config file */
-       writenfree_spoolcontrol_file(&sc, filename);
+       //// todo writenfree_spoolcontrol_file(&sc, filename);
        end_critical_section(S_NETCONFIGS);
 }
 
@@ -1006,6 +1214,17 @@ CTDL_MODULE_INIT(network_spool)
 {
        if (!threading)
        {
+//             REGISTERRoomCfgType(subpending, ParseSubPendingLine, 0, SerializeSubPendingLine, DeleteSubPendingLine); /// todo: move this to mailinglist manager
+//             REGISTERRoomCfgType(unsubpending, ParseUnSubPendingLine0, SerializeUnSubPendingLine, DeleteUnSubPendingLine); /// todo: move this to mailinglist manager
+//             REGISTERRoomCfgType(lastsent, ParseLastSent, 1, SerializeLastSent, DeleteLastSent);
+///            REGISTERRoomCfgType(ignet_push_share, ParseIgnetPushShare, 0, SerializeIgnetPushShare, DeleteIgnetPushShare); // todo: move this to the ignet client
+               REGISTERRoomCfgType(listrecp, ParseDefault, 0, SerializeGeneric, DeleteGenericCfgLine);
+               REGISTERRoomCfgType(digestrecp, ParseDefault, 0, SerializeGeneric, DeleteGenericCfgLine);
+               REGISTERRoomCfgType(pop3client, ParseDefault, 0, SerializeGeneric, DeleteGenericCfgLine);/// todo: implement pop3 specific parser
+               REGISTERRoomCfgType(rssclient, ParseDefault, 0, SerializeGeneric, DeleteGenericCfgLine); /// todo: implement rss specific parser
+               REGISTERRoomCfgType(participate, ParseDefault, 0, SerializeGeneric, DeleteGenericCfgLine);
+               REGISTERRoomCfgType(roommailalias, ParseRoomAlias, 0, SerializeGeneric, DeleteGenericCfgLine);
+
                create_spool_dirs();
 //////todo             CtdlRegisterCleanupHook(destroy_network_queue_room);
        }
index 578a8e17e4e90fa35e843820d761ed152e1a56a3..f43a49965728d3fab85c4035703160148852403a 100644 (file)
@@ -189,7 +189,7 @@ int network_usetable(struct CtdlMessage *msg)
 
 
 
-
+#if 0
 
 
 /*
@@ -271,6 +271,8 @@ int network_sync_to(char *target_node, long len)
        return(num_spooled);
 }
 
+#endif
+
 
 /*
  * Implements the NSYN command
@@ -283,7 +285,7 @@ void cmd_nsyn(char *argbuf) {
        if (CtdlAccessCheck(ac_aide)) return;
 
        len = extract_token(target_node, argbuf, 0, '|', sizeof target_node);
-       num_spooled = network_sync_to(target_node, len);
+       ///// TODO num_spooled = network_sync_to(target_node, len);
        if (num_spooled >= 0) {
                cprintf("%d Spooled %d messages.\n", CIT_OK, num_spooled);
        }
index c11a7f891ff02374e85b428453b5bd9401ef94ad..486c2d9ab52785f5830e9cedfb6be3e609c9ec5a 100644 (file)
@@ -34,7 +34,7 @@ typedef struct namelist namelist;
 
 struct namelist {
        namelist *next;
-       char name[SIZ];
+       StrBuf *Value;
 };