*
*/
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
#include <signal.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <ctype.h>
#include <string.h>
#include <errno.h>
#include <netdb.h>
#include <sys/types.h>
#include <sys/socket.h>
-#include <sys/time.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include "citadel.h"
#include "server.h"
+#include "dynloader.h"
#include "sysdep_decls.h"
#include "citserver.h"
#include "config.h"
#include "locate_host.h"
#include "room_ops.h"
#include "file_ops.h"
-#include "dynloader.h"
#include "policy.h"
#include "control.h"
#include "tools.h"
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+
struct CitContext *ContextList = NULL;
char *unique_session_numbers;
int ScheduledShutdown = 0;
int do_defrag = 0;
+/* These are commented out. Why do we need them? They're defined in time.h
+ * anyway, and declaring them again here makes FreeBSD barf on it.
+extern long int timezone;
+extern int daylight;
+ */
+
/*
* Various things that need to be initialized at startup
*/
void master_startup(void) {
struct timeval tv;
+ lprintf(9, "master_startup() started\n");
lprintf(7, "Opening databases\n");
open_databases();
- if (do_defrag)
+ if (do_defrag) {
defrag_databases();
+ }
- lprintf(7, "Checking floor reference counts\n");
check_ref_counts();
lprintf(7, "Creating base rooms (if necessary)\n");
- create_room(BASEROOM, 0, "", 0);
- create_room(AIDEROOM, 3, "", 0);
- create_room(SYSCONFIGROOM, 3, "", 0);
- create_room(config.c_twitroom, 0, "", 0);
+ create_room(BASEROOM, 0, "", 0, 1);
+ create_room(AIDEROOM, 3, "", 0, 1);
+ create_room(SYSCONFIGROOM, 3, "", 0, 1);
+ create_room(config.c_twitroom, 0, "", 0, 1);
-/* Seed the PRNG */
-
lprintf(7, "Seeding the pseudo-random number generator...\n");
gettimeofday(&tv, NULL);
srand(tv.tv_usec);
+ lprintf(9, "master_startup() finished\n");
}
+
+
/*
* Cleanup routine to be called when the server is shutting down.
+ * WARNING: It's no longer safe to call this function to force a shutdown.
+ * Instead, set time_to_die = 1.
*/
void master_cleanup(void) {
struct CleanupFunctionHook *fcn;
- /* Cancel all running sessions */
- lprintf(7, "Cancelling running sessions...\n");
-
-/* FIXME do something here
- while (ContextList != NULL) {
- }
- */
-
/* Run any cleanup routines registered by loadable modules */
for (fcn = CleanupHookTable; fcn != NULL; fcn = fcn->next) {
(*fcn->h_function_pointer)();
- }
+ }
/* Close databases */
lprintf(7, "Closing databases\n");
lprintf(3, "citserver: exiting.\n");
fflush(stdout); fflush(stderr);
exit(0);
- }
+}
/*
rec_log(CL_TERMINATE, con->curr_user);
unlink(con->temp);
- lprintf(3, "citserver[%3d]: ended.\n", con->cs_pid);
+ lprintf(3, "[%3d] Session ended.\n", con->cs_pid);
- syslog(LOG_NOTICE,"session %d ended", con->cs_pid);
+ syslog(LOG_NOTICE,"session %d: ended", con->cs_pid);
/* Deallocate any user-data attached to this session */
deallocate_user_data(con);
lprintf(7, "Closing socket %d\n", con->client_socket);
close(con->client_socket);
- /* Tell the housekeeping thread to check to see if this is the time
- * to initiate a scheduled shutdown event.
- */
- enter_housekeeping_cmd("SCHED_SHUTDOWN");
+ /* This is where we used to check for scheduled shutdowns. */
/* Free up the memory used by this context */
phree(con);
time_t tv;
tv = time(NULL);
+ localtime(&tv);
- cprintf("%d %ld\n", OK, tv);
+ cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, daylight);
}
/*
*/
int is_public_client(char *where)
{
- char buf[256];
+ char buf[SIZ];
FILE *fp;
lprintf(9, "Checking whether %s is a public client\n", where);
fp = fopen("public_clients","r");
if (fp == NULL) return(0);
- while (fgets(buf,256,fp)!=NULL) {
+ while (fgets(buf, sizeof buf, fp)!=NULL) {
while (isspace((buf[strlen(buf)-1])))
buf[strlen(buf)-1] = 0;
if (hostnames_match(where,buf)) {
int dev_code;
int cli_code;
int rev_level;
- char desc[256];
- char from_host[256];
+ char desc[SIZ];
+ char from_host[SIZ];
struct in_addr addr;
int do_lookup = 0;
if (do_lookup) {
lprintf(9, "Looking up hostname '%s'\n", from_host);
if ((addr.s_addr = inet_addr(from_host)) != -1) {
- locate_host(CC->cs_host, &addr);
+ locate_host(CC->cs_host, sizeof CC->cs_host, &addr);
}
else {
safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host);
- CC->cs_host[24] = 0;
+ CC->cs_host[sizeof CC->cs_host - 1] = 0;
}
}
(rev_level % 100),
desc);
- syslog(LOG_NOTICE,"client %d/%d/%01d.%02d (%s)\n",
+ syslog(LOG_NOTICE,"session %d: client %d/%d/%01d.%02d (%s) from %s\n",
+ CC->cs_pid,
dev_code,
cli_code,
(rev_level / 100),
(rev_level % 100),
- desc);
- cprintf("%d Ok\n",OK);
+ desc,
+ CC->cs_host);
+ cprintf("%d Ok\n",CIT_OK);
}
void cmd_mesg(char *mname)
{
FILE *mfp;
- char targ[256];
- char buf[256];
+ char targ[SIZ];
+ char buf[SIZ];
char *dirs[2];
extract(buf,mname,0);
dirs[1]=mallok(64);
strcpy(dirs[0],"messages");
strcpy(dirs[1],"help");
- mesg_locate(targ,buf,2,dirs);
+ mesg_locate(targ,sizeof targ,buf,2,(const char **)dirs);
phree(dirs[0]);
phree(dirs[1]);
}
cprintf("%d %s\n",LISTING_FOLLOWS,buf);
- while (fgets(buf,255,mfp)!=NULL) {
+ while (fgets(buf, (SIZ-1), mfp)!=NULL) {
buf[strlen(buf)-1] = 0;
do_help_subst(buf);
cprintf("%s\n",buf);
void cmd_emsg(char *mname)
{
FILE *mfp;
- char targ[256];
- char buf[256];
+ char targ[SIZ];
+ char buf[SIZ];
char *dirs[2];
int a;
dirs[1]=mallok(64);
strcpy(dirs[0],"messages");
strcpy(dirs[1],"help");
- mesg_locate(targ,buf,2,dirs);
+ mesg_locate(targ,sizeof targ,buf,2,(const char**)dirs);
phree(dirs[0]);
phree(dirs[1]);
int session_num;
struct CitContext *ccptr;
int found_it = 0;
-
- if (CtdlAccessCheck(ac_aide)) return;
+ int allowed = 0;
session_num = extract_int(cmdbuf, 0);
if (session_num == CC->cs_pid) {
cprintf("%d You can't kill your own session.\n", ERROR);
return;
- }
+ }
lprintf(9, "Locating session to kill\n");
begin_critical_section(S_SESSION_TABLE);
for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
if (session_num == ccptr->cs_pid) {
- ccptr->kill_me = 1;
found_it = 1;
+ if ((ccptr->usersupp.usernum == CC->usersupp.usernum)
+ || (CC->usersupp.axlevel >= 6)) {
+ allowed = 1;
+ ccptr->kill_me = 1;
+ }
+ else {
+ allowed = 0;
}
}
+ }
end_critical_section(S_SESSION_TABLE);
if (found_it) {
- cprintf("%d Session terminated.\n", OK);
+ if (allowed) {
+ cprintf("%d Session terminated.\n", CIT_OK);
+ }
+ else {
+ cprintf("%d You are not allowed to do that.\n",
+ ERROR + HIGHER_ACCESS_REQUIRED);
}
+ }
else {
cprintf("%d No such session.\n", ERROR);
- }
}
+}
* get the paginator prompt
*/
void cmd_more(void) {
- cprintf("%d %s\n",OK,config.c_moreprompt);
+ cprintf("%d %s\n",CIT_OK,config.c_moreprompt);
}
/*
*/
void cmd_echo(char *etext)
{
- cprintf("%d %s\n",OK,etext);
+ cprintf("%d %s\n",CIT_OK,etext);
}
CC->internal_pgm = 1;
strcpy(CC->curr_user, "<internal program>");
CC->cs_flags = CC->cs_flags|CS_STEALTH;
- cprintf("%d Authenticated as an internal program.\n",OK);
+ cprintf("%d Authenticated as an internal program.\n",CIT_OK);
}
else {
cprintf("%d Authentication failed.\n",ERROR);
if (CtdlAccessCheck(ac_aide)) return;
- cprintf("%d Shutting down server. Goodbye.\n", OK);
- master_cleanup();
+ cprintf("%d Shutting down server. Goodbye.\n", CIT_OK);
+ time_to_die = 1;
}
/*
if ((new_state == 0) || (new_state == 1)) {
ScheduledShutdown = new_state;
}
- cprintf("%d %d\n", OK, ScheduledShutdown);
+ cprintf("%d %d\n", CIT_OK, ScheduledShutdown);
+}
+
+
+/*
+ * Set or unset asynchronous protocol mode
+ */
+void cmd_asyn(char *argbuf)
+{
+ int new_state;
+
+ new_state = extract_int(argbuf, 0);
+ if ((new_state == 0) || (new_state == 1)) {
+ CC->is_async = new_state;
}
+ cprintf("%d %d\n", CIT_OK, CC->is_async);
+}
/*
gettimeofday(&tv, NULL);
memset(con->cs_nonce, NONCE_SIZE, 0);
snprintf(con->cs_nonce, NONCE_SIZE, "<%d%ld@%s>",
- rand(), tv.tv_usec, config.c_fqdn);
+ rand(), (long)tv.tv_usec, config.c_fqdn);
}
if (!CC->is_local_socket) {
if (!getpeername(con->client_socket,
(struct sockaddr *) &sin, &len))
- locate_host(con->cs_host, &sin.sin_addr);
+ locate_host(con->cs_host, sizeof con->cs_host, &sin.sin_addr);
}
else {
strcpy(con->cs_host, "");
if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions))
con->nologin = 1;
- lprintf(3, "citserver[%3d]: started.\n", con->cs_pid);
+ lprintf(3, "Session started.\n");
/* Run any session startup routines registered by loadable modules */
PerformSessionHooks(EVT_START);
}
else {
cprintf("%d %s Citadel/UX server ready.\n",
- OK, config.c_nodename);
+ CIT_OK, config.c_nodename);
}
}
* This loop recognizes all server commands.
*/
void do_command_loop(void) {
- char cmdbuf[256];
+ char cmdbuf[SIZ];
time(&CC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
CC->kill_me = 1;
return;
}
- lprintf(5, "citserver[%3d]: %s\n", CC->cs_pid, cmdbuf);
+ lprintf(5, "Citadel: %s\n", cmdbuf);
/*
* Let other clients see the last command we executed, and
}
if (!strncasecmp(cmdbuf,"NOOP",4)) {
- cprintf("%d%cok\n",OK,CtdlCheckExpress());
+ cprintf("%d%cok\n",CIT_OK,CtdlCheckExpress());
}
else if (!strncasecmp(cmdbuf,"QUIT",4)) {
- cprintf("%d Goodbye.\n",OK);
+ cprintf("%d Goodbye.\n",CIT_OK);
CC->kill_me = 1;
}
+ else if (!strncasecmp(cmdbuf,"ASYN",4)) {
+ cmd_asyn(&cmdbuf[5]);
+ }
+
else if (!strncasecmp(cmdbuf,"LOUT",4)) {
if (CC->logged_in) logout(CC);
- cprintf("%d logged out.\n",OK);
+ cprintf("%d logged out.\n",CIT_OK);
}
else if (!strncasecmp(cmdbuf,"USER",4)) {
cmd_newu(&cmdbuf[5]);
}
+ else if (!strncasecmp(cmdbuf,"CREU",4)) {
+ cmd_creu(&cmdbuf[5]);
+ }
+
else if (!strncasecmp(cmdbuf,"SETP",4)) {
cmd_setp(&cmdbuf[5]);
}
cmd_ent0(&cmdbuf[5]);
}
- else if (!strncasecmp(cmdbuf,"ENT3",4)) {
- cmd_ent3(&cmdbuf[5]);
- }
-
else if (!strncasecmp(cmdbuf,"RINF",4)) {
cmd_rinf();
}
cmd_more();
}
- else if (!strncasecmp(cmdbuf,"NETP",4)) {
- cmd_netp(&cmdbuf[5]);
- }
-
else if (!strncasecmp(cmdbuf,"NDOP",4)) {
cmd_ndop(&cmdbuf[5]);
}
cmd_scdn(&cmdbuf[5]);
}
- else if (!strncasecmp(cmdbuf, "NSET", 4)) {
- cmd_nset(&cmdbuf[5]);
- }
-
else if (!strncasecmp(cmdbuf, "UIMG", 4)) {
cmd_uimg(&cmdbuf[5]);
}
cmd_conf(&cmdbuf[5]);
}
+ else if (!strncasecmp(cmdbuf, "SEEN", 4)) {
+ cmd_seen(&cmdbuf[5]);
+ }
+
#ifdef DEBUG_MEMORY_LEAKS
else if (!strncasecmp(cmdbuf, "LEAK", 4)) {
dump_tracked();
projects / citadel.git / blobdiff