#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 <limits.h>
#include <syslog.h>
-#include <dlfcn.h>
+/* #include <dlfcn.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"
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);
- }
+}
/*
lprintf(3, "citserver[%3d]: 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);
* cmd_info() - tell the client about this server
*/
void cmd_info(void) {
- cprintf("%d Server info:\n",LISTING_FOLLOWS);
- cprintf("%d\n",CC->cs_pid);
- cprintf("%s\n",config.c_nodename);
- cprintf("%s\n",config.c_humannode);
- cprintf("%s\n",config.c_fqdn);
- cprintf("%s\n",CITADEL);
- cprintf("%d\n",REV_LEVEL);
- cprintf("%s\n",config.c_bbs_city);
- cprintf("%s\n",config.c_sysadm);
- cprintf("%d\n",SERVER_TYPE);
- cprintf("%s\n",config.c_moreprompt);
+ cprintf("%d Server info:\n", LISTING_FOLLOWS);
+ cprintf("%d\n", CC->cs_pid);
+ cprintf("%s\n", config.c_nodename);
+ cprintf("%s\n", config.c_humannode);
+ cprintf("%s\n", config.c_fqdn);
+ cprintf("%s\n", CITADEL);
+ cprintf("%d\n", REV_LEVEL);
+ cprintf("%s\n", config.c_bbs_city);
+ cprintf("%s\n", config.c_sysadm);
+ 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("%s\n", CC->cs_nonce);
cprintf("000\n");
- }
+}
/*
*/
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;
(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);
+ desc,
+ CC->cs_host);
cprintf("%d Ok\n",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);
}
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;
if (CtdlAccessCheck(ac_aide)) return;
cprintf("%d Shutting down server. Goodbye.\n", OK);
- master_cleanup();
+ time_to_die = 1;
}
/*
ScheduledShutdown = new_state;
}
cprintf("%d %d\n", 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", OK, CC->is_async);
+}
+
+
+/*
+ * Generate a "nonce" for APOP-style authentication.
+ *
+ * RFC 1725 et al specify a PID to be placed in front of the nonce.
+ * Quoth BTX: That would be stupid.
+ */
+void generate_nonce(struct CitContext *con) {
+ struct timeval tv;
+
+ memset(con->cs_nonce, NONCE_SIZE, 0);
+ 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);
+}
+
+
/*
strcpy(con->cs_clientname, "(unknown)");
strcpy(con->curr_user, NLI);
strcpy(con->net_node,"");
- con->fake_username[0] = '\0';
- con->fake_postname[0] = '\0';
- con->fake_hostname[0] = '\0';
- con->fake_roomname[0] = '\0';
- memset(con->cs_nonce, NONCE_SIZE, 0);
+ strcpy(con->fake_username, "");
+ strcpy(con->fake_postname, "");
+ strcpy(con->fake_hostname, "");
+ strcpy(con->fake_roomname, "");
+ generate_nonce(con);
snprintf(con->temp, sizeof con->temp, tmpnam(NULL));
safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host);
con->cs_host[sizeof con->cs_host - 1] = 0;
void citproto_begin_session() {
- struct timeval tv;
-
if (CC->nologin==1) {
cprintf("%d %s: Too many users are already online "
"(maximum is %d)\n",
config.c_nodename, config.c_maxsessions);
}
else {
- gettimeofday(&tv, NULL);
- memset(CC->cs_nonce, NONCE_SIZE, 0);
- snprintf(CC->cs_nonce, NONCE_SIZE, "<%d%ld@%s>", rand(), tv.tv_usec, config.c_nodename);
-
-/* RFC 1725 et al specify a PID to be placed in front of the nonce.
- * Quoth BTX: That would be stupid.
- */
-
- cprintf("%d %s Citadel/UX server ready %s.\n",
- OK, config.c_nodename, CC->cs_nonce);
+ cprintf("%d %s Citadel/UX server ready.\n",
+ 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;
}
+ 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);
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