Networker: also register STOP hook, so if sessions are timed out or killed the NTT...

[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 ba87cca5e4ce42d43f563e7bed570154a704f741..2dc58dacf2e033a5081ca106badf9544c90ae5ce 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -2,7 +2,7 @@
  * This module handles shared rooms, inter-Citadel mail, and outbound
  * mailing list processing.
  *
- * Copyright (c) 2000-2011 by the citadel.org team
+ * Copyright (c) 2000-2012 by the citadel.org team
  *
  *  This program is open source software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -327,6 +327,8 @@ void network_queue_room(struct ctdlroom *qrbuf, void *data) {
        int i;
        struct RoomProcList *ptr;
 
+       if (qrbuf->QRdefaultview == VIEW_QUEUE)
+               return;
        ptr = (struct RoomProcList *) malloc(sizeof (struct RoomProcList));
        if (ptr == NULL) return;
 
@@ -493,8 +495,8 @@ void network_do_queue(void) {
        static int doing_queue = 0;
        static time_t last_run = 0L;
        int full_processing = 1;
-       char *working_ignetcfg;
-       NetMap *the_netmap = NULL;
+       HashList *working_ignetcfg;
+       HashList *the_netmap = NULL;
        int netmap_changed = 0;
        roomlists RL;
 
@@ -535,13 +537,15 @@ void network_do_queue(void) {
                        return;
        }
        /* Load the IGnet Configuration into memory */
-       working_ignetcfg = load_working_ignetcfg();
+       working_ignetcfg = load_ignetcfg();
 
        /*
         * Load the network map and filter list into memory.
         */
-       the_netmap = read_network_map();
-       load_network_filter_list();
+       if (!server_shutting_down)
+               the_netmap = read_network_map();
+       if (!server_shutting_down)
+               load_network_filter_list();
 
        /* 
         * Go ahead and run the queue
@@ -551,7 +555,7 @@ void network_do_queue(void) {
                CtdlForEachRoom(network_queue_interesting_rooms, &RL);
        }
 
-       if (RL.rplist != NULL) {
+       if ((RL.rplist != NULL) && (!server_shutting_down)) {
                RoomProcList *ptr, *cmp;
                ptr = RL.rplist;
                syslog(LOG_DEBUG, "network: running outbound queue\n");
@@ -582,18 +586,27 @@ void network_do_queue(void) {
        /* If there is anything in the inbound queue, process it */
        if (!server_shutting_down) {
                network_do_spoolin(working_ignetcfg, 
-                                  &the_netmap,
+                                  the_netmap,
                                   &netmap_changed);
        }
 
-       /* Save the network map back to disk */
-       write_network_map(the_netmap, netmap_changed);
-
        /* Free the filter list in memory */
        free_netfilter_list();
 
+       /* Save the network map back to disk */
+       if (netmap_changed) {
+               StrBuf *MapStr = SerializeNetworkMap(the_netmap);
+               CtdlPutSysConfig(IGNETMAP, SmashStrBuf(&MapStr));
+       }
+
+       /* combine singe message files into one spool entry per remote node. */
        network_consolidate_spoolout(working_ignetcfg, the_netmap);
-       free(working_ignetcfg);
+
+       /* shut down. */
+
+       DeleteHash(&the_netmap);
+
+       DeleteHash(&working_ignetcfg);
 
        syslog(LOG_DEBUG, "network: queue run completed\n");
 
@@ -614,14 +627,102 @@ int network_room_handler (struct ctdlroom *room)
        return 0;
 }
 
+int NTTDebugEnabled = 0;
+
+/*
+ * network_talking_to()  --  concurrency checker
+ */
+static HashList *nttlist = NULL;
+int network_talking_to(const char *nodename, long len, int operation) {
+
+       int retval = 0;
+       HashPos *Pos = NULL;
+       void *vdata;
+
+       begin_critical_section(S_NTTLIST);
+
+       switch(operation) {
+
+               case NTT_ADD:
+                       if (nttlist == NULL) 
+                               nttlist = NewHash(1, NULL);
+                       Put(nttlist, nodename, len, NewStrBufPlain(nodename, len), HFreeStrBuf);
+                       if (NTTDebugEnabled) syslog(LOG_DEBUG, "nttlist: added <%s>\n", nodename);
+                       break;
+               case NTT_REMOVE:
+                       if ((nttlist == NULL) ||
+                           (GetCount(nttlist) == 0))
+                               break;
+                       Pos = GetNewHashPos(nttlist, 1);
+                       if (GetHashPosFromKey (nttlist, nodename, len, Pos))
+                               DeleteEntryFromHash(nttlist, Pos);
+                       DeleteHashPos(&Pos);
+                       if (NTTDebugEnabled) syslog(LOG_DEBUG, "nttlist: removed <%s>\n", nodename);
+
+                       break;
+
+               case NTT_CHECK:
+                       if ((nttlist == NULL) ||
+                           (GetCount(nttlist) == 0))
+                               break;
+                       if (GetHash(nttlist, nodename, len, &vdata))
+                               retval ++;
+                       if (NTTDebugEnabled) syslog(LOG_DEBUG, "nttlist: have [%d] <%s>\n", retval, nodename);
+                       break;
+       }
+
+       end_critical_section(S_NTTLIST);
+       return(retval);
+}
+
+void cleanup_nttlist(void)
+{
+        begin_critical_section(S_NTTLIST);
+       DeleteHash(&nttlist);
+        end_critical_section(S_NTTLIST);
+}
+
+
+
+void network_logout_hook(void)
+{
+       CitContext *CCC = MyContext();
+
+       /*
+        * If we were talking to a network node, we're not anymore...
+        */
+       if (!IsEmptyStr(CCC->net_node)) {
+               network_talking_to(CCC->net_node, strlen(CCC->net_node), NTT_REMOVE);
+               CCC->net_node[0] = '\0';
+       }
+}
+void network_cleanup_function(void)
+{
+       struct CitContext *CCC = CC;
+
+       if (!IsEmptyStr(CCC->net_node)) {
+               network_talking_to(CCC->net_node, strlen(CCC->net_node), NTT_REMOVE);
+               CCC->net_node[0] = '\0';
+       }
+}
+
 
 /*
  * Module entry point
  */
+void SetNTTDebugEnabled(const int n)
+{
+       NTTDebugEnabled = n;
+}
+
 CTDL_MODULE_INIT(network)
 {
        if (!threading)
        {
+               CtdlRegisterDebugFlagHook(HKEY("networktalkingto"), SetNTTDebugEnabled, &NTTDebugEnabled);
+               CtdlRegisterCleanupHook(cleanup_nttlist);
+               CtdlRegisterSessionHook(network_cleanup_function, EVT_STOP);
+                CtdlRegisterSessionHook(network_logout_hook, EVT_LOGOUT);
                CtdlRegisterProtoHook(cmd_nsyn, "NSYN", "Synchronize room to node");
                CtdlRegisterRoomHook(network_room_handler);
                CtdlRegisterCleanupHook(destroy_network_queue_room_locked);