X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=06b31b94429e9ba96c41b49b71120570dcb3d2c8;hb=c750a06a241dc2737fa68c24b340a1bd82894f74;hp=266adcdd8cae2ea8f62ebc2f737e2b3fc66ce8d6;hpb=d3439d1bc968e5b5c99a4845a563ab8df8678bce;p=citadel.git diff --git a/citadel/citserver.c b/citadel/citserver.c index 266adcdd8..06b31b944 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -1,7 +1,7 @@ /* * Main source module for the Citadel server * - * Copyright (c) 1987-2011 by the citadel.org team + * Copyright (c) 1987-2017 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License, version 3. @@ -12,58 +12,21 @@ * GNU General Public License for more details. */ -#include "sysdep.h" #include #include #include -#include -#include -#include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#if HAVE_BACKTRACE -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "sysdep.h" +#include #include -#include "citadel.h" -#include "server.h" -#include "sysdep_decls.h" -#include "threads.h" -#include "citserver.h" -#include "config.h" -#include "database.h" + +#include "ctdl_module.h" #include "housekeeping.h" -#include "user_ops.h" -#include "msgbase.h" -#include "support.h" #include "locate_host.h" -#include "room_ops.h" +#include "citserver.h" +#include "user_ops.h" #include "control.h" -#include "euidindex.h" -#include "context.h" -#include "svn_revision.h" -#include "ctdl_module.h" +#include "config.h" char *unique_session_numbers; int ScheduledShutdown = 0; @@ -71,78 +34,6 @@ time_t server_startup_time; int panic_fd; int openid_level_supported = 0; -/* - * print the actual stack frame. - */ -void cit_backtrace(void) -{ -#ifdef HAVE_BACKTRACE - void *stack_frames[50]; - size_t size, i; - char **strings; - - - size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*)); - strings = backtrace_symbols(stack_frames, size); - for (i = 0; i < size; i++) { - if (strings != NULL) - syslog(LOG_ALERT, "%s\n", strings[i]); - else - syslog(LOG_ALERT, "%p\n", stack_frames[i]); - } - free(strings); -#endif -} - -void cit_oneline_backtrace(void) -{ -#ifdef HAVE_BACKTRACE - void *stack_frames[50]; - size_t size, i; - char **strings; - StrBuf *Buf; - - size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*)); - strings = backtrace_symbols(stack_frames, size); - if (size > 0) - { - Buf = NewStrBuf(); - for (i = 1; i < size; i++) { - if (strings != NULL) - StrBufAppendPrintf(Buf, "%s : ", strings[i]); - else - StrBufAppendPrintf(Buf, "%p : ", stack_frames[i]); - } - free(strings); - syslog(LOG_ALERT, "%s\n", ChrPtr(Buf)); - FreeStrBuf(&Buf); - } -#endif -} - -/* - * print the actual stack frame. - */ -void cit_panic_backtrace(int SigNum) -{ -#ifdef HAVE_BACKTRACE - void *stack_frames[10]; - size_t size, i; - char **strings; - - printf("caught signal 11\n"); - size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*)); - strings = backtrace_symbols(stack_frames, size); - for (i = 0; i < size; i++) { - if (strings != NULL) - syslog(LOG_ALERT, "%s\n", strings[i]); - else - syslog(LOG_ALERT, "%p\n", stack_frames[i]); - } - free(strings); -#endif - exit(-1); -} /* * Various things that need to be initialized at startup @@ -153,20 +44,40 @@ void master_startup(void) { FILE *urandom; struct ctdlroom qrbuf; int rv; + struct passwd *pw; + gid_t gid; - syslog(LOG_DEBUG, "master_startup() started\n"); + syslog(LOG_DEBUG, "master_startup() started"); time(&server_startup_time); - get_config(); - syslog(LOG_INFO, "Opening databases\n"); + syslog(LOG_INFO, "Checking directory access"); + if ((pw = getpwuid(ctdluid)) == NULL) { + gid = getgid(); + } else { + gid = pw->pw_gid; + } + + if (create_run_directories(CTDLUID, gid) != 0) { + syslog(LOG_EMERG, "failed to access & create directories"); + exit(1); + } + syslog(LOG_INFO, "Opening databases"); open_databases(); + + /* Load site-specific configuration */ + syslog(LOG_INFO, "Initializing configuration system"); + initialize_config_system(); + validate_config(); + migrate_legacy_control_record(); + + /* Check floor reference counts */ check_ref_counts(); - syslog(LOG_INFO, "Creating base rooms (if necessary)\n"); - CtdlCreateRoom(config.c_baseroom, 0, "", 0, 1, 0, VIEW_BBS); - CtdlCreateRoom(AIDEROOM, 3, "", 0, 1, 0, VIEW_BBS); - CtdlCreateRoom(SYSCONFIGROOM, 3, "", 0, 1, 0, VIEW_BBS); - CtdlCreateRoom(config.c_twitroom, 0, "", 0, 1, 0, VIEW_BBS); + syslog(LOG_INFO, "Creating base rooms (if necessary)"); + CtdlCreateRoom(CtdlGetConfigStr("c_baseroom"), 0, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(AIDEROOM, 3, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(SYSCONFIGROOM, 3, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(CtdlGetConfigStr("c_twitroom"), 0, "", 0, 1, 0, VIEW_BBS); /* The "Local System Configuration" room doesn't need to be visible */ if (CtdlGetRoomLock(&qrbuf, SYSCONFIGROOM) == 0) { @@ -180,13 +91,13 @@ void master_startup(void) { CtdlPutRoomLock(&qrbuf); } - syslog(LOG_INFO, "Seeding the pseudo-random number generator...\n"); + syslog(LOG_INFO, "Seeding the pseudo-random number generator..."); urandom = fopen("/dev/urandom", "r"); if (urandom != NULL) { rv = fread(&seed, sizeof seed, 1, urandom); - if (rv == -1) - syslog(LOG_EMERG, "failed to read random seed: %s\n", - strerror(errno)); + if (rv == -1) { + syslog(LOG_ERR, "citserver: failed to read random seed: %m"); + } fclose(urandom); } else { @@ -196,16 +107,14 @@ void master_startup(void) { srand(seed); srandom(seed); - put_config(); - - syslog(LOG_DEBUG, "master_startup() finished\n"); + syslog(LOG_DEBUG, "master_startup() finished"); } /* - * Cleanup routine to be called when the server is shutting down. + * Cleanup routine to be called when the server is shutting down. Returns the needed exit code. */ -void master_cleanup(int exitcode) { +int master_cleanup(int exitcode) { struct CleanupFunctionHook *fcn; static int already_cleaning_up = 0; @@ -222,6 +131,9 @@ void master_cleanup(int exitcode) { /* Do system-dependent stuff */ sysdep_master_cleanup(); + + /* Close the configuration system */ + shutdown_config_system(); /* Close databases */ syslog(LOG_INFO, "Closing databases\n"); @@ -229,24 +141,24 @@ void master_cleanup(int exitcode) { /* If the operator requested a halt but not an exit, halt here. */ if (shutdown_and_halt) { - syslog(LOG_NOTICE, "citserver: Halting server without exiting.\n"); + syslog(LOG_ERR, "citserver: Halting server without exiting."); fflush(stdout); fflush(stderr); while(1) { sleep(32767); } } - release_control(); - /* Now go away. */ - syslog(LOG_NOTICE, "citserver: Exiting with status %d\n", exitcode); + syslog(LOG_ERR, "citserver: Exiting with status %d", exitcode); fflush(stdout); fflush(stderr); - if (restart_server != 0) - exit(1); - if ((running_as_daemon != 0) && ((exitcode == 0) )) + if (restart_server != 0) { + exitcode = 1; + } + else if ((running_as_daemon != 0) && ((exitcode == 0) )) { exitcode = CTDLEXIT_SHUTDOWN; - exit(exitcode); + } + return(exitcode); } @@ -297,21 +209,20 @@ int CtdlIsPublicClient(void) */ if (stat(public_clients_file, &statbuf) != 0) { /* No public_clients file exists, so bail out */ - syslog(LOG_WARNING, "Warning: '%s' does not exist\n", - public_clients_file); + syslog(LOG_WARNING, "Warning: '%s' does not exist", public_clients_file); return(0); } if (statbuf.st_mtime > pc_timestamp) { begin_critical_section(S_PUBLIC_CLIENTS); - syslog(LOG_INFO, "Loading %s\n", public_clients_file); + syslog(LOG_INFO, "Loading %s", public_clients_file); public_clientspos = &public_clients[0]; public_clientsend = public_clientspos + SIZ; safestrncpy(public_clientspos, LOCALHOSTSTR, sizeof public_clients); public_clientspos += sizeof(LOCALHOSTSTR) - 1; - if (hostname_to_dotted_quad(addrbuf, config.c_fqdn) == 0) { + if (hostname_to_dotted_quad(addrbuf, CtdlGetConfigStr("c_fqdn")) == 0) { *(public_clientspos++) = '|'; paddr = &addrbuf[0]; while (!IsEmptyStr (paddr) && @@ -350,18 +261,17 @@ int CtdlIsPublicClient(void) end_critical_section(S_PUBLIC_CLIENTS); } - syslog(LOG_DEBUG, "Checking whether %s is a local or public client\n", - CC->cs_addr); + syslog(LOG_DEBUG, "Checking whether %s is a local or public client", CC->cs_addr); for (i=0; ics_addr, addrbuf)) { - syslog(LOG_DEBUG, "... yes its local.\n"); + syslog(LOG_DEBUG, "... yes its local."); return(1); } } /* No hits. This is not a public client. */ - syslog(LOG_DEBUG, "... no it isn't.\n"); + syslog(LOG_DEBUG, "... no it isn't."); return(0); } @@ -373,12 +283,12 @@ void citproto_begin_session() { if (CC->nologin==1) { cprintf("%d %s: Too many users are already online (maximum is %d)\n", ERROR + MAX_SESSIONS_EXCEEDED, - config.c_nodename, config.c_maxsessions + CtdlGetConfigStr("c_nodename"), CtdlGetConfigInt("c_maxsessions") ); CC->kill_me = KILLME_MAX_SESSIONS_EXCEEDED; } else { - cprintf("%d %s Citadel server ready.\n", CIT_OK, config.c_nodename); + cprintf("%d %s Citadel server ready.\n", CIT_OK, CtdlGetConfigStr("c_nodename")); CC->can_receive_im = 1; } } @@ -386,70 +296,7 @@ void citproto_begin_session() { void citproto_begin_admin_session() { CC->internal_pgm = 1; - cprintf("%d %s Citadel server ADMIN CONNECTION ready.\n", CIT_OK, config.c_nodename); -} - - - - -/* - * This loop recognizes all server commands. - */ -void do_command_loop(void) { - char cmdbuf[SIZ]; - - time(&CC->lastcmd); - memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ - if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { - syslog(LOG_ERR, "Citadel client disconnected: ending session.\n"); - CC->kill_me = KILLME_CLIENT_DISCONNECTED; - return; - } - - /* Log the server command, but don't show passwords... */ - if ( (strncasecmp(cmdbuf, "PASS", 4)) && (strncasecmp(cmdbuf, "SETP", 4)) ) { - syslog(LOG_INFO, "[%d][%s(%ld)] %s", - CC->cs_pid, CC->curr_user, CC->user.usernum, cmdbuf - ); - } - else { - syslog(LOG_INFO, "[%d][%s(%ld)]