#include "numeric.h"
#include "parse.h"
#include "restart.h"
-#include "s_auth.h"
#include "s_conf.h"
#include "logger.h"
#include "s_serv.h" /* try_connections */
#include "patchlevel.h"
#include "serno.h"
#include "sslproc.h"
+#include "wsproc.h"
#include "chmode.h"
#include "privilege.h"
#include "bandbi.h"
-#include "authd.h"
+#include "authproc.h"
#include "operhash.h"
/* /quote set variables */
rb_dlink_list local_oper_list; /* our opers, duplicated in lclient_list */
rb_dlink_list oper_list; /* network opers */
-char **myargv;
-bool dorehash = false;
-bool dorehashbans = false;
-bool doremotd = false;
+char * const *myargv;
+volatile sig_atomic_t dorehash = false;
+volatile sig_atomic_t dorehashbans = false;
+volatile sig_atomic_t doremotd = false;
bool kline_queued = false;
bool server_state_foreground = false;
bool opers_see_all_users = false;
* output - none
* side effects - items in ircd_paths[] array are relocated
*/
+#ifdef _WIN32
static void
relocate_paths(void)
{
ircd_paths[IRCD_PATH_BIN] = rb_strdup(workbuf);
ircd_paths[IRCD_PATH_LIBEXEC] = rb_strdup(workbuf);
}
+#endif
/*
* write_pidfile
* Side Effects - this is where the ircd gets going right now
*/
int
-charybdis_main(int argc, char *argv[])
+charybdis_main(int argc, char * const argv[])
{
int fd;
}
#endif
-#ifndef ENABLE_FHS_PATHS
+#ifdef _WIN32
relocate_paths();
#endif
construct_cflags_strings();
- load_all_modules(1);
- load_core_modules(1);
-
- init_auth(); /* Initialise the auth code */
init_authd(); /* Start up authd. */
init_dns(); /* Start up DNS query system */
mod_add_path(MODULE_DIR);
mod_add_path(MODULE_DIR "/autoload");
+ load_all_modules(1);
+ load_core_modules(1);
init_isupport();
init_bandb();
init_ssld();
+ init_wsockd();
rehash_bans();
load_help();
open_logfiles();
+ configure_authd();
+
ilog(L_MAIN, "Server Ready");
/* We want try_connections to be called as soon as possible now! -- adrian */