#include <dirent.h>
#include <errno.h>
#include <limits.h>
-/* #include <dlfcn.h> */
#include <netdb.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include "citadel.h"
#include "server.h"
-#include "serv_extensions.h"
#include "sysdep_decls.h"
#include "citserver.h"
#include "config.h"
#include "control.h"
#include "tools.h"
#include "euidindex.h"
+#include "serv_network.h" /* Needed for destroy_network_queue_room called from master_cleanup */
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
int ScheduledShutdown = 0;
int do_defrag = 0;
time_t server_startup_time;
-char pid_file_name[PATH_MAX];
/*
* Various things that need to be initialized at startup
unsigned int seed;
FILE *urandom;
struct ctdlroom qrbuf;
- FILE *pidfile_fp;
lprintf(CTDL_DEBUG, "master_startup() started\n");
time(&server_startup_time);
- /* pid file. If we go FSSTND this should end up in 'localstatedir' */
- snprintf(pid_file_name, sizeof pid_file_name, "./citadel.pid");
- pidfile_fp = fopen(pid_file_name, "w");
- if (pidfile_fp != NULL) {
- fprintf(pidfile_fp, "%d\n", (int)getpid());
- fclose(pidfile_fp);
- }
-
lprintf(CTDL_INFO, "Opening databases\n");
open_databases();
lputroom(&qrbuf);
}
- /*
- * Create a room in which we can deposit "deleted" messages for
- * deferred deletion. This will silently fail if the room already
- * exists, and that's perfectly ok, because we want it to exist.
- */
- create_room(DELETED_MSGS_ROOM, 3, "", 0, 1, 0, VIEW_MAILBOX);
-
- /*
- * Make sure it's set to be a "system room" so it doesn't show up
- * in the <K>nown rooms list for Aides. Also set the message expire
- * policy to "by count, 1 message" so everything gets deleted all
- * the time (we can't set it to 0 because that's invalid, so we keep
- * a single message around).
- */
- if (lgetroom(&qrbuf, DELETED_MSGS_ROOM) == 0) {
- qrbuf.QRflags2 |= QR2_SYSTEM;
- qrbuf.QRep.expire_mode = EXPIRE_NUMMSGS;
- qrbuf.QRep.expire_value = 1;
- lputroom(&qrbuf);
- }
-
lprintf(CTDL_INFO, "Seeding the pseudo-random number generator...\n");
urandom = fopen("/dev/urandom", "r");
if (urandom != NULL) {
*/
void master_cleanup(int exitcode) {
struct CleanupFunctionHook *fcn;
+ struct MaintenanceThreadHook *m_fcn;
static int already_cleaning_up = 0;
if (already_cleaning_up) while(1) sleep(1);
(*fcn->h_function_pointer)();
}
- /* Shut down the indexer thread */
- lprintf(CTDL_INFO, "Waiting for the indexer thread to shut down\n");
- pthread_join(indexer_thread_tid, NULL);
+ /* Close the AdjRefCount queue file */
+ AdjRefCount(-1, 0);
- /* Shut down the checkpoint thread */
- lprintf(CTDL_INFO, "Waiting for the checkpoint thread to shut down\n");
- pthread_join(checkpoint_thread_tid, NULL);
+ for (m_fcn = MaintenanceThreadHookTable; m_fcn != NULL; m_fcn = m_fcn->next) {
+ lprintf(CTDL_INFO, "Waiting for maintenance thread \"%s\" to shut down\n", m_fcn->name);
+ pthread_join(m_fcn->MaintenanceThread_tid, NULL);
+ }
+
/* Close databases */
lprintf(CTDL_INFO, "Closing databases\n");
close_databases();
+ /* flush the networker stuff */
+ destroy_network_queue_room();
+
/* Do system-dependent stuff */
sysdep_master_cleanup();
-
+
#ifdef DEBUG_MEMORY_LEAKS
dump_heap();
#endif
+ /* If the operator requested a halt but not an exit, halt here. */
+ if (shutdown_and_halt) {
+ lprintf(CTDL_NOTICE, "citserver: Halting server without exiting.\n");
+ fflush(stdout); fflush(stderr);
+ while(1) {
+ sleep(32767);
+ }
+ }
+
+ release_control();
+
/* Now go away. */
lprintf(CTDL_NOTICE, "citserver: Exiting with status %d\n", exitcode);
fflush(stdout); fflush(stderr);
-
- unlink(pid_file_name);
+
+ if (restart_server != 0)
+ exit(1);
exit(exitcode);
}
cprintf("1\n"); /* 1 = we support the extended paging options */
cprintf("%s\n", CC->cs_nonce);
cprintf("1\n"); /* 1 = yes, this system supports the QNOP command */
+
#ifdef HAVE_LDAP
cprintf("1\n"); /* 1 = yes, this server is LDAP-enabled */
#else
cprintf("0\n"); /* 1 = no, this server is not LDAP-enabled */
#endif
+
+ if (config.c_auth_mode == 1) {
+ cprintf("1\n"); /* "create new user" never works with host auth */
+ }
+ else {
+ cprintf("%d\n", config.c_disable_newu); /* otherwise, site defined */
+ }
+
+ cprintf("%s\n", config.c_default_cal_zone);
+
cprintf("000\n");
}
if ((strlen(public_clients) +
strlen(addrbuf) + 2)
< sizeof(public_clients)) {
+ strcat(public_clients, "|");
strcat(public_clients, addrbuf);
}
}
safestrncpy(CC->cs_clientname, desc, sizeof CC->cs_clientname);
CC->cs_clientname[31] = 0;
- if (strlen(from_host) > 0) {
+ if (!IsEmptyStr(from_host)) {
if (CC->is_local_socket) do_lookup = 1;
else if (is_public_client()) do_lookup = 1;
}
lprintf(CTDL_DEBUG, "Looking up hostname '%s'\n", from_host);
if ((addr.s_addr = inet_addr(from_host)) != -1) {
locate_host(CC->cs_host, sizeof CC->cs_host,
- NULL, 0,
+ CC->cs_addr, sizeof CC->cs_addr,
&addr);
}
else {
/* If the client requested "?" then produce a listing */
if (!strcmp(buf, "?")) {
- cprintf("%d %s\n",LISTING_FOLLOWS,buf);
+ cprintf("%d %s\n", LISTING_FOLLOWS, buf);
dp = opendir(dirs[1]);
if (dp != NULL) {
while (d = readdir(dp), d != NULL) {
/* Otherwise, look for the requested file by name. */
else {
mesg_locate(targ, sizeof targ, buf2, 2, (const char **)dirs);
- if (strlen(targ) == 0) {
+ if (IsEmptyStr(targ)) {
snprintf(buf2, sizeof buf2, "%s.%d",
buf, CC->cs_clientdev);
mesg_locate(targ, sizeof targ, buf2, 2,
(const char **)dirs);
- if (strlen(targ) == 0) {
+ if (IsEmptyStr(targ)) {
mesg_locate(targ, sizeof targ, buf, 2,
(const char **)dirs);
}
free(dirs[0]);
free(dirs[1]);
- if (strlen(targ)==0) {
- cprintf("%d '%s' not found.\n",ERROR + FILE_NOT_FOUND, mname);
+ if (IsEmptyStr(targ)) {
+ cprintf("%d '%s' not found. (Searching in %s and %s)\n",
+ ERROR + FILE_NOT_FOUND,
+ mname,
+ ctdl_message_dir,
+ ctdl_hlp_dir
+ );
return;
}
- mfp = fopen(targ,"r");
+ mfp = fopen(targ, "r");
if (mfp==NULL) {
cprintf("%d Cannot open '%s': %s\n",
ERROR + INTERNAL_ERROR, targ, strerror(errno));
return;
}
- cprintf("%d %s\n",LISTING_FOLLOWS,buf);
+ cprintf("%d %s\n", LISTING_FOLLOWS,buf);
while (fgets(buf, (sizeof buf - 1), mfp) != NULL) {
buf[strlen(buf)-1] = 0;
free(dirs[0]);
free(dirs[1]);
- if (strlen(targ)==0) {
+ if (IsEmptyStr(targ)) {
snprintf(targ, sizeof targ,
"%s/%s",
ctdl_hlp_dir, buf);
/*
* Shut down the server
*/
-void cmd_down(void) {
+void cmd_down(char *argbuf) {
+ char *Reply ="%d Shutting down server. Goodbye.\n";
+
+ if (CtdlAccessCheck(ac_aide)) return;
+
+ if (!IsEmptyStr(argbuf))
+ {
+ int state = CIT_OK;
+ restart_server = extract_int(argbuf, 0);
+
+ if (restart_server > 0)
+ Reply = "%d Restarting server. See you soon.\n";
+ if ((restart_server > 0) && !running_as_daemon)
+ {
+ lprintf(CTDL_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n");
+ Reply = "%d Warning, not running in deamon mode. maybe we will come up again, but don't lean on it.\n";
+ state = ERROR;
+ }
+ cprintf(Reply, state);
+ }
+ else
+ {
+ cprintf(Reply, CIT_OK);
+ }
+ time_to_die = 1;
+}
+
+/*
+ * Halt the server without exiting the server process.
+ */
+void cmd_halt(void) {
if (CtdlAccessCheck(ac_aide)) return;
- cprintf("%d Shutting down server. Goodbye.\n", CIT_OK);
+ cprintf("%d Halting server. Goodbye.\n", CIT_OK);
time_to_die = 1;
+ shutdown_and_halt = 1;
}
/*
void cmd_scdn(char *argbuf)
{
int new_state;
+ int state = CIT_OK;
+ char *Reply = "%d %d\n";
if (CtdlAccessCheck(ac_aide)) return;
new_state = extract_int(argbuf, 0);
+ if ((new_state == 2) || (new_state == 3))
+ {
+ restart_server = 1;
+ if (!running_as_daemon)
+ {
+ lprintf(CTDL_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n");
+ Reply = "%d %d Warning, not running in deamon mode. maybe we will come up again, but don't lean on it.\n";
+ state = ERROR;
+ }
+
+ restart_server = extract_int(argbuf, 0);
+ new_state -= 2;
+ }
if ((new_state == 0) || (new_state == 1)) {
ScheduledShutdown = new_state;
}
- cprintf("%d %d\n", CIT_OK, ScheduledShutdown);
+ cprintf(Reply, state, ScheduledShutdown);
}
*/
void begin_session(struct CitContext *con)
{
- int len;
+ socklen_t len;
struct sockaddr_in sin;
/*
strcpy(con->curr_user, NLI);
strcpy(con->net_node, "");
strcpy(con->fake_username, "");
- strcpy(con->fake_postname, "");
strcpy(con->fake_hostname, "");
strcpy(con->fake_roomname, "");
generate_nonce(con);
con->cs_host[sizeof con->cs_host - 1] = 0;
len = sizeof sin;
if (!CC->is_local_socket) {
- if (!getpeername(con->client_socket,
- (struct sockaddr *) &sin, &len)) /* should be socklen_t but doesn't work on Macintosh */
+ if (!getpeername(con->client_socket, (struct sockaddr *) &sin, &len)) {
locate_host(con->cs_host, sizeof con->cs_host,
con->cs_addr, sizeof con->cs_addr,
- &sin.sin_addr);
+ &sin.sin_addr
+ );
+ }
}
else {
strcpy(con->cs_host, "");
con->dl_is_net = 0;
con->nologin = 0;
- if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions))
+ if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions)) {
con->nologin = 1;
+ }
lprintf(CTDL_NOTICE, "Session started.\n");
void citproto_begin_session() {
if (CC->nologin==1) {
- cprintf("%d %s: Too many users are already online "
- "(maximum is %d)\n",
+ cprintf("%d %s: Too many users are already online (maximum is %d)\n",
ERROR + MAX_SESSIONS_EXCEEDED,
- config.c_nodename, config.c_maxsessions);
+ config.c_nodename, config.c_maxsessions
+ );
+ CC->kill_me = 1;
}
else {
cprintf("%d %s Citadel server ready.\n",
/*
* Let other clients see the last command we executed, and
- * update the idle time, but not NOOP, QNOP, PEXP, or GEXP.
+ * update the idle time, but not NOOP, QNOP, PEXP, GEXP, RWHO, or TIME.
*/
if ( (strncasecmp(cmdbuf, "NOOP", 4))
&& (strncasecmp(cmdbuf, "QNOP", 4))
&& (strncasecmp(cmdbuf, "PEXP", 4))
- && (strncasecmp(cmdbuf, "GEXP", 4)) ) {
+ && (strncasecmp(cmdbuf, "GEXP", 4))
+ && (strncasecmp(cmdbuf, "RWHO", 4))
+ && (strncasecmp(cmdbuf, "TIME", 4)) ) {
strcpy(CC->lastcmdname, " ");
safestrncpy(CC->lastcmdname, cmdbuf, sizeof(CC->lastcmdname));
time(&CC->lastidle);
cmd_opna(&cmdbuf[5]);
}
+ else if (!strncasecmp(cmdbuf,"DLAT",4)) {
+ cmd_dlat(&cmdbuf[5]);
+ }
+
else if (!strncasecmp(cmdbuf,"INFO",4)) {
cmd_info();
}
}
else if (!strncasecmp(cmdbuf,"DOWN",4)) {
- cmd_down();
+ cmd_down(&cmdbuf[5]);
+ }
+
+ else if (!strncasecmp(cmdbuf,"HALT",4)) {
+ cmd_halt();
}
else if (!strncasecmp(cmdbuf,"SCDN",4)) {
projects / citadel.git / blobdiff