#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"
#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 */
#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.
extern struct LocalUser meLocalUser;
extern char **myargv;
+extern int maxconnections; /* XXX */
+
/*
* print_startup - print startup information
*/
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
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;
* event
*/
- delay = eventNextTime();
- if(delay <= CurrentTime)
- eventRun();
+ delay = rb_event_next();
+ if(delay <= rb_current_time())
+ rb_event_run();
- comm_select(250);
+ rb_select(250);
}
}
{
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)",
#endif
}
+struct ev_entry *check_splitmode_ev = NULL;
+
/*
* main
*
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));
/* 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();
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);
- dlinkAddAlloc(&me, &global_serv_list);
+ rb_dlinkAddAlloc(&me, &global_serv_list);
construct_umodebuf();
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;