CurrentTime -> rb_currenttime();

[irc/rqf/shadowircd.git] / src / ircd.c

diff --git a/src/ircd.c b/src/ircd.c
index 2d87e2d547f11817d5d7cda8f44882fcc1679ede..5550df971cde9409e8a214c528b260eb9b2af89f 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -28,13 +28,11 @@
 #include "setup.h"
 #include "config.h"
 
-#include "tools.h"
 #include "ircd.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "ircd_signal.h"
@@ -47,7 +45,6 @@
 #include "res.h"
 #include "restart.h"
 #include "s_auth.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_log.h"
 #include "s_serv.h"            /* try_connections */
@@ -58,18 +55,14 @@
 #include "supported.h"
 #include "whowas.h"
 #include "modules.h"
-#include "memory.h"
 #include "hook.h"
 #include "ircd_getopt.h"
-#include "balloc.h"
 #include "newconf.h"
-#include "patricia.h"
 #include "reject.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "cache.h"
 #include "monitor.h"
-#include "libcharybdis.h"
 #include "patchlevel.h"
 #include "serno.h"
 
@@ -85,6 +78,8 @@ extern int ServerRunning;
 extern struct LocalUser meLocalUser;
 extern char **myargv;
 
+extern int maxconnections; /* XXX */
+
 /*
  * print_startup - print startup information
  */
@@ -249,8 +244,8 @@ set_time(void)
        newtime.tv_sec = time(NULL);
        
 #endif
-       if(newtime.tv_sec < CurrentTime)
-               set_back_events(CurrentTime - newtime.tv_sec);
+       if(newtime.tv_sec < rb_current_time())
+               rb_set_back_events(rb_current_time() - newtime.tv_sec);
 
        SystemTime.tv_sec = newtime.tv_sec;
        SystemTime.tv_usec = newtime.tv_usec;
@@ -295,9 +290,9 @@ charybdis_io_loop(void)
                 * event
                 */
 
-               delay = eventNextTime();
-               if(delay <= CurrentTime)
-                       eventRun();
+               delay = rb_event_next();
+               if(delay <= rb_current_time())
+                       rb_event_run();
 
 
                rb_select(250);
@@ -564,16 +559,9 @@ main(int argc, char *argv[])
        /* Init the event subsystem */
        init_sys();
        libcharybdis_init(ircd_log_cb, restart, ircd_die_cb);
-       rb_lib_init(ircd_log_cb, restart, ircd_die_cb);
-
-       fdlist_init();
-       if(!server_state_foreground)
-       {
-               rb_close_all();
-       }
+       rb_lib_init(ircd_log_cb, restart, ircd_die_cb, !server_state_foreground, maxconnections, DNODE_HEAP_SIZE, FD_HEAP_SIZE);
 
        init_main_logfile();
-       init_patricia();
        newconf_init();
        init_s_conf();
        init_s_newconf();
@@ -646,7 +634,7 @@ main(int argc, char *argv[])
        me.servptr = &me;
        SetMe(&me);
        make_server(&me);
-       startup_time = CurrentTime;
+       startup_time = rb_current_time();
        add_to_client_hash(me.name, &me);
        add_to_id_hash(me.id, &me);
        me.serv->nameinfo = scache_connect(me.name, me.info, 0);