Merging s_newconf.c from nenolod and me

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

diff --git a/src/ircd.c b/src/ircd.c
index c3bffde0467cd9000b087d996203321c12dbcd18..5cdce481f417f9440e45cddceb021ce68a6f1c0d 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -111,7 +111,7 @@ ircd_log_cb(const char *str)
 static void
 ircd_restart_cb(const char *str)
 {
-       ilog(L_MAIN, "%s", str);
+       restart(buf);
 }
 
 /*
@@ -244,8 +244,8 @@ set_time(void)
        newtime.tv_sec = time(NULL);
        
 #endif
-       if(newtime.tv_sec < CurrentTime)
-               rb_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;
@@ -291,7 +291,7 @@ charybdis_io_loop(void)
                 */
 
                delay = rb_event_next();
-               if(delay <= CurrentTime)
+               if(delay <= rb_current_time())
                        rb_event_run();
 
 
@@ -558,8 +558,7 @@ 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, !server_state_foreground, maxconnections, DNODE_HEAP_SIZE, FD_HEAP_SIZE);
+       rb_lib_init(ircd_log_cb, ircd_restart_cb, ircd_die_cb, !server_state_foreground, maxconnections, DNODE_HEAP_SIZE, FD_HEAP_SIZE);
 
        init_main_logfile();
        newconf_init();
@@ -634,7 +633,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);
@@ -650,22 +649,22 @@ main(int argc, char *argv[])
 
        ilog(L_MAIN, "Server Ready");
 
-       eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
+       rb_event_addish("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
 
        /* We want try_connections to be called as soon as possible now! -- adrian */
        /* No, 'cause after a restart it would cause all sorts of nick collides */
        /* um.  by waiting even longer, that just means we have even *more*
         * nick collisions.  what a stupid idea. set an event for the IO loop --fl
         */
-       eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
-       eventAddOnce("try_connections_startup", try_connections, NULL, 0);
+       rb_event_addish("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
+       rb_event_addonce("try_connections_startup", try_connections, NULL, 0);
 
-       eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
+       rb_event_addish("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
 
        /* Setup the timeout check. I'll shift it later :)  -- adrian */
-       eventAddIsh("rb_checktimeouts", rb_checktimeouts, NULL, 1);
+       rb_event_addish("rb_checktimeouts", rb_checktimeouts, NULL, 1);
 
-       eventAdd("check_rehash", check_rehash, NULL, 1);
+       rb_event_add("check_rehash", check_rehash, NULL, 1);
 
        if(splitmode)
                check_splitmode_ev = rb_event_add("check_splitmode", check_splitmode, NULL, 2);