X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=6dba619936c800ab85004676a4f547c02d10d46d;hb=cf934431c7c8c1091b38c0b374f6a3b9293841ca;hp=ee4b5ffcfd08d8a6a187ebce001f6815d25d8c8c;hpb=2d78d3451426d98413c7a4049302aa89fee5990d;p=citadel.git diff --git a/citadel/citserver.c b/citadel/citserver.c index ee4b5ffcf..6dba61993 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -5,10 +5,6 @@ * */ -#ifdef DLL_EXPORT -#define IN_LIBCIT -#endif - #include "sysdep.h" #include #include @@ -30,20 +26,25 @@ # endif #endif +#if HAVE_BACKTRACE +#include +#endif + #include #include +#include #include #include -/* #include */ #include #include #include #include #include +#include #include "citadel.h" #include "server.h" -#include "serv_extensions.h" #include "sysdep_decls.h" +#include "threads.h" #include "citserver.h" #include "config.h" #include "database.h" @@ -56,19 +57,68 @@ #include "file_ops.h" #include "policy.h" #include "control.h" -#include "tools.h" +#include "euidindex.h" #ifndef HAVE_SNPRINTF #include "snprintf.h" #endif +#include "ctdl_module.h" + + struct CitContext *ContextList = NULL; struct CitContext* next_session = NULL; char *unique_session_numbers; int ScheduledShutdown = 0; -int do_defrag = 0; time_t server_startup_time; -char pid_file_name[PATH_MAX]; +int panic_fd; + +/** + * \brief print the actual stack frame. + */ +void cit_backtrace(void) +{ +#ifdef HAVE_BACKTRACE + void *stack_frames[50]; + size_t size, i; + char **strings; + + + size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*)); + strings = backtrace_symbols(stack_frames, size); + for (i = 0; i < size; i++) { + if (strings != NULL) + lprintf(1, "%s\n", strings[i]); + else + lprintf(1, "%p\n", stack_frames[i]); + } + free(strings); +#endif +} + +/** + * \brief print the actual stack frame. + */ +void cit_panic_backtrace(int SigNum) +{ +#ifdef HAVE_BACKTRACE + void *stack_frames[10]; + size_t size, i; + char **strings; + + printf("caught signal 11\n"); + size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*)); + strings = backtrace_symbols(stack_frames, size); + for (i = 0; i < size; i++) { + if (strings != NULL) + lprintf(1, "%s\n", strings[i]); + else + lprintf(1, "%p\n", stack_frames[i]); + } + free(strings); +#endif + exit(-1); +} /* * Various things that need to be initialized at startup @@ -78,30 +128,21 @@ void master_startup(void) { unsigned int seed; FILE *urandom; struct ctdlroom qrbuf; - FILE *pidfile_fp; lprintf(CTDL_DEBUG, "master_startup() started\n"); time(&server_startup_time); - /* pid file. If we go FSSTND this should end up in 'localstatedir' */ - snprintf(pid_file_name, sizeof pid_file_name, "./citadel.pid"); - pidfile_fp = fopen(pid_file_name, "w"); - if (pidfile_fp != NULL) { - fprintf(pidfile_fp, "%d\n", (int)getpid()); - fclose(pidfile_fp); - } - lprintf(CTDL_INFO, "Opening databases\n"); open_databases(); - if (do_defrag) { - defrag_databases(); - } - + ctdl_thread_internal_init_tsd(); + + CtdlThreadAllocTSD(); + check_ref_counts(); lprintf(CTDL_INFO, "Creating base rooms (if necessary)\n"); - create_room(BASEROOM, 0, "", 0, 1, 0, VIEW_BBS); + create_room(config.c_baseroom, 0, "", 0, 1, 0, VIEW_BBS); create_room(AIDEROOM, 3, "", 0, 1, 0, VIEW_BBS); create_room(SYSCONFIGROOM, 3, "", 0, 1, 0, VIEW_BBS); create_room(config.c_twitroom, 0, "", 0, 1, 0, VIEW_BBS); @@ -112,6 +153,12 @@ void master_startup(void) { lputroom(&qrbuf); } + /* Aide needs to be public postable, else we're not RFC conformant. */ + if (lgetroom(&qrbuf, AIDEROOM) == 0) { + qrbuf.QRflags2 |= QR2_SMTP_PUBLIC; + lputroom(&qrbuf); + } + lprintf(CTDL_INFO, "Seeding the pseudo-random number generator...\n"); urandom = fopen("/dev/urandom", "r"); if (urandom != NULL) { @@ -148,76 +195,57 @@ void master_cleanup(int exitcode) { (*fcn->h_function_pointer)(); } - /* Close databases */ - lprintf(CTDL_INFO, "Closing databases\n"); - close_databases(); + /* Close the AdjRefCount queue file */ + AdjRefCount(-1, 0); /* Do system-dependent stuff */ sysdep_master_cleanup(); + + /* Close databases */ + lprintf(CTDL_INFO, "Closing databases\n"); + close_databases(); #ifdef DEBUG_MEMORY_LEAKS dump_heap(); #endif + /* If the operator requested a halt but not an exit, halt here. */ + if (shutdown_and_halt) { + lprintf(CTDL_NOTICE, "citserver: Halting server without exiting.\n"); + fflush(stdout); fflush(stderr); + while(1) { + sleep(32767); + } + } + + release_control(); + /* Now go away. */ lprintf(CTDL_NOTICE, "citserver: Exiting with status %d\n", exitcode); fflush(stdout); fflush(stderr); - - unlink(pid_file_name); + + if (restart_server != 0) + exit(1); exit(exitcode); } -/* - * 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(CTDL_DEBUG, "Deallocating user data symbol %ld\n", - con->FirstSessData->sym_id); - if (con->FirstSessData->sym_data != NULL) - free(con->FirstSessData->sym_data); - ptr = con->FirstSessData->next; - free(con->FirstSessData); - con->FirstSessData = ptr; - } - end_critical_section(S_SESSION_TABLE); -} - - - /* - * Terminate a session and remove its context data structure. + * Terminate a session. */ void RemoveContext (struct CitContext *con) { if (con==NULL) { - lprintf(CTDL_ERR, "WARNING: RemoveContext() called with NULL!\n"); + lprintf(CTDL_ERR, + "WARNING: RemoveContext() called with NULL!\n"); return; } - lprintf(CTDL_DEBUG, "RemoveContext() called\n"); - - /* Remove the context from the global context list. This needs - * to get done FIRST to avoid concurrency problems. It is *vitally* - * important to keep num_sessions accurate!! - */ - lprintf(CTDL_DEBUG, "Removing context for session %d\n", con->cs_pid); - begin_critical_section(S_SESSION_TABLE); - if (con->prev) con->prev->next = con->next; else ContextList = con->next; - if (con->next) con->next->prev = con->prev; - --num_sessions; - end_critical_section(S_SESSION_TABLE); + lprintf(CTDL_DEBUG, "RemoveContext() session %d\n", con->cs_pid); /* Run any cleanup routines registered by loadable modules. - * Note 1: This must occur *before* deallocate_user_data() because the - * cleanup functions might touch dynamic session data. - * Note 2: We have to "become_session()" because the cleanup functions - * might make references to "CC" assuming it's the right one. + * Note: We have to "become_session()" because the cleanup functions + * might make references to "CC" assuming it's the right one. */ become_session(con); PerformSessionHooks(EVT_STOP); @@ -227,21 +255,12 @@ void RemoveContext (struct CitContext *con) lprintf(CTDL_DEBUG, "Calling logout(%d)\n", con->cs_pid); logout(con); - unlink(con->temp); lprintf(CTDL_NOTICE, "[%3d] Session ended.\n", con->cs_pid); - /* Deallocate any user-data attached to this session */ - deallocate_user_data(con); - /* If the client is still connected, blow 'em away. */ lprintf(CTDL_DEBUG, "Closing socket %d\n", con->client_socket); close(con->client_socket); - /* This is where we used to check for scheduled shutdowns. */ - - /* Free up the memory used by this context */ - free(con); - lprintf(CTDL_DEBUG, "Done with RemoveContext()\n"); } @@ -249,81 +268,6 @@ void RemoveContext (struct CitContext *con) -/* - * 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(CTDL_ERR, "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(CTDL_DEBUG, "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 = malloc(sizeof(struct CtdlSessData)); - ptr->sym_id = requested_sym; - ptr->sym_data = malloc(num_bytes); - memset(ptr->sym_data, 0, num_bytes); - - begin_critical_section(S_SESSION_TABLE); - ptr->next = CC->FirstSessData; - CC->FirstSessData = ptr; - end_critical_section(S_SESSION_TABLE); - - lprintf(CTDL_DEBUG, "CtdlAllocUserData(%ld) finished\n", requested_sym); -} - - -/* - * Change the size of a buffer allocated with CtdlAllocUserData() - */ -void CtdlReallocUserData(unsigned long requested_sym, size_t num_bytes) -{ - struct CtdlSessData *ptr; - - for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next) { - if (ptr->sym_id == requested_sym) { - ptr->sym_data = realloc(ptr->sym_data, num_bytes); - return; - } - } - - lprintf(CTDL_ERR, "CtdlReallocUserData() ERROR: symbol %ld not found!\n", - requested_sym); -} - - - - - - /* * cmd_info() - tell the client about this server */ @@ -335,7 +279,7 @@ void cmd_info(void) { 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_site_location); cprintf("%s\n", config.c_sysadm); cprintf("%d\n", SERVER_TYPE); cprintf("%s\n", config.c_moreprompt); @@ -343,11 +287,30 @@ void cmd_info(void) { cprintf("1\n"); /* 1 = we support the extended paging options */ cprintf("%s\n", CC->cs_nonce); cprintf("1\n"); /* 1 = yes, this system supports the QNOP command */ + #ifdef HAVE_LDAP cprintf("1\n"); /* 1 = yes, this server is LDAP-enabled */ #else cprintf("0\n"); /* 1 = no, this server is not LDAP-enabled */ #endif + + if (config.c_auth_mode == AUTHMODE_NATIVE) { + cprintf("%d\n", config.c_disable_newu); + } + else { + cprintf("1\n"); /* "create new user" does not work with non-native auth modes */ + } + + cprintf("%s\n", config.c_default_cal_zone); + + /* Output load averages */ + cprintf("%f\n", CtdlThreadLoadAvg); + cprintf("%f\n", CtdlThreadWorkerAvg); + cprintf("%d\n", CtdlThreadGetCount()); + + cprintf("1\n"); /* yes, Sieve mail filtering is supported */ + cprintf("%d\n", config.c_enable_fulltext); + cprintf("000\n"); } @@ -390,15 +353,24 @@ void cmd_time(void) */ int is_public_client(void) { - char buf[SIZ]; - char addrbuf[SIZ]; + char buf[1024]; + char addrbuf[1024]; FILE *fp; int i; + char *public_clientspos; + char *public_clientsend; + char *paddr = NULL; struct stat statbuf; static time_t pc_timestamp = 0; static char public_clients[SIZ]; + static char public_clients_file[SIZ]; + +#define LOCALHOSTSTR "127.0.0.1" -#define PUBLIC_CLIENTS "./public_clients" + snprintf(public_clients_file, + sizeof public_clients_file, + "%s/public_clients", + ctdl_etc_dir); /* * Check the time stamp on the public_clients file. If it's been @@ -406,38 +378,56 @@ int is_public_client(void) * time we've been through the loop), read its contents and learn * the IP addresses of the listed hosts. */ - if (stat(PUBLIC_CLIENTS, &statbuf) != 0) { + if (stat(public_clients_file, &statbuf) != 0) { /* No public_clients file exists, so bail out */ - lprintf(CTDL_WARNING, "Warning: '%s' does not exist\n", PUBLIC_CLIENTS); + lprintf(CTDL_WARNING, "Warning: '%s' does not exist\n", + public_clients_file); return(0); } if (statbuf.st_mtime > pc_timestamp) { begin_critical_section(S_PUBLIC_CLIENTS); - lprintf(CTDL_INFO, "Loading %s\n", PUBLIC_CLIENTS); + lprintf(CTDL_INFO, "Loading %s\n", public_clients_file); - strcpy(public_clients, "127.0.0.1"); + public_clientspos = &public_clients[0]; + public_clientsend = public_clientspos + SIZ; + safestrncpy(public_clientspos, LOCALHOSTSTR, sizeof public_clients); + public_clientspos += sizeof(LOCALHOSTSTR) - 1; + if (hostname_to_dotted_quad(addrbuf, config.c_fqdn) == 0) { - strcat(public_clients, "|"); - strcat(public_clients, addrbuf); + *(public_clientspos++) = '|'; + paddr = &addrbuf[0]; + while (!IsEmptyStr (paddr) && + (public_clientspos < public_clientsend)) + *(public_clientspos++) = *(paddr++); } - fp = fopen("public_clients", "r"); - if (fp != NULL) while (fgets(buf, sizeof buf, fp)!=NULL) { - for (i=0; ibuf && isspace(*ptr)) { + *(ptr--) = 0; + } + if (hostname_to_dotted_quad(addrbuf, buf) == 0) { + *(public_clientspos++) = '|'; + paddr = addrbuf; + while (!IsEmptyStr(paddr) && + (public_clientspos < public_clientsend)){ + *(public_clientspos++) = *(paddr++); + } } } - } fclose(fp); pc_timestamp = time(NULL); end_critical_section(S_PUBLIC_CLIENTS); @@ -446,7 +436,7 @@ int is_public_client(void) lprintf(CTDL_DEBUG, "Checking whether %s is a local or public client\n", CC->cs_addr); for (i=0; ics_addr, addrbuf)) { lprintf(CTDL_DEBUG, "... yes it is.\n"); return(1); @@ -467,8 +457,8 @@ void cmd_iden(char *argbuf) int dev_code; int cli_code; int rev_level; - char desc[SIZ]; - char from_host[SIZ]; + char desc[128]; + char from_host[128]; struct in_addr addr; int do_lookup = 0; @@ -480,11 +470,11 @@ void cmd_iden(char *argbuf) dev_code = extract_int(argbuf,0); cli_code = extract_int(argbuf,1); rev_level = extract_int(argbuf,2); - extract(desc,argbuf,3); + extract_token(desc, argbuf, 3, '|', sizeof desc); safestrncpy(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); + if (num_parms(argbuf)>=5) extract_token(from_host, argbuf, 4, '|', sizeof from_host); CC->cs_clientdev = dev_code; CC->cs_clienttyp = cli_code; @@ -492,7 +482,7 @@ void cmd_iden(char *argbuf) safestrncpy(CC->cs_clientname, desc, sizeof CC->cs_clientname); CC->cs_clientname[31] = 0; - if (strlen(from_host) > 0) { + if (!IsEmptyStr(from_host)) { if (CC->is_local_socket) do_lookup = 1; else if (is_public_client()) do_lookup = 1; } @@ -501,7 +491,7 @@ void cmd_iden(char *argbuf) lprintf(CTDL_DEBUG, "Looking up hostname '%s'\n", from_host); if ((addr.s_addr = inet_addr(from_host)) != -1) { locate_host(CC->cs_host, sizeof CC->cs_host, - NULL, 0, + CC->cs_addr, sizeof CC->cs_addr, &addr); } else { @@ -527,43 +517,76 @@ void cmd_iden(char *argbuf) void cmd_mesg(char *mname) { FILE *mfp; - char targ[SIZ]; - char buf[SIZ]; - char buf2[SIZ]; + char targ[256]; + char buf[256]; + char buf2[256]; char *dirs[2]; + DIR *dp; + struct dirent *d; + + extract_token(buf, mname, 0, '|', sizeof buf); + + dirs[0] = strdup(ctdl_message_dir); + dirs[1] = strdup(ctdl_hlp_dir); + + snprintf(buf2, sizeof buf2, "%s.%d.%d", + buf, CC->cs_clientdev, CC->cs_clienttyp); - extract(buf,mname,0); - - dirs[0]=malloc(64); - dirs[1]=malloc(64); - strcpy(dirs[0],"messages"); - strcpy(dirs[1],"help"); - snprintf(buf2, sizeof buf2, "%s.%d.%d", buf, CC->cs_clientdev, CC->cs_clienttyp); - mesg_locate(targ,sizeof targ,buf2,2,(const char **)dirs); - if (strlen(targ) == 0) { - snprintf(buf2, sizeof buf2, "%s.%d", buf, CC->cs_clientdev); - mesg_locate(targ,sizeof targ,buf2,2,(const char **)dirs); - if (strlen(targ) == 0) { - mesg_locate(targ,sizeof targ,buf,2,(const char **)dirs); - } + /* If the client requested "?" then produce a listing */ + if (!strcmp(buf, "?")) { + cprintf("%d %s\n", LISTING_FOLLOWS, buf); + dp = opendir(dirs[1]); + if (dp != NULL) { + while (d = readdir(dp), d != NULL) { + if (d->d_name[0] != '.') { + cprintf(" %s\n", d->d_name); + } + } + closedir(dp); + } + cprintf("000\n"); + free(dirs[0]); + free(dirs[1]); + return; + } + + /* Otherwise, look for the requested file by name. */ + else { + mesg_locate(targ, sizeof targ, buf2, 2, (const char **)dirs); + if (IsEmptyStr(targ)) { + snprintf(buf2, sizeof buf2, "%s.%d", + buf, CC->cs_clientdev); + mesg_locate(targ, sizeof targ, buf2, 2, + (const char **)dirs); + if (IsEmptyStr(targ)) { + mesg_locate(targ, sizeof targ, buf, 2, + (const char **)dirs); + } + } } + free(dirs[0]); free(dirs[1]); - if (strlen(targ)==0) { - cprintf("%d '%s' not found.\n",ERROR + FILE_NOT_FOUND, mname); + if (IsEmptyStr(targ)) { + cprintf("%d '%s' not found. (Searching in %s and %s)\n", + ERROR + FILE_NOT_FOUND, + mname, + ctdl_message_dir, + ctdl_hlp_dir + ); return; } - mfp = fopen(targ,"r"); + mfp = fopen(targ, "r"); if (mfp==NULL) { cprintf("%d Cannot open '%s': %s\n", ERROR + INTERNAL_ERROR, targ, strerror(errno)); return; } - cprintf("%d %s\n",LISTING_FOLLOWS,buf); + cprintf("%d %s\n", LISTING_FOLLOWS,buf); - while (fgets(buf, (SIZ-1), mfp)!=NULL) { + while (fgets(buf, (sizeof buf - 1), mfp) != NULL) { buf[strlen(buf)-1] = 0; do_help_subst(buf); cprintf("%s\n",buf); @@ -580,8 +603,8 @@ void cmd_mesg(char *mname) void cmd_emsg(char *mname) { FILE *mfp; - char targ[SIZ]; - char buf[SIZ]; + char targ[256]; + char buf[256]; char *dirs[2]; int a; @@ -589,21 +612,22 @@ void cmd_emsg(char *mname) if (CtdlAccessCheck(ac_aide)) return; - extract(buf,mname,0); - for (a=0; acs_flags & CS_CHAT) { - while (strlen(real_room) < 14) + while (strlen(real_room) < 14) { strcat(real_room, " "); - + } strcpy(&real_room[14], ""); } @@ -770,7 +794,8 @@ void cmd_ipgm(char *argbuf) */ if (!CC->is_local_socket) { sleep(5); - cprintf("%d Authentication failed.\n", ERROR + PASSWORD_REQUIRED); + cprintf("%d Authentication failed.\n", + ERROR + PASSWORD_REQUIRED); } else if (secret == config.c_ipgm_secret) { CC->internal_pgm = 1; @@ -780,27 +805,64 @@ void cmd_ipgm(char *argbuf) } else { sleep(5); - cprintf("%d Authentication failed.\n", ERROR + PASSWORD_REQUIRED); + cprintf("%d Authentication failed.\n", + ERROR + PASSWORD_REQUIRED); lprintf(CTDL_ERR, "Warning: ipgm authentication failed.\n"); CC->kill_me = 1; } - /* Now change the ipgm secret for the next round. */ + /* Now change the ipgm secret for the next round. + * (Disabled because it breaks concurrent scripts. The fact that + * we no longer accept IPGM over the network should be sufficient + * to prevent brute-force attacks. If you don't agree, uncomment + * this block.) get_config(); config.c_ipgm_secret = rand(); put_config(); + */ } /* * Shut down the server */ -void cmd_down(void) { +void cmd_down(char *argbuf) { + char *Reply ="%d Shutting down server. Goodbye.\n"; if (CtdlAccessCheck(ac_aide)) return; - cprintf("%d Shutting down server. Goodbye.\n", CIT_OK); - time_to_die = 1; + if (!IsEmptyStr(argbuf)) + { + int state = CIT_OK; + restart_server = extract_int(argbuf, 0); + + if (restart_server > 0) + Reply = "%d Restarting server. See you soon.\n"; + if ((restart_server > 0) && !running_as_daemon) + { + lprintf(CTDL_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n"); + Reply = "%d Warning, not running in deamon mode. maybe we will come up again, but don't lean on it.\n"; + state = ERROR; + } + cprintf(Reply, state); + } + else + { + cprintf(Reply, CIT_OK + SERVER_SHUTTING_DOWN); + } + CtdlThreadStopAll(); +} + +/* + * Halt the server without exiting the server process. + */ +void cmd_halt(void) { + + if (CtdlAccessCheck(ac_aide)) return; + + cprintf("%d Halting server. Goodbye.\n", CIT_OK); + CtdlThreadStopAll(); + shutdown_and_halt = 1; } /* @@ -809,14 +871,29 @@ void cmd_down(void) { void cmd_scdn(char *argbuf) { int new_state; + int state = CIT_OK; + char *Reply = "%d %d\n"; if (CtdlAccessCheck(ac_aide)) return; new_state = extract_int(argbuf, 0); + if ((new_state == 2) || (new_state == 3)) + { + restart_server = 1; + if (!running_as_daemon) + { + lprintf(CTDL_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n"); + Reply = "%d %d Warning, not running in deamon mode. maybe we will come up again, but don't lean on it.\n"; + state = ERROR; + } + + restart_server = extract_int(argbuf, 0); + new_state -= 2; + } if ((new_state == 0) || (new_state == 1)) { ScheduledShutdown = new_state; } - cprintf("%d %d\n", CIT_OK, ScheduledShutdown); + cprintf(Reply, state, ScheduledShutdown); } @@ -859,7 +936,7 @@ void generate_nonce(struct CitContext *con) { */ void begin_session(struct CitContext *con) { - int len; + socklen_t len; struct sockaddr_in sin; /* @@ -875,23 +952,22 @@ void begin_session(struct CitContext *con) strcpy(con->lastcmdname, " "); strcpy(con->cs_clientname, "(unknown)"); strcpy(con->curr_user, NLI); - strcpy(con->net_node,""); - strcpy(con->fake_username, ""); - strcpy(con->fake_postname, ""); - strcpy(con->fake_hostname, ""); - strcpy(con->fake_roomname, ""); + *con->net_node = '\0'; + *con->fake_username = '\0'; + *con->fake_hostname = '\0'; + *con->fake_roomname = '\0'; generate_nonce(con); - safestrncpy(con->temp, tmpnam(NULL), sizeof con->temp); safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host); safestrncpy(con->cs_addr, "", sizeof con->cs_addr); con->cs_host[sizeof con->cs_host - 1] = 0; len = sizeof sin; if (!CC->is_local_socket) { - if (!getpeername(con->client_socket, - (struct sockaddr *) &sin, &len)) /* should be socklen_t but doesn't work on Macintosh */ + if (!getpeername(con->client_socket, (struct sockaddr *) &sin, &len)) { locate_host(con->cs_host, sizeof con->cs_host, con->cs_addr, sizeof con->cs_addr, - &sin.sin_addr); + &sin.sin_addr + ); + } } else { strcpy(con->cs_host, ""); @@ -899,13 +975,18 @@ void begin_session(struct CitContext *con) con->cs_flags = 0; con->upload_type = UPL_FILE; con->dl_is_net = 0; - con->FirstSessData = NULL; con->nologin = 0; - if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions)) + if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions)) { con->nologin = 1; + } - lprintf(CTDL_NOTICE, "Session started.\n"); + if (!CC->is_local_socket) { + lprintf(CTDL_NOTICE, "Session started from %s [%s].\n", con->cs_host, con->cs_addr); + } + else { + lprintf(CTDL_NOTICE, "Session started via local socket.\n"); + } /* Run any session startup routines registered by loadable modules */ PerformSessionHooks(EVT_START); @@ -914,10 +995,11 @@ void begin_session(struct CitContext *con) void citproto_begin_session() { if (CC->nologin==1) { - cprintf("%d %s: Too many users are already online " - "(maximum is %d)\n", + cprintf("%d %s: Too many users are already online (maximum is %d)\n", ERROR + MAX_SESSIONS_EXCEEDED, - config.c_nodename, config.c_maxsessions); + config.c_nodename, config.c_maxsessions + ); + CC->kill_me = 1; } else { cprintf("%d %s Citadel server ready.\n", @@ -933,12 +1015,16 @@ void citproto_begin_session() { */ void do_command_loop(void) { char cmdbuf[SIZ]; - + const char *old_name = NULL; + + old_name = CtdlThreadName("do_command_loop"); + time(&CC->lastcmd); memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { - lprintf(CTDL_ERR, "Client socket is broken; ending session\n"); + lprintf(CTDL_ERR, "Client disconnected: ending session.\n"); CC->kill_me = 1; + CtdlThreadName(old_name); return; } @@ -955,17 +1041,20 @@ void do_command_loop(void) { /* * Let other clients see the last command we executed, and - * update the idle time, but not NOOP, QNOP, PEXP, or GEXP. + * update the idle time, but not NOOP, QNOP, PEXP, GEXP, RWHO, or TIME. */ if ( (strncasecmp(cmdbuf, "NOOP", 4)) && (strncasecmp(cmdbuf, "QNOP", 4)) && (strncasecmp(cmdbuf, "PEXP", 4)) - && (strncasecmp(cmdbuf, "GEXP", 4)) ) { + && (strncasecmp(cmdbuf, "GEXP", 4)) + && (strncasecmp(cmdbuf, "RWHO", 4)) + && (strncasecmp(cmdbuf, "TIME", 4)) ) { strcpy(CC->lastcmdname, " "); - safestrncpy(CC->lastcmdname, cmdbuf, - sizeof(CC->lastcmdname) ); + safestrncpy(CC->lastcmdname, cmdbuf, sizeof(CC->lastcmdname)); time(&CC->lastidle); } + + CtdlThreadName(cmdbuf); if ((strncasecmp(cmdbuf, "ENT0", 4)) && (strncasecmp(cmdbuf, "MESG", 4)) @@ -974,11 +1063,15 @@ void do_command_loop(void) { CC->cs_flags &= ~CS_POSTING; } - if (!strncasecmp(cmdbuf,"NOOP",4)) { + if (!strncasecmp(cmdbuf, "NOOP", 4)) { cprintf("%d%cok\n", CIT_OK, CtdlCheckExpress() ); } - else if (!strncasecmp(cmdbuf,"QNOP",4)) { + else if (!strncasecmp(cmdbuf, "XYZZY", 5)) { + cprintf("%d Nothing happens.\n", CIT_OK); + } + + else if (!strncasecmp(cmdbuf, "QNOP", 4)) { /* do nothing, this command returns no response */ } @@ -1064,6 +1157,10 @@ void do_command_loop(void) { cmd_rdir(); } + else if (!strncasecmp(cmdbuf,"EUID",4)) { + cmd_euid(&cmdbuf[5]); + } + else if (!strncasecmp(cmdbuf,"MSG0",4)) { cmd_msg0(&cmdbuf[5]); } @@ -1088,6 +1185,10 @@ void do_command_loop(void) { cmd_opna(&cmdbuf[5]); } + else if (!strncasecmp(cmdbuf,"DLAT",4)) { + cmd_dlat(&cmdbuf[5]); + } + else if (!strncasecmp(cmdbuf,"INFO",4)) { cmd_info(); } @@ -1169,7 +1270,7 @@ void do_command_loop(void) { } else if (!strncasecmp(cmdbuf,"LIST",4)) { - cmd_list(); + cmd_list(&cmdbuf[5]); } else if (!strncasecmp(cmdbuf,"CHEK",4)) { @@ -1265,7 +1366,11 @@ void do_command_loop(void) { } else if (!strncasecmp(cmdbuf,"DOWN",4)) { - cmd_down(); + cmd_down(&cmdbuf[5]); + } + + else if (!strncasecmp(cmdbuf,"HALT",4)) { + cmd_halt(); } else if (!strncasecmp(cmdbuf,"SCDN",4)) { @@ -1316,15 +1421,19 @@ void do_command_loop(void) { cmd_isme(&cmdbuf[5]); } + else if (!strncasecmp(cmdbuf, "RENU", 4)) { + cmd_renu(&cmdbuf[5]); + } + else if (!DLoader_Exec_Cmd(cmdbuf)) { - cprintf("%d Unrecognized or unsupported command.\n", - ERROR + CMD_NOT_SUPPORTED); - } + cprintf("%d Unrecognized or unsupported command.\n", ERROR + CMD_NOT_SUPPORTED); + } unbuffer_output(); /* Run any after-each-command routines registered by modules */ PerformSessionHooks(EVT_CMD); + CtdlThreadName(old_name); }