Networker reordering; remove / change dependencies

[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 94f3b83d28e7fba1943c9be78460c4823d13dbdb..6c8db4bf65a73be29e1cd83042c8229bf2ccd189 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -88,6 +88,7 @@
 
 #include "context.h"
 #include "netconfig.h"
+#include "netspool.h"
 #include "netmail.h"
 #include "ctdl_module.h"
 
@@ -105,7 +106,6 @@ struct RoomProcList *rplist = NULL;
 
 
 
-
 /*
  * Check the use table.  This is a list of messages which have recently
  * arrived on the system.  It is maintained and queried to prevent the same
@@ -433,12 +433,11 @@ void network_do_queue(void) {
        /* Load the IGnet Configuration into memory */
        load_working_ignetcfg();
 
-
        /*
         * Load the network map and filter list into memory.
         */
        read_network_map();
-       filterlist = load_filter_list();
+       load_network_filter_list();
 
        /* 
         * Go ahead and run the queue
@@ -483,8 +482,7 @@ void network_do_queue(void) {
        write_network_map();
 
        /* Free the filter list in memory */
-       free_filter_list(filterlist);
-       filterlist = NULL;
+       free_netfilter_list();
 
        network_consolidate_spoolout();