NSYN: fix the NSYN command

[citadel.git] / citadel / modules / network / serv_netspool.c

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index 1b06b63a75f538320f6d64730094c5cc25afd8ab..ca0d6181e3309362dd4c436cb16a1ec6664f8fb3 100644 (file)
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -106,12 +106,11 @@ void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos
 
 void ParseRoomAlias(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg)
 {
-/*
-       if (rncfg->RNCfg->sender != NULL)
-               continue; / * just one alowed... * /
-       extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
-       rncfg->RNCfg->sender = nptr;
-*/
+       if (rncfg->Sender != NULL)
+               return;
+
+       ParseGeneric(ThisOne, Line, LinePos, rncfg);
+       rncfg->Sender = NewStrBufDup(rncfg->NetConfigs[roommailalias]->Value[0]);
 }
 
 void ParseSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
@@ -223,6 +222,94 @@ void InspectQueuedRoom(SpoolControl **pSC,
 
 }
 
+void CalcListID(SpoolControl *sc)
+{
+       const char *err;
+       int fd;
+       struct CitContext *CCC = CC;
+       char filename[PATH_MAX];
+#define MAX_LISTIDLENGTH 150
+
+       assoc_file_name(filename, sizeof filename, &sc->room, ctdl_info_dir);
+       fd = open(filename, 0);
+
+       if (fd != 0) {
+               struct stat stbuf;
+
+               if ((fstat(fd, &stbuf) == 0) &&
+                   (stbuf.st_size > 0))
+               {
+                       sc->RoomInfo = NewStrBufPlain(NULL, stbuf.st_size + 1);
+                       StrBufReadBLOB(sc->RoomInfo, &fd, 0, stbuf.st_size, &err);
+               }
+               close(fd);
+       }
+
+       sc->ListID = NewStrBufPlain(NULL, 1024);
+       if (StrLength(sc->RoomInfo) > 0)
+       {
+               const char *Pos = NULL;
+               StrBufSipLine(sc->ListID, sc->RoomInfo, &Pos);
+
+               if (StrLength(sc->ListID) > MAX_LISTIDLENGTH)
+               {
+                       StrBufCutAt(sc->ListID, MAX_LISTIDLENGTH, NULL);
+                       StrBufAppendBufPlain(sc->ListID, HKEY("..."), 0);
+               }
+               StrBufAsciify(sc->ListID, ' ');
+       }
+       else
+       {
+               StrBufAppendBufPlain(sc->ListID, CCC->room.QRname, -1, 0);
+       }
+
+       StrBufAppendBufPlain(sc->ListID, HKEY("<"), 0);
+
+       if (StrLength(sc->Users[roommailalias]) > 0)
+       {
+               long Pos;
+               const char *AtPos;
+
+               Pos = StrLength(sc->ListID);
+               StrBufAppendBuf(sc->ListID, sc->Users[roommailalias], 0);
+               AtPos = strchr(ChrPtr(sc->ListID) + Pos, '@');
+
+               if (AtPos != NULL)
+               {
+                       StrBufPeek(sc->ListID, AtPos, 0, '.');
+               }
+       }
+       else
+       {
+               StrBufAppendBufPlain(sc->ListID, HKEY("room_"), 0);
+               StrBufAppendBufPlain(sc->ListID, sc->room.QRname, -1, 0);
+               StrBufAppendBufPlain(sc->ListID, HKEY("."), 0);
+               StrBufAppendBufPlain(sc->ListID, config.c_fqdn, -1, 0);
+               /*
+                * this used to be:
+                * roomname <Room-Number.list-id.fqdn>
+                * according to rfc2919.txt it only has to be a uniq identifier
+                * under the domain of the system; 
+                * in general MUAs use it to calculate the reply address nowadays.
+                */
+       }
+       StrBufAppendBufPlain(sc->ListID, HKEY(">"), 0);
+
+       if (StrLength(sc->Users[roommailalias]) == 0)
+       {
+               sc->Users[roommailalias] = NewStrBuf();
+               
+               StrBufPrintf(sc->Users[roommailalias],
+                            "room_%s@%s",
+                            CCC->room.QRname,
+                            config.c_fqdn);
+
+               StrBufAsciify(sc->Users[roommailalias], '_');
+               StrBufLowerCase(sc->Users[roommailalias]);
+       }
+
+}
+
 
 /*
  * Batch up and send all outbound traffic from the current room
@@ -249,6 +336,8 @@ void network_spoolout_room(SpoolControl *sc)
                fprintf(sc->digestfp, "Content-type: text/plain\n\n");
        }
 
+       CalcListID(sc);
+
        /* remember where we started... */
        lastsent = sc->lastsent;
 
@@ -834,6 +923,11 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
                        do {} while ((FileMoveChunked(&FDIO, &err) > 0) && (err == NULL));
                        if (err == NULL) {
                                unlink(filename);
+                               QN_syslog(LOG_DEBUG,
+                                         "Spoolfile %s now %ld k\n",
+                                         spooloutfilename,
+                                         (dsize + fsize)/1024
+                                       );                              
                        }
                        else {
                                nFailed++;
@@ -927,6 +1021,21 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
        closedir(dp);
 }
 
+void free_spoolcontrol_struct(SpoolControl **sc)
+{
+       free_spoolcontrol_struct_members(*sc);
+       free(*sc);
+       *sc = NULL;
+}
+
+void free_spoolcontrol_struct_members(SpoolControl *sc)
+{
+       int i;
+       FreeStrBuf(&sc->RoomInfo);
+       FreeStrBuf(&sc->ListID);
+       for (i = 0; i < maxRoomNetCfg; i++)
+               FreeStrBuf(&sc->Users[i]);
+}