destroy_network_queue_room() is now called via the cleanup hook mechanism.

Added a comment about how to proceed with modules stuff.

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 46f3834f026aeab172d34bea83930b13de0da542..87f4f6f827d4c65be909a214d6e092a56f77152d 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -57,7 +57,7 @@
 #include "control.h"
 #include "tools.h"
 #include "euidindex.h"
-#include "serv_network.h"      /* Needed for destroy_network_queue_room called from master_cleanup */
+/*#include "serv_network.h"*/  /* Needed for destroy_network_queue_room called from master_cleanup */
 
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
@@ -176,7 +176,7 @@ void master_cleanup(int exitcode) {
        close_databases();
 
        /* flush the networker stuff */
-       destroy_network_queue_room();
+/*     destroy_network_queue_room();*/
 
        /* Do system-dependent stuff */
        sysdep_master_cleanup();

diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index d6f2c9b6fed859ef36ec370e342baa183ca99088..ee41a5f84f4546a19745ff799875732024db988d 100644 (file)
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -622,6 +622,11 @@ int PurgeUseTable(void) {
        cdb_rewind(CDB_USETABLE);
        while(cdbut = cdb_next_item(CDB_USETABLE), cdbut != NULL) {
 
+       /*
+        * TODODRW: change this to create a new function time_t cdb_get_timestamp( struct cdbdata *)
+        * this will release this file from the serv_network.h
+        * Maybe it could be a macro that extracts and casts the reult
+        */
                 memcpy(&ut, cdbut->ptr,
                        ((cdbut->len > sizeof(struct UseTable)) ?
                         sizeof(struct UseTable) : cdbut->len));

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index d2ffaed84436582ffd5d9afecfaecfae086ab855..8ceba0d11bc93ff412056cf93f4b896624d9b604 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -2077,6 +2077,8 @@ CTDL_MODULE_INIT(network)
        CtdlRegisterProtoHook(cmd_nsyn, "NSYN", "Synchronize room to node");
        CtdlRegisterSessionHook(network_do_queue, EVT_TIMER);
         CtdlRegisterRoomHook(network_room_handler);
+       CtdlRegisterCleanupHook(destroy_network_queue_room);
+       
 
        /* return our Subversion id for the Log */
        return "$Id$";