no, CalcListID is needed in both places :(

[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..5ba84707b7b0914cea2323ad06bee3c3d288381e 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -194,6 +194,8 @@ 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 +256,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 +269,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 +296,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 +441,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 +469,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 +532,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,