+/* $Id$ */
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include <errno.h>
+#include <limits.h>
#include <pthread.h>
#include <syslog.h>
#include <dlfcn.h>
#include "config.h"
#include "database.h"
#include "housekeeping.h"
-#include "hooks.h"
#include "user_ops.h"
#include "logging.h"
#include "support.h"
#include "msgbase.h"
#include "locate_host.h"
-#include "serv_chat.h"
#include "room_ops.h"
#include "file_ops.h"
+#include "dynloader.h"
+#include "policy.h"
+#include "control.h"
+#include "tools.h"
struct CitContext *ContextList = NULL;
int ScheduledShutdown = 0;
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, 4, "", 0);
+ create_room(config.c_twitroom, 0, "", 0);
}
/*
* Cleanup routine to be called when the server is shutting down.
*/
void master_cleanup(void) {
+ struct CleanupFunctionHook *fcn;
/* Cancel all running sessions */
lprintf(7, "Cancelling running sessions...\n");
kill_session(ContextList->cs_pid);
}
+ /* 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");
close_databases();
sysdep_master_cleanup();
/* Now go away. */
- hook_cleanup();
lprintf(3, "citserver: exiting.\n");
+ fflush(stdout); fflush(stderr);
exit(0);
}
*/
void cleanup_stuff(void *arg)
{
- struct ExpressMessage *emptr;
lprintf(9, "cleanup_stuff() called\n");
rec_log(CL_TERMINATE,CC->curr_user);
unlink(CC->temp);
lprintf(3, "citserver[%3d]: ended.\n",CC->cs_pid);
- hook_end_session(CC->cs_pid);
+
+ /* Run any cleanup routines registered by loadable modules */
+ PerformSessionHooks(EVT_STOP);
+
syslog(LOG_NOTICE,"session %d ended", CC->cs_pid);
/* Deallocate any unsent express messages */
begin_critical_section(S_SESSION_TABLE);
- while (CC->FirstExpressMessage != NULL) {
- emptr = CC->FirstExpressMessage;
- CC->FirstExpressMessage = CC->FirstExpressMessage->next;
- free(emptr);
- }
+ if (CC->ExpressMessages != NULL) phree(CC->ExpressMessages);
end_critical_section(S_SESSION_TABLE);
/* Deallocate any message list we might have in memory */
- if (CC->msglist != NULL) free(CC->msglist);
+ if (CC->msglist != NULL) phree(CC->msglist);
/* Now get rid of the session and context */
- lprintf(7, "cleanup_stuff() is calling RemoveContext(%d)\n", CC->cs_pid);
+ lprintf(7, "cleanup_stuff() calling RemoveContext(%d)\n", CC->cs_pid);
RemoveContext(CC);
/* While we still have an extra thread with no user attached to it,
*/
void set_wtmpsupp(char *newtext)
{
- strncpy(CC->cs_room,newtext,19);
- CC->cs_room[19] = 0;
+ strncpy(CC->cs_room,newtext,sizeof CC->cs_room);
+ CC->cs_room[sizeof CC->cs_room - 1] = 0;
time(&CC->cs_lastupdt);
- hook_room_name(CC->cs_pid, CC->cs_room);
+
+ /* Run any routines registered by loadable modules */
+ PerformSessionHooks(EVT_NEWROOM);
+ }
+
+
+/*
+ * call set_wtmpsupp() with the name of the current room, modified a bit...
+ */
+void set_wtmpsupp_to_current_room() {
+ if (CC->quickroom.QRflags & QR_PRIVATE) {
+ set_wtmpsupp("<private room>");
+ }
+ else if (CC->quickroom.QRflags & QR_MAILBOX) {
+ set_wtmpsupp(&CC->quickroom.QRname[11]);
+ }
+ else {
+ set_wtmpsupp(CC->quickroom.QRname);
+ }
}
+
/*
* cmd_info() - tell the client about this server
*/
cprintf("%d\n",SERVER_TYPE);
cprintf("%s\n",config.c_moreprompt);
cprintf("1\n"); /* 1 = yes, this system supports floors */
+ cprintf("1\n"); /* 1 = we support the extended paging options */
cprintf("000\n");
}
-void cmd_rchg(char *newroomname)
+void cmd_rchg(char *argbuf)
{
- if ((newroomname) && (newroomname[0]))
- {
- bzero(CC->fake_roomname, 20);
- strncpy(CC->fake_roomname, newroomname, 19);
- }
- else
- CC->fake_roomname[0] = '\0';
- cprintf("%d\n",OK);
+ char newroomname[256]; /* set to 256 to prevent buffer overruns <dme>*/
+
+ extract(newroomname, argbuf, 0);
+ newroomname[ROOMNAMELEN] = 0;
+ if (strlen(newroomname) > 0) {
+ strncpy(CC->fake_roomname, newroomname, ROOMNAMELEN);
+ CC->fake_roomname[ROOMNAMELEN - 1] = 0;
+ }
+ else {
+ strcpy(CC->fake_roomname, "");
+ }
+ cprintf("%d OK\n", OK);
}
void cmd_hchg(char *newhostname)
{
if ((newhostname) && (newhostname[0]))
{
- bzero(CC->fake_hostname, 25);
+ memset(CC->fake_hostname, 0, 25);
strncpy(CC->fake_hostname, newhostname, 24);
}
else
- CC->fake_hostname[0] = '\0';
- cprintf("%d\n",OK);
+ strcpy(CC->fake_hostname, "");
+ cprintf("%d OK\n",OK);
}
void cmd_uchg(char *newusername)
if ((newusername) && (newusername[0]))
{
CC->cs_flags &= ~CS_STEALTH;
- bzero(CC->fake_username, 32);
+ memset(CC->fake_username, 0, 32);
if (strncasecmp(newusername, CC->curr_user, strlen(CC->curr_user)))
strncpy(CC->fake_username, newusername, 31);
}
* space otherwise.
*/
char check_express(void) {
- if (CC->FirstExpressMessage == NULL) {
+ if (CC->ExpressMessages == NULL) {
return(' ');
}
else {
rev_level = extract_int(argbuf,2);
extract(desc,argbuf,3);
- strcpy(from_host,config.c_fqdn);
+ strncpy(from_host,config.c_fqdn,sizeof from_host);
+ from_host[sizeof from_host - 1] = 0;
if (num_parms(argbuf)>=5) extract(from_host,argbuf,4);
CC->cs_clientdev = dev_code;
strncpy(CC->cs_host,from_host,24);
CC->cs_host[24] = 0;
}
- set_wtmpsupp(CC->quickroom.QRname);
+ set_wtmpsupp_to_current_room();
syslog(LOG_NOTICE,"client %d/%d/%01d.%02d (%s)\n",
dev_code,
CC->cs_flags = CC->cs_flags|CS_STEALTH;
}
- set_wtmpsupp(CC->quickroom.QRname);
+ set_wtmpsupp_to_current_room();
cprintf("%d Ok\n",OK);
}
extract(buf,mname,0);
- dirs[0]=malloc(64);
- dirs[1]=malloc(64);
+ dirs[0]=mallok(64);
+ dirs[1]=mallok(64);
strcpy(dirs[0],"messages");
strcpy(dirs[1],"help");
mesg_locate(targ,buf,2,dirs);
- free(dirs[0]);
- free(dirs[1]);
+ phree(dirs[0]);
+ phree(dirs[1]);
if (strlen(targ)==0) {
if (buf[a] == '/') buf[a] = '.';
}
- dirs[0]=malloc(64);
- dirs[1]=malloc(64);
+ dirs[0]=mallok(64);
+ dirs[1]=mallok(64);
strcpy(dirs[0],"messages");
strcpy(dirs[1],"help");
mesg_locate(targ,buf,2,dirs);
- free(dirs[0]);
- free(dirs[1]);
+ phree(dirs[0]);
+ phree(dirs[1]);
if (strlen(targ)==0) {
- sprintf(targ, "./help/%s", buf);
+ snprintf(targ, sizeof targ, "./help/%s", buf);
}
mfp = fopen(targ,"w");
{
int session_num;
struct CitContext *ccptr;
+ int session_to_kill = 0;
if (!CC->logged_in) {
cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
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) {
- kill_session(ccptr->cs_pid);
- cprintf("%d Session terminated.\n", OK);
- return;
+ session_to_kill = ccptr->cs_pid;
}
}
+ end_critical_section(S_SESSION_TABLE);
+ lprintf(9, "session_to_kill == %d\n", session_to_kill);
- cprintf("%d No such session.\n", ERROR);
+ if (session_to_kill > 0) {
+ lprintf(9, "calling kill_session()\n");
+ kill_session(session_to_kill);
+ cprintf("%d Session terminated.\n", OK);
+ }
+ else {
+ cprintf("%d No such session.\n", ERROR);
+ }
}
}
-/*
- * Run a server extension (FIX FIX FIX initial hack; polish this up)
- */
-void cmd_extn(char *argbuf) {
- char ExtensionName[256];
- int is_ipgm;
- int pid;
- char portstr[16];
- char ipgm[32];
- char sess[16];
-
-
- extract(ExtensionName, argbuf, 0);
- is_ipgm = extract_int(argbuf, 1);
-
- pid = fork();
- lprintf(9, "fork() returned %d\n", pid);
- if (pid < 0) {
- cprintf("%d fork failed: %s\n",
- ERROR + INTERNAL_ERROR,
- strerror(errno));
- return;
- }
- else if (pid == 0) {
-
- sprintf(portstr, "%d", config.c_port_number);
-
- if (is_ipgm)
- sprintf(ipgm, "%d", config.c_ipgm_secret);
- else
- strcpy(ipgm, "");
-
- sprintf(sess, "%d", CC->cs_pid);
-
- execlp(ExtensionName, ExtensionName,
- "localhost", /* server address */
- portstr, /* port number */
- ipgm, /* ipgm secret */
- CC->usersupp.fullname, /* user name */
- CC->usersupp.password, /* password */
- CC->quickroom.QRname, /* current room */
- sess, /* assoc session id */
- NULL);
-
- lprintf(9, "exec() failed: %s\n", strerror(errno));
- exit(1);
- }
- else {
- cprintf("%d Ok\n", OK);
- }
- }
-
-
-
-
/*
* main context loop
*/
void *context_loop(struct CitContext *con)
{
- void *fcn_handle;
- void (*h_cmd_chat)(char *);
- void (*cmd_pexp)(void);
- void (*cmd_sexp)(char *);
- char *dl_error;
char cmdbuf[256];
- int session_num;
+ int num_sessions;
/*
* Wedge our way into the context table.
/*
* Initialize some variables specific to our context.
*/
- CC->curr_rm = (-1);
CC->logged_in = 0;
CC->internal_pgm = 0;
CC->download_fp = NULL;
CC->upload_fp = NULL;
CC->cs_pid = con->client_socket; /* not necessarily portable */
- CC->FirstExpressMessage = NULL;
+ CC->ExpressMessages = NULL;
CC->msglist = NULL;
CC->num_msgs = 0;
time(&CC->lastcmd);
strcpy(CC->cs_clientname, "(unknown)");
strcpy(CC->curr_user,"");
strcpy(CC->net_node,"");
- sprintf(CC->temp,"/tmp/CitServer.%d.%d", getpid(), CC->cs_pid);
+ snprintf(CC->temp, sizeof CC->temp, "/tmp/CitServer.%d.%d", getpid(), CC->cs_pid);
strcpy(CC->cs_room, "");
- strcpy(CC->cs_host, config.c_fqdn);
+ strncpy(CC->cs_host, config.c_fqdn, sizeof CC->cs_host);
+ CC->cs_host[sizeof CC->cs_host - 1] = 0;
locate_host(CC->cs_host);
CC->cs_flags = 0;
CC->upload_type = UPL_FILE;
CC->dl_is_net = 0;
- session_num = session_count();
+ num_sessions = session_count();
CC->nologin = 0;
- if ((config.c_maxsessions > 0)&&(session_num >= config.c_maxsessions))
+ if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions))
CC->nologin = 1;
if (CC->nologin==1) {
}
lprintf(3, "citserver[%3d]: started.\n", CC->cs_pid);
- hook_start_session(CC->cs_pid);
+
+ /* Run any session startup routines registered by loadable modules */
+ PerformSessionHooks(EVT_START);
+
rec_log(CL_CONNECT, "");
do {
time(&CC->lastcmd);
+ memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
if (client_gets(cmdbuf) < 1) cleanup(EXIT_NULL);
lprintf(5, "citserver[%3d]: %s\n", CC->cs_pid, cmdbuf);
- hook_command_received(CC->cs_pid, cmdbuf);
/*
* Let other clients see the last command we executed, but
cmd_msg3(&cmdbuf[5]);
}
+ else if (!strncasecmp(cmdbuf,"MSG4",4)) {
+ cmd_msg4(&cmdbuf[5]);
+ }
+
+ else if (!strncasecmp(cmdbuf,"OPNA",4)) {
+ cmd_opna(&cmdbuf[5]);
+ }
+
else if (!strncasecmp(cmdbuf,"INFO",4)) {
cmd_info();
}
cmd_ipgm(&cmdbuf[5]);
}
- else if (!strncasecmp(cmdbuf,"CHAT",4))
- {
- syslog(LOG_NOTICE, "Opening chat connection");
- if (!(fcn_handle = dlopen("/usr/bbs/CVS/citadel/serv_chat.so", RTLD_LAZY)))
- {
- dl_error = dlerror();
- syslog(LOG_NOTICE, "WARNING: chat subsystem mod failed to load! (%s)", dl_error);
- exit(1);
- }
-
- h_cmd_chat = dlsym(fcn_handle, "cmd_chat");
- if ((dl_error = dlerror()) != NULL)
- {
- syslog(LOG_NOTICE, "Error: %s", dl_error);
- exit(1);
- }
- (*h_cmd_chat)(&cmdbuf[5]);
- dlclose(fcn_handle);
- if ((dl_error = dlerror()) != NULL)
- {
- syslog(LOG_NOTICE, "dlclose Error: %s", dl_error);
- exit(1);
- }
- }
-
- else if (!strncasecmp(cmdbuf,"PEXP",4))
- {
- if (!(fcn_handle = dlopen("serv_chat.so", RTLD_LAZY)))
- {
- dl_error = dlerror();
- syslog(LOG_NOTICE, "WARNING: chat subsystem mod failed to load! (%s)", dl_error);
- exit(1);
- }
-
- cmd_pexp = dlsym(fcn_handle, "cmd_pexp");
- if ((dl_error = dlerror()) != NULL)
- {
- syslog(LOG_NOTICE, "Error: %s", dl_error);
- exit(1);
- }
- (*cmd_pexp)();
- dlclose(fcn_handle);
- if ((dl_error = dlerror()) != NULL)
- {
- syslog(LOG_NOTICE, "dlclose Error: %s", dl_error);
- exit(1);
- }
- }
- else if (!strncasecmp(cmdbuf,"SEXP",4))
- {
- if (!(fcn_handle = dlopen("serv_chat.so", RTLD_LAZY)))
- {
- dl_error = dlerror();
- syslog(LOG_NOTICE, "WARNING: chat subsystem mod failed to load! (%s)", dl_error);
- exit(1);
- }
-
- cmd_sexp = dlsym(fcn_handle, "cmd_sexp");
- if ((dl_error = dlerror()) != NULL)
- {
- syslog(LOG_NOTICE, "Error: %s", dl_error);
- exit(1);
- }
- (*cmd_sexp)(&cmdbuf[5]);
- dlclose(fcn_handle);
- if ((dl_error = dlerror()) != NULL)
- {
- syslog(LOG_NOTICE, "dlclose Error: %s", dl_error);
- exit(1);
- }
- }
-
else if (!strncasecmp(cmdbuf,"EBIO",4)) {
cmd_ebio();
}
cmd_rchg(&cmdbuf[5]);
}
- else if (!strncasecmp(cmdbuf, "EXTN", 4)) {
- cmd_extn(&cmdbuf[5]);
- }
-
else if (!strncasecmp(cmdbuf, "AGUP", 4)) {
cmd_agup(&cmdbuf[5]);
}
cmd_asup(&cmdbuf[5]);
}
- else {
- cprintf("%d Unrecognized or unsupported command.\n",
- ERROR);
+ else if (!strncasecmp(cmdbuf, "GPEX", 4)) {
+ cmd_gpex(&cmdbuf[5]);
+ }
+
+ else if (!strncasecmp(cmdbuf, "SPEX", 4)) {
+ cmd_spex(&cmdbuf[5]);
}
+ else if (!strncasecmp(cmdbuf, "CONF", 4)) {
+ cmd_conf(&cmdbuf[5]);
+ }
+
+#ifdef DEBUG_MEMORY_LEAKS
+ else if (!strncasecmp(cmdbuf, "LEAK", 4)) {
+ dump_tracked();
+ }
+#endif
+
+ else if (!DLoader_Exec_Cmd(cmdbuf))
+ {
+ cprintf("%d Unrecognized or unsupported command.\n",
+ ERROR);
+ }
+
} while(strncasecmp(cmdbuf, "QUIT", 4));
cleanup(EXIT_NORMAL);
projects / citadel.git / blobdiff