libcharybdis includes gone.

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

diff --git a/src/ircd.c b/src/ircd.c
index a134e915fbc24b10f0e3ce7c9e17210c84e75291..c3bffde0467cd9000b087d996203321c12dbcd18 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,21 +55,19 @@
 #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"
 
+#include "ratbox_lib.h"
+
 /*
  * Try and find the correct name to use with getrlimit() for setting the max.
  * number of files allowed to be open by this process.
@@ -83,6 +78,8 @@ extern int ServerRunning;
 extern struct LocalUser meLocalUser;
 extern char **myargv;
 
+extern int maxconnections; /* XXX */
+
 /*
  * print_startup - print startup information
  */
@@ -111,6 +108,12 @@ ircd_log_cb(const char *str)
        ilog(L_MAIN, "%s", str);
 }
 
+static void
+ircd_restart_cb(const char *str)
+{
+       ilog(L_MAIN, "%s", str);
+}
+
 /*
  * Why EXIT_FAILURE here?
  * Because if ircd_die_cb() is called it's because of a fatal
@@ -242,7 +245,7 @@ set_time(void)
        
 #endif
        if(newtime.tv_sec < CurrentTime)
-               set_back_events(CurrentTime - newtime.tv_sec);
+               rb_set_back_events(CurrentTime - newtime.tv_sec);
 
        SystemTime.tv_sec = newtime.tv_sec;
        SystemTime.tv_usec = newtime.tv_usec;
@@ -287,12 +290,12 @@ charybdis_io_loop(void)
                 * event
                 */
 
-               delay = eventNextTime();
+               delay = rb_event_next();
                if(delay <= CurrentTime)
-                       eventRun();
+                       rb_event_run();
 
 
-               comm_select(250);
+               rb_select(250);
        }
 }
 
@@ -374,7 +377,7 @@ write_pidfile(const char *filename)
        {
                unsigned int pid = (unsigned int) getpid();
 
-               ircsnprintf(buff, sizeof(buff), "%u\n", pid);
+               rb_snprintf(buff, sizeof(buff), "%u\n", pid);
                if((fputs(buff, fb) == -1))
                {
                        ilog(L_MAIN, "Error writing %u to pid file %s (%s)",
@@ -444,6 +447,8 @@ setup_corefile(void)
 #endif
 }
 
+struct ev_entry *check_splitmode_ev = NULL;
+
 /*
  * main
  *
@@ -489,7 +494,7 @@ main(int argc, char *argv[])
        memset(&local_oper_list, 0, sizeof(local_oper_list));
        memset(&oper_list, 0, sizeof(oper_list));
 
-       dlinkAddTail(&me, &me.node, &global_client_list);
+       rb_dlinkAddTail(&me, &me.node, &global_client_list);
 
        memset((void *) &Count, 0, sizeof(Count));
        memset((void *) &ServerInfo, 0, sizeof(ServerInfo));
@@ -554,15 +559,9 @@ main(int argc, char *argv[])
        /* Init the event subsystem */
        init_sys();
        libcharybdis_init(ircd_log_cb, restart, ircd_die_cb);
-
-       fdlist_init();
-       if(!server_state_foreground)
-       {
-               comm_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();
@@ -640,7 +639,7 @@ main(int argc, char *argv[])
        add_to_id_hash(me.id, &me);
        me.serv->nameinfo = scache_connect(me.name, me.info, 0);
 
-       dlinkAddAlloc(&me, &global_serv_list);
+       rb_dlinkAddAlloc(&me, &global_serv_list);
 
        construct_umodebuf();
 
@@ -664,12 +663,12 @@ main(int argc, char *argv[])
        eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
 
        /* Setup the timeout check. I'll shift it later :)  -- adrian */
-       eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
+       eventAddIsh("rb_checktimeouts", rb_checktimeouts, NULL, 1);
 
        eventAdd("check_rehash", check_rehash, NULL, 1);
 
        if(splitmode)
-               eventAdd("check_splitmode", check_splitmode, NULL, 2);
+               check_splitmode_ev = rb_event_add("check_splitmode", check_splitmode, NULL, 2);
 
        ServerRunning = 1;