began removing IGnet from the server

[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 c81f016ab7a66eeb827016668cf1c4f4dc56bdf7..41b299a296401a37aeece24dc96073c53dfb063b 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-2016 by the citadel.org team
+ * Copyright (c) 2000-2017 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, version 3.
@@ -78,7 +78,6 @@
 #include "netspool.h"
 #include "netmail.h"
 
-int NetQDebugEnabled = 0;
 struct CitContext networker_spool_CC;
 
 /* comes from lookup3.c from libcitadel... */
@@ -163,7 +162,7 @@ int network_sync_to(char *target_node, long len)
        DeleteHash(&sc.the_netmap);
        free_spoolcontrol_struct_members(&sc);
 
-       QN_syslog(LOG_NOTICE, "Synchronized %d messages to <%s>", num_spooled, target_node);
+       syslog(LOG_NOTICE, "network: synchronized %d messages to <%s>", num_spooled, target_node);
        return(num_spooled);
 }
 
@@ -214,8 +213,6 @@ 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;
 }
 
@@ -268,7 +265,6 @@ int network_room_handler(struct ctdlroom *qrbuf)
                return 1;
        }
 
-       ptr->OneRNCfg = NULL;
        begin_critical_section(S_RPLIST);
        ptr->next = rplist;
        rplist = ptr;
@@ -305,7 +301,6 @@ void destroy_network_queue_room_locked (void)
  */
 void network_do_queue(void)
 {
-       struct CitContext *CCC = CC;
        static time_t last_run = 0L;
        int full_processing = 1;
        HashList *working_ignetcfg;
@@ -322,9 +317,7 @@ void network_do_queue(void)
        if ( (time(NULL) - last_run) < CtdlGetConfigLong("c_net_freq") )
        {
                full_processing = 0;
-               syslog(LOG_DEBUG, "Network full processing in %ld seconds.",
-                      CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run)
-               );
+               syslog(LOG_DEBUG, "network: full processing in %ld seconds.", CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run));
        }
 
        become_session(&networker_spool_CC);
@@ -348,14 +341,14 @@ void network_do_queue(void)
         * Go ahead and run the queue
         */
        if (full_processing && !server_shutting_down) {
-               QNM_syslog(LOG_DEBUG, "network: loading outbound queue");
-               CtdlForEachNetCfgRoom(network_queue_interesting_rooms, &RL, maxRoomNetCfg);
+               syslog(LOG_DEBUG, "network: loading outbound queue");
+               CtdlForEachNetCfgRoom(network_queue_interesting_rooms, &RL);
        }
 
        if ((RL.rplist != NULL) && (!server_shutting_down)) {
                RoomProcList *ptr, *cmp;
                ptr = RL.rplist;
-               QNM_syslog(LOG_DEBUG, "network: running outbound queue");
+               syslog(LOG_DEBUG, "network: running outbound queue");
                while (ptr != NULL && !server_shutting_down) {
                        
                        cmp = ptr->next;
@@ -372,10 +365,7 @@ void network_do_queue(void)
                        }
 
                        if (ptr->namelen > 0) {
-                               InspectQueuedRoom(&sc,
-                                                 ptr, 
-                                                 working_ignetcfg,
-                                                 the_netmap);
+                               InspectQueuedRoom(&sc, ptr, working_ignetcfg, the_netmap);
                        }
                        ptr = ptr->next;
                }
@@ -398,14 +388,9 @@ 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,
-                                  &netmap_changed);
+               network_do_spoolin(working_ignetcfg, 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 = CtdlSerializeNetworkMap(the_netmap);
@@ -423,7 +408,7 @@ void network_do_queue(void)
 
        DeleteHash(&working_ignetcfg);
 
-       QNM_syslog(LOG_DEBUG, "network: queue run completed");
+       syslog(LOG_DEBUG, "network: queue run completed");
 
        if (full_processing) {
                last_run = time(NULL);
@@ -509,8 +494,7 @@ int ignet_aftersave(struct CtdlMessage *msg, recptypes *recps)
                                if (network_fp != NULL) {
                                        rv = fwrite(smr.ser, smr.len, 1, network_fp);
                                        if (rv == -1) {
-                                               MSG_syslog(LOG_EMERG, "CtdlSubmitMsg(): Couldn't write network spool file: %s",
-                                                          strerror(errno));
+                                               syslog(LOG_EMERG, "network: CtdlSubmitMsg() Couldn't write network spool file: %s", strerror(errno));
                                        }
                                        fclose(network_fp);
                                }
@@ -534,20 +518,13 @@ int ignet_aftersave(struct CtdlMessage *msg, recptypes *recps)
  * Module entry point
  */
 
-void SetNetQDebugEnabled(const int n)
-{
-       NetQDebugEnabled = n;
-}
-
 
 CTDL_MODULE_INIT(network)
 {
        if (!threading)
        {
                CtdlRegisterMessageHook(ignet_aftersave, EVT_AFTERSAVE);
-
                CtdlFillSystemContext(&networker_spool_CC, "CitNetSpool");
-               CtdlRegisterDebugFlagHook(HKEY("networkqueue"), SetNetQDebugEnabled, &NetQDebugEnabled);
                CtdlRegisterSessionHook(network_cleanup_function, EVT_STOP, PRIO_STOP + 30);
                 CtdlRegisterSessionHook(network_logout_hook, EVT_LOGOUT, PRIO_LOGOUT + 10);
                CtdlRegisterProtoHook(cmd_nsyn, "NSYN", "Synchronize room to node");