NETWORKER: add from addresses and new way of setting list headers.

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

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index ebc00e04c1dc6aab4d4f05ba5e7eeeb2474ff0ee..00719bfea96eddb6d0ee94cd96ee78578efc96a3 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -149,6 +149,93 @@ int network_usetable(struct CtdlMessage *msg)
 }
 
 
+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;
+
+               fstat(fd, &stbuf);
+               if (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]);
+       }
+
+}
 
 /*
  * Send the *entire* contents of the current room to one specific network node,
@@ -194,6 +281,7 @@ int network_sync_to(char *target_node, long len)
        sc.working_ignetcfg = CtdlLoadIgNetCfg();
        sc.the_netmap = CtdlReadNetworkMap();
 
+       CalcListID(&sc);
        /* Send ALL messages */
        num_spooled = CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL,
                network_spool_msg, &sc);
@@ -254,6 +342,7 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *One
 
        ptr->lcname[ptr->namelen] = '\0';
        ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345);
+       ptr->lastsent = OneRNCFG->lastsent;
        ptr->OneRNCfg = OneRNCFG;
        return ptr;
 }
@@ -266,10 +355,16 @@ void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, OneRoom
        struct RoomProcList *ptr;
        roomlists *RP = (roomlists*) data;
 
+       if (!HaveSpoolConfig(OneRNCfg))
+               return;
+
        ptr = CreateRoomProcListEntry(qrbuf, OneRNCfg);
 
-       ptr->next = RP->rplist;
-       RP->rplist = ptr;
+       if (ptr != NULL)
+       {
+               ptr->next = RP->rplist;
+               RP->rplist = ptr;
+       }
 }
 
 /*
@@ -287,10 +382,14 @@ int network_room_handler (struct ctdlroom *qrbuf)
        if (RNCfg == NULL)
                return 1;
 
+       if (!HaveSpoolConfig(RNCfg))
+               return 1;
+
        ptr = CreateRoomProcListEntry(qrbuf, RNCfg);
        if (ptr == NULL)
                return 1;
 
+       ptr->OneRNCfg = NULL;
        begin_critical_section(S_RPLIST);
        ptr->next = rplist;
        rplist = ptr;
@@ -428,7 +527,16 @@ void network_bounce(struct CtdlMessage *msg, char *reason)
 }
 
 
-
+void free_network_spoolout_room(SpoolControl *sc)
+{
+       if (sc != NULL)
+       {
+               int i;
+               for (i = subpending; i < maxRoomNetCfg; i++)
+                       FreeStrBuf(&sc->Users[i]);
+               free(sc);
+       }
+}
 
 
 
@@ -447,6 +555,8 @@ void network_do_queue(void)
        HashList *the_netmap = NULL;
        int netmap_changed = 0;
        roomlists RL;
+       SpoolControl *sc = NULL;
+       SpoolControl *pSC;
 
        /*
         * Run the full set of processing tasks no more frequently
@@ -508,14 +618,30 @@ void network_do_queue(void)
                        }
 
                        if (ptr->namelen > 0) {
-                               network_spoolout_room(ptr, 
-                                                     working_ignetcfg,
-                                                     the_netmap);
+                               InspectQueuedRoom(&sc,
+                                                 ptr, 
+                                                 working_ignetcfg,
+                                                 the_netmap);
                        }
                        ptr = ptr->next;
                }
        }
 
+
+       pSC = sc;
+       while (pSC != NULL)
+       {
+               network_spoolout_room(pSC);
+               pSC = pSC->next;
+       }
+
+       pSC = sc;
+       while (pSC != NULL)
+       {
+               sc = pSC->next;
+               free_network_spoolout_room(pSC);
+               pSC = sc;
+       }
        /* If there is anything in the inbound queue, process it */
        if (!server_shutting_down) {
                network_do_spoolin(working_ignetcfg,