/* $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 <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#include "citadel.h"
#include "server.h"
#include "sysdep_decls.h"
#include "housekeeping.h"
#include "user_ops.h"
#include "logging.h"
-#include "support.h"
#include "msgbase.h"
+#include "support.h"
#include "locate_host.h"
#include "room_ops.h"
#include "file_ops.h"
struct CitContext *ContextList = NULL;
int ScheduledShutdown = 0;
+int do_defrag = 0;
/*
* Various things that need to be initialized at startup
lprintf(7, "Opening databases\n");
open_databases();
+ if (do_defrag)
+ defrag_databases();
+
lprintf(7, "Checking floor reference counts\n");
check_ref_counts();
}
+/*
+ * Free any per-session data allocated by modules or whatever
+ */
+void deallocate_user_data(struct CitContext *con)
+{
+ struct CtdlSessData *ptr;
+
+ begin_critical_section(S_SESSION_TABLE);
+ while (con->FirstSessData != NULL) {
+ lprintf(9, "Deallocating user data symbol %ld\n",
+ con->FirstSessData->sym_id);
+ if (con->FirstSessData->sym_data != NULL)
+ phree(con->FirstSessData->sym_data);
+ ptr = con->FirstSessData->next;
+ phree(con->FirstSessData);
+ con->FirstSessData = ptr;
+ }
+ end_critical_section(S_SESSION_TABLE);
+}
+
+
+
+
/*
* Gracefully terminate the session and thread.
* (This is called as a cleanup handler by the thread library.)
*/
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;
- phree(emptr);
- }
- end_critical_section(S_SESSION_TABLE);
-
- /* Deallocate any message list we might have in memory */
- if (CC->msglist != NULL) phree(CC->msglist);
+ /* Deallocate any user-data attached to this session */
+ deallocate_user_data(CC);
/* Now get rid of the session and context */
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,
- * take the opportunity to do some housekeeping before exiting.
- */
- do_housekeeping();
+ /* Wake up the housekeeping thread */
+ enter_housekeeping_cmd("SCHED_SHUTDOWN");
+ }
+
+
+/*
+ * Get a dynamic symbol number for per-session user data.
+ * This API call should be made only ONCE per symbol per citserver run.
+ */
+int CtdlGetDynamicSymbol()
+{
+ static unsigned int next_symbol = SYM_MAX;
+ return ++next_symbol;
+}
+
+
+
+/*
+ * Return a pointer to some generic per-session user data.
+ * (This function returns NULL if the requested symbol is not allocated.)
+ *
+ * NOTE: we use critical sections for allocating and de-allocating these,
+ * but not for locating one.
+ */
+void *CtdlGetUserData(unsigned long requested_sym)
+{
+ struct CtdlSessData *ptr;
+
+ for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next)
+ if (ptr->sym_id == requested_sym)
+ return(ptr->sym_data);
+
+ lprintf(2, "ERROR! CtdlGetUserData(%ld) symbol not allocated\n",
+ requested_sym);
+ return NULL;
+}
+
+
+/*
+ * Allocate some generic per-session user data.
+ */
+void CtdlAllocUserData(unsigned long requested_sym, size_t num_bytes)
+{
+ struct CtdlSessData *ptr;
+
+ lprintf(9, "CtdlAllocUserData(%ld) called\n", requested_sym);
+
+ /* Fail silently if the symbol is already registered. */
+ for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next) {
+ if (ptr->sym_id == requested_sym) {
+ return;
+ }
}
+ /* Grab us some memory! Dem's good eatin' !! */
+ ptr = mallok(sizeof(struct CtdlSessData));
+ ptr->sym_id = requested_sym;
+ ptr->sym_data = mallok(num_bytes);
+
+ begin_critical_section(S_SESSION_TABLE);
+ ptr->next = CC->FirstSessData;
+ CC->FirstSessData = ptr;
+ end_critical_section(S_SESSION_TABLE);
+
+ lprintf(9, "CtdlAllocUserData(%ld) finished\n", requested_sym);
+}
+
+
+
+
/*
* set_wtmpsupp() - alter the session listing
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 *argbuf)
{
- char newroomname[ROOMNAMELEN];
+ 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;
{
if ((newhostname) && (newhostname[0]))
{
- bzero(CC->fake_hostname, 25);
+ memset(CC->fake_hostname, 0, 25);
strncpy(CC->fake_hostname, newhostname, 24);
}
else
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);
}
cprintf("%d %ld\n", OK, tv);
}
+/*
+ * Check whether two hostnames match.
+ * "Realname" should be an actual name of a client that is trying to connect;
+ * "testname" should be the value we are comparing it with. The idea is that we
+ * want to compare with both the abbreviated and fully-qualified versions of
+ * "testname;" some people define "localhost" as "localhost.foo.com," etc.
+ */
+static int hostnames_match(const char *realname, const char *testname) {
+ struct hostent *he;
+ int retval = 0;
+
+ if (!strcasecmp(realname, testname))
+ return 1;
+
+#ifdef HAVE_NONREENTRANT_NETDB
+ begin_critical_section(S_NETDB);
+#endif
+
+ if ((he = gethostbyname(testname)) != NULL)
+ if (!strcasecmp(realname, he->h_name))
+ retval = 1;
+
+#ifdef HAVE_NONREENTRANT_NETDB
+ end_critical_section(S_NETDB);
+#endif
+
+ return retval;
+ }
+
/*
* check a hostname against the public_clients file
*/
char buf[256];
FILE *fp;
- if (!strcasecmp(where,"localhost")) return(1);
- if (!strcasecmp(where,config.c_fqdn)) return(1);
+ if (hostnames_match(where,"localhost")) return(1);
+ if (hostnames_match(where,config.c_fqdn)) return(1);
fp = fopen("public_clients","r");
if (fp == NULL) return(0);
while (fgets(buf,256,fp)!=NULL) {
while (isspace((buf[strlen(buf)-1])))
buf[strlen(buf)-1] = 0;
- if (!strcasecmp(buf,where)) {
+ if (hostnames_match(where,buf)) {
fclose(fp);
return(1);
}
int rev_level;
char desc[256];
char from_host[256];
+ struct in_addr addr;
if (num_parms(argbuf)<4) {
cprintf("%d usage error\n",ERROR);
strncpy(CC->cs_clientname,desc,31);
CC->cs_clientname[31] = 0;
+ lprintf(9, "Looking up hostname\n");
if ((strlen(from_host)>0) &&
(is_public_client(CC->cs_host))) {
- strncpy(CC->cs_host,from_host,24);
- CC->cs_host[24] = 0;
+ if (inet_aton(from_host, &addr))
+ locate_host(CC->cs_host, &addr);
+ else {
+ strncpy(CC->cs_host,from_host,24);
+ CC->cs_host[24] = 0;
+ }
}
+
+ lprintf(9, "Setting wtmpsupp\n");
set_wtmpsupp_to_current_room();
syslog(LOG_NOTICE,"client %d/%d/%01d.%02d (%s)\n",
char un[40], room[40], host[40], flags[5];
aide = CC->usersupp.axlevel >= 6;
- cprintf("%d\n",LISTING_FOLLOWS);
+ cprintf("%d%c \n", LISTING_FOLLOWS, check_express() );
for (cptr = ContextList; cptr != NULL; cptr = cptr->next)
{
}
}
+
+ /* Now it's magic time. Before we finish, call any EVT_RWHO hooks
+ * so that external paging modules such as serv_icq can add more
+ * content to the Wholist.
+ */
+ PerformSessionHooks(EVT_RWHO);
cprintf("000\n");
}
}
else {
cprintf("%d Authentication failed.\n",ERROR);
+ lprintf(3, "Warning: ipgm authentication failed.\n");
}
}
*/
void cmd_down(void) {
if (!CC->logged_in) {
- cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
+ cprintf("%d Not logged in.\n", ERROR+NOT_LOGGED_IN);
return;
}
void *context_loop(struct CitContext *con)
{
char cmdbuf[256];
- int num_sessions;
+ int num_sessions, len;
+ struct sockaddr_in sin;
/*
* Wedge our way into the context table.
CC->upload_fp = NULL;
CC->cs_pid = con->client_socket; /* not necessarily portable */
CC->FirstExpressMessage = NULL;
- CC->msglist = NULL;
- CC->num_msgs = 0;
time(&CC->lastcmd);
time(&CC->lastidle);
strcpy(CC->lastcmdname, " ");
strcpy(CC->cs_clientname, "(unknown)");
- strcpy(CC->curr_user,"");
+ strcpy(CC->curr_user,"(not logged in)");
strcpy(CC->net_node,"");
- snprintf(CC->temp, sizeof CC->temp, "/tmp/CitServer.%d.%d", getpid(), CC->cs_pid);
- strcpy(CC->cs_room, "");
+ snprintf(CC->temp, sizeof CC->temp, tmpnam(NULL));
+ strcpy(CC->cs_room, "(no room)");
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);
+ len = sizeof sin;
+ if (!getpeername(CC->client_socket, (struct sockaddr *) &sin, &len))
+ locate_host(CC->cs_host, &sin.sin_addr);
CC->cs_flags = 0;
CC->upload_type = UPL_FILE;
CC->dl_is_net = 0;
+ CC->FirstSessData = NULL;
num_sessions = session_count();
CC->nologin = 0;
do {
time(&CC->lastcmd);
- bzero(cmdbuf, sizeof cmdbuf); /* Clear it, just in case */
+ 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);
/*
- * Let other clients see the last command we executed, but
- * exclude NOOP because that would be boring.
+ * Let other clients see the last command we executed, and
+ * update the idle time, but not NOOP, PEXP, or GEXP.
*/
- if (strncasecmp(cmdbuf, "NOOP", 4)) {
+ if ( (strncasecmp(cmdbuf, "NOOP", 4))
+ && (strncasecmp(cmdbuf, "PEXP", 4))
+ && (strncasecmp(cmdbuf, "GEXP", 4)) ) {
strcpy(CC->lastcmdname, " ");
strncpy(CC->lastcmdname, cmdbuf, 4);
time(&CC->lastidle);
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_gnur();
}
- else if (!strncasecmp(cmdbuf,"GREG",4)) {
- cmd_greg(&cmdbuf[5]);
- }
-
else if (!strncasecmp(cmdbuf,"VALI",4)) {
cmd_vali(&cmdbuf[5]);
}
cmd_list();
}
- else if (!strncasecmp(cmdbuf,"REGI",4)) {
- cmd_regi();
- }
-
else if (!strncasecmp(cmdbuf,"CHEK",4)) {
cmd_chek();
}
ERROR);
}
+ /* Run any after-each-command outines registered by modules */
+ PerformSessionHooks(EVT_CMD);
+
} while(strncasecmp(cmdbuf, "QUIT", 4));
cleanup(EXIT_NORMAL);
projects / citadel.git / blobdiff