Removed the "filter" parameter from CtdlForEachNetCfgRoom().

[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..a974fd93bcdac930258a45c800a7a42f8660c74c 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -214,8 +214,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 +266,6 @@ int network_room_handler(struct ctdlroom *qrbuf)
                return 1;
        }
 
-       ptr->OneRNCfg = NULL;
        begin_critical_section(S_RPLIST);
        ptr->next = rplist;
        rplist = ptr;
@@ -322,8 +319,8 @@ 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)
+               MARK_syslog(LOG_DEBUG, "Network full processing in %ld seconds.",
+                           CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run)
                );
        }
 
@@ -349,7 +346,7 @@ void network_do_queue(void)
         */
        if (full_processing && !server_shutting_down) {
                QNM_syslog(LOG_DEBUG, "network: loading outbound queue");
-               CtdlForEachNetCfgRoom(network_queue_interesting_rooms, &RL, maxRoomNetCfg);
+               CtdlForEachNetCfgRoom(network_queue_interesting_rooms, &RL);
        }
 
        if ((RL.rplist != NULL) && (!server_shutting_down)) {
@@ -372,10 +369,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;
                }