X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=06b31b94429e9ba96c41b49b71120570dcb3d2c8;hb=c750a06a241dc2737fa68c24b340a1bd82894f74;hp=d26102f612778979f13aac171babfebc6d79d78d;hpb=d7fd95a3ec0da47dbbdeabc3bee0dfb01a8dde61;p=citadel.git diff --git a/citadel/citserver.c b/citadel/citserver.c index d26102f61..06b31b944 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -1,7 +1,7 @@ /* * Main source module for the Citadel server * - * Copyright (c) 1987-2015 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,12 +12,12 @@ * GNU General Public License for more details. */ +#include +#include #include +#include #include "sysdep.h" #include -#if HAVE_BACKTRACE -#include -#endif #include #include "ctdl_module.h" @@ -34,79 +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; - - const char *p = IOSTR; - if (p == NULL) p = ""; - 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 %s\n", p, strings[i]); - else - syslog(LOG_ALERT, "%s %p\n", p, 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 %s\n", IOSTR, 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 @@ -120,7 +47,7 @@ void master_startup(void) { struct passwd *pw; gid_t gid; - syslog(LOG_DEBUG, "master_startup() started\n"); + syslog(LOG_DEBUG, "master_startup() started"); time(&server_startup_time); syslog(LOG_INFO, "Checking directory access"); @@ -138,14 +65,15 @@ void master_startup(void) { open_databases(); /* Load site-specific configuration */ - syslog(LOG_INFO, "Loading citadel.config"); + 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"); + 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); @@ -163,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 { @@ -179,14 +107,14 @@ void master_startup(void) { srand(seed); srandom(seed); - 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; @@ -213,7 +141,7 @@ 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); @@ -221,14 +149,16 @@ void master_cleanup(int exitcode) { } /* 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); } @@ -279,14 +209,13 @@ 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; @@ -332,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); } @@ -372,69 +300,6 @@ void citproto_begin_admin_session() { } - - -/* - * 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)]