X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/5adde7a4edf1af48b5cde624324bdf7538d859b4..6ac21a70e238ca31704f4a5be3a3b71af2c2d2d0:/ircd/ircd.c diff --git a/ircd/ircd.c b/ircd/ircd.c index 3a16a40c..935aa4e9 100644 --- a/ircd/ircd.c +++ b/ircd/ircd.c @@ -1,5 +1,5 @@ /* - * charybdis: A slightly useful ircd. + * Solanum: a slightly advanced ircd * ircd.c: Starts up and runs the ircd. * * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center @@ -53,7 +53,6 @@ #include "ircd_getopt.h" #include "newconf.h" #include "reject.h" -#include "s_conf.h" #include "s_newconf.h" #include "cache.h" #include "monitor.h" @@ -67,6 +66,9 @@ #include "authproc.h" #include "operhash.h" +static void +ircd_die_cb(const char *str) __attribute__((noreturn)); + /* /quote set variables */ struct SetOptions GlobalSetOptions; @@ -134,6 +136,25 @@ const char *ircd_paths[IRCD_PATH_COUNT] = { [IRCD_PATH_LIBEXEC] = PKGLIBEXECDIR, }; +const char *ircd_pathnames[IRCD_PATH_COUNT] = { + [IRCD_PATH_PREFIX] = "prefix", + [IRCD_PATH_MODULES] = "modules", + [IRCD_PATH_AUTOLOAD_MODULES] = "autoload modules", + [IRCD_PATH_ETC] = "config", + [IRCD_PATH_LOG] = "log", + [IRCD_PATH_USERHELP] = "user help", + [IRCD_PATH_OPERHELP] = "oper help", + [IRCD_PATH_IRCD_EXEC] = "ircd binary", + [IRCD_PATH_IRCD_CONF] = "ircd.conf", + [IRCD_PATH_IRCD_MOTD] = "ircd.motd", + [IRCD_PATH_IRCD_LOG] = "ircd.log", + [IRCD_PATH_IRCD_PID] = "ircd.pid", + [IRCD_PATH_IRCD_OMOTD] = "oper motd", + [IRCD_PATH_BANDB] = "bandb", + [IRCD_PATH_BIN] = "binary dir", + [IRCD_PATH_LIBEXEC] = "libexec dir", +}; + const char *logFileName = NULL; const char *pidFileName = NULL; @@ -166,51 +187,6 @@ ircd_shutdown(const char *reason) exit(0); } -/* - * print_startup - print startup information - */ -static void -print_startup(int pid) -{ - int fd; - -#ifndef _WIN32 - close(1); - fd = open("/dev/null", O_RDWR); - if (fd == -1) { - perror("open /dev/null"); - exit(EXIT_FAILURE); - } - if (fd == 0) - fd = dup(fd); - if (fd != 1) - abort(); -#endif - inotice("runtime path: %s", rb_path_to_self()); - inotice("now running in %s mode from %s as pid %d ...", - !server_state_foreground ? "background" : "foreground", - ConfigFileEntry.dpath, pid); - -#ifndef _WIN32 - /* let the parent process know the initialization was successful - * -- jilles */ - if (!server_state_foreground) - { - /* GCC complains on Linux if we don't check the value of write pedantically. - * Technically you're supposed to check the value, yes, but it probably can't fail. - * No, casting to void is of no use to shut the warning up. You HAVE to use the value. - * --Elizfaox - */ - if(write(0, ".", 1) < 1) - abort(); - } - if (dup2(1, 0) == -1) - abort(); - if (dup2(1, 2) == -1) - abort(); -#endif -} - /* * init_sys * @@ -230,7 +206,7 @@ init_sys(void) if(maxconnections <= MAX_BUFFER) { fprintf(stderr, "ERROR: Shell FD limits are too low.\n"); - fprintf(stderr, "ERROR: charybdis reserves %d FDs, shell limits must be above this\n", MAX_BUFFER); + fprintf(stderr, "ERROR: solanum reserves %d FDs, shell limits must be above this\n", MAX_BUFFER); exit(EXIT_FAILURE); } return; @@ -239,21 +215,22 @@ init_sys(void) maxconnections = MAXCONNECTIONS; } +#ifndef _WIN32 static int make_daemon(void) { -#ifndef _WIN32 - int pid; - int pip[2]; - char c; + int pid, nullfd, fdx; + + /* The below is approximately what daemon(1, 0) does, but + we need control over the parent after forking to print + the startup message -- Aaron */ - if (pipe(pip) < 0) + if((nullfd = open("/dev/null", O_RDWR)) < 0) { - perror("pipe"); + perror("open /dev/null"); exit(EXIT_FAILURE); } - dup2(pip[1], 0); - close(pip[1]); + if((pid = fork()) < 0) { perror("fork"); @@ -261,25 +238,24 @@ make_daemon(void) } else if(pid > 0) { - close(0); - /* Wait for initialization to finish, successfully or - * unsuccessfully. Until this point the child may still - * write to stdout/stderr. - * -- jilles */ - if (read(pip[0], &c, 1) > 0) - exit(EXIT_SUCCESS); - else - exit(EXIT_FAILURE); + inotice("now running in background mode from %s as pid %d ...", + ConfigFileEntry.dpath, pid); + + exit(EXIT_SUCCESS); } - close(pip[0]); - setsid(); -/* fclose(stdin); - fclose(stdout); - fclose(stderr); */ -#endif + for(fdx = 0; fdx <= 2; fdx++) + if (fdx != nullfd) + (void) dup2(nullfd, fdx); + + if(nullfd > 2) + (void) close(nullfd); + + (void) setsid(); + return 0; } +#endif static int printVersion = 0; @@ -389,6 +365,7 @@ initialize_server_capabs(void) default_server_capabs &= ~CAP_ZIP; } +#ifdef _WIN32 /* * relocate_paths * @@ -396,7 +373,6 @@ initialize_server_capabs(void) * output - none * side effects - items in ircd_paths[] array are relocated */ -#ifdef _WIN32 static void relocate_paths(void) { @@ -466,6 +442,12 @@ relocate_paths(void) snprintf(workbuf, sizeof workbuf, "%s%cbin", prefix, RB_PATH_SEPARATOR); ircd_paths[IRCD_PATH_BIN] = rb_strdup(workbuf); ircd_paths[IRCD_PATH_LIBEXEC] = rb_strdup(workbuf); + + inotice("runtime paths:"); + for (int i = 0; i < IRCD_PATH_COUNT; i++) + { + inotice(" %s: %s", ircd_pathnames[i], ircd_paths[i]); + } } #endif @@ -571,7 +553,7 @@ ircd_restart_cb(const char *str) /* * Why EXIT_FAILURE here? * Because if ircd_die_cb() is called it's because of a fatal - * error inside libcharybdis, and we don't know how to handle the + * error inside libsolanum, and we don't know how to handle the * exception, so it is logical to return a FAILURE exit code here. * --nenolod */ @@ -645,7 +627,7 @@ seed_random(void *unused) * Side Effects - this is where the ircd gets going right now */ int -charybdis_main(int argc, char * const argv[]) +solanum_main(int argc, char * const argv[]) { int fd; @@ -697,6 +679,7 @@ charybdis_main(int argc, char * const argv[]) me.localClient = &meLocalUser; /* Make sure all lists are zeroed */ + memset(&global_client_list, 0, sizeof(global_client_list)); memset(&unknown_list, 0, sizeof(unknown_list)); memset(&lclient_list, 0, sizeof(lclient_list)); memset(&serv_list, 0, sizeof(serv_list)); @@ -743,10 +726,13 @@ charybdis_main(int argc, char * const argv[]) { check_pidfile(pidFileName); - if(!server_state_foreground) - make_daemon(); inotice("starting %s ...", ircd_version); inotice("%s", rb_lib_version()); + +#ifndef _WIN32 + if(!server_state_foreground) + make_daemon(); +#endif } /* Init the event subsystem */ @@ -781,6 +767,7 @@ charybdis_main(int argc, char * const argv[]) init_authd(); /* Start up authd. */ init_dns(); /* Start up DNS query system */ + init_modules(); /* Start up modules system */ privilegeset_set_new("default", "", 0); @@ -788,8 +775,6 @@ charybdis_main(int argc, char * const argv[]) fprintf(stderr, "\nBeginning config test\n"); read_conf_files(true); /* cold start init conf files */ - mod_add_path(MODULE_DIR); - mod_add_path(MODULE_DIR "/autoload"); load_all_modules(1); load_core_modules(1); @@ -816,7 +801,7 @@ charybdis_main(int argc, char * const argv[]) ierror("no server sid specified in serverinfo block."); return -2; } - strcpy(me.id, ServerInfo.sid); + rb_strlcpy(me.id, ServerInfo.sid, sizeof(me.id)); init_uid(); /* serverinfo{} description must exist. If not, error out. */ @@ -827,7 +812,7 @@ charybdis_main(int argc, char * const argv[]) } rb_strlcpy(me.info, ServerInfo.description, sizeof(me.info)); - if(ServerInfo.ssl_cert != NULL && ServerInfo.ssl_private_key != NULL) + if(ServerInfo.ssl_cert != NULL) { /* just do the rb_setup_ssl_server to validate the config */ if(!rb_setup_ssl_server(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params, ServerInfo.ssl_cipher_list)) @@ -839,13 +824,6 @@ charybdis_main(int argc, char * const argv[]) ircd_ssl_ok = true; } - if (testing_conf) - { - fprintf(stderr, "\nConfig testing complete.\n"); - fflush(stderr); - return 0; /* Why? We want the launcher to exit out. */ - } - me.from = &me; me.servptr = &me; SetMe(&me); @@ -859,6 +837,13 @@ charybdis_main(int argc, char * const argv[]) construct_umodebuf(); + if (testing_conf) + { + fprintf(stderr, "\nConfig testing complete.\n"); + fflush(stderr); + return 0; /* Why? We want the launcher to exit out. */ + } + check_class(); write_pidfile(pidFileName); load_help(); @@ -881,7 +866,9 @@ charybdis_main(int argc, char * const argv[]) if(splitmode) check_splitmode_ev = rb_event_add("check_splitmode", check_splitmode, NULL, 5); - print_startup(getpid()); + if(server_state_foreground) + inotice("now running in foreground mode from %s as pid %d ...", + ConfigFileEntry.dpath, getpid()); rb_lib_loop(0);