+/* $Id$ */
+#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <limits.h>
+#ifdef HAVE_PTHREAD_H
#include <pthread.h>
+#endif
#include <syslog.h>
#include <dlfcn.h>
#include "citadel.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;
/* Now go away. */
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");
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);
- }
- end_critical_section(S_SESSION_TABLE);
-
/* Deallocate any message list we might have in memory */
- if (CC->msglist != NULL) free(CC->msglist);
-
- /* Purge any stale user/room relationships */
- PurgeStaleRelationships();
+ if (CC->msglist != NULL) phree(CC->msglist);
/* Now get rid of the session and context */
lprintf(7, "cleanup_stuff() calling RemoveContext(%d)\n", CC->cs_pid);
}
+/*
+ * 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, ROOMNAMELEN);
- strncpy(CC->fake_roomname, newroomname, ROOMNAMELEN-1);
- }
- 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);
}
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);
+ }
}
void *context_loop(struct CitContext *con)
{
char cmdbuf[256];
- int session_num;
+ int num_sessions;
/*
* Wedge our way into the context table.
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, "");
strncpy(CC->cs_host, config.c_fqdn, sizeof CC->cs_host);
CC->cs_host[sizeof CC->cs_host - 1] = 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) {
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); FIX */
/*
* 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_asup(&cmdbuf[5]);
}
+ 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",
projects / citadel.git / blobdiff