#include "restart.h"
#include "s_auth.h"
#include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
#include "s_serv.h" /* try_connections */
#include "s_user.h"
#include "s_stats.h"
extern struct LocalUser meLocalUser;
extern char **myargv;
-extern int maxconnections; /* XXX */
+int maxconnections; /* XXX */
/*
* print_startup - print startup information
static void
ircd_restart_cb(const char *str)
{
- restart(buf);
+ restart(str);
}
/*
exit(EXIT_FAILURE);
}
}
+
+ maxconnections = limit.rlim_cur;
#endif /* RLIMIT_NOFILE */
}
{NULL, NULL, STRING, NULL},
};
-void
-set_time(void)
-{
- struct timeval newtime;
- newtime.tv_sec = 0;
- newtime.tv_usec = 0;
-#ifdef HAVE_GETTIMEOFDAY
- if(gettimeofday(&newtime, NULL) == -1)
- {
- ilog(L_MAIN, "Clock Failure (%d)", errno);
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Clock Failure (%d), TS can be corrupted", errno);
-
- restart("Clock Failure");
- }
-#else
- newtime.tv_sec = time(NULL);
-
-#endif
- 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;
-}
-
static void
check_rehash(void *unused)
{
}
}
-void
-charybdis_io_loop(void)
-{
- time_t delay;
-
- while (ServerRunning)
- {
- /* Run pending events, then get the number of seconds to the next
- * event
- */
-
- delay = rb_event_next();
- if(delay <= rb_current_time())
- rb_event_run();
-
-
- rb_select(250);
- }
-}
-
/*
* initalialize_global_set_options
*
return -1;
}
- /*
- * save server boot time right away, so getrusage works correctly
- */
- set_time();
/*
* Setup corefile size immediately after boot -kre
*/
/* Init the event subsystem */
init_sys();
rb_lib_init(ircd_log_cb, ircd_restart_cb, ircd_die_cb, !server_state_foreground, maxconnections, DNODE_HEAP_SIZE, FD_HEAP_SIZE);
+ rb_linebuf_init(LINEBUF_HEAP_SIZE);
init_main_logfile();
newconf_init();
print_startup(getpid());
- charybdis_io_loop();
+ rb_lib_loop(250);
return 0;
}