X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=54e57695dad4f037396fe53cbd0cda2c5747a031;hb=02d9dbca862ffa00b2041287596119a54867762c;hp=826e00d2b314dbb7c29dc5757f880c8578fdcf0d;hpb=68d951fe166aeba9cb8b06cae128d3acd4d899e0;p=citadel.git diff --git a/citadel/citserver.c b/citadel/citserver.c index 826e00d2b..54e57695d 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 @@ -32,9 +28,9 @@ #include #include +#include #include #include -/* #include */ #include #include #include @@ -57,16 +53,19 @@ #include "policy.h" #include "control.h" #include "tools.h" +#include "euidindex.h" #ifndef HAVE_SNPRINTF #include "snprintf.h" #endif 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]; /* * Various things that need to be initialized at startup @@ -76,11 +75,20 @@ void master_startup(void) { unsigned int seed; FILE *urandom; struct ctdlroom qrbuf; + FILE *pidfile_fp; - lprintf(9, "master_startup() started\n"); + lprintf(CTDL_DEBUG, "master_startup() started\n"); time(&server_startup_time); - lprintf(7, "Opening databases\n"); + /* 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) { @@ -89,11 +97,11 @@ void master_startup(void) { check_ref_counts(); - lprintf(7, "Creating base rooms (if necessary)\n"); - create_room(BASEROOM, 0, "", 0, 1, 0); - create_room(AIDEROOM, 3, "", 0, 1, 0); - create_room(SYSCONFIGROOM, 3, "", 0, 1, 0); - create_room(config.c_twitroom, 0, "", 0, 1, 0); + lprintf(CTDL_INFO, "Creating base rooms (if necessary)\n"); + 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); /* The "Local System Configuration" room doesn't need to be visible */ if (lgetroom(&qrbuf, SYSCONFIGROOM) == 0) { @@ -101,7 +109,7 @@ void master_startup(void) { lputroom(&qrbuf); } - lprintf(7, "Seeding the pseudo-random number generator...\n"); + lprintf(CTDL_INFO, "Seeding the pseudo-random number generator...\n"); urandom = fopen("/dev/urandom", "r"); if (urandom != NULL) { fread(&seed, sizeof seed, 1, urandom); @@ -113,217 +121,108 @@ void master_startup(void) { } srandom(seed); - lprintf(7, "Initializing ipgm secret\n"); + lprintf(CTDL_INFO, "Initializing ipgm secret\n"); get_config(); config.c_ipgm_secret = rand(); put_config(); - lprintf(9, "master_startup() finished\n"); + lprintf(CTDL_DEBUG, "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) { +void master_cleanup(int exitcode) { struct CleanupFunctionHook *fcn; + static int already_cleaning_up = 0; + + if (already_cleaning_up) while(1) sleep(1); + already_cleaning_up = 1; /* Run any cleanup routines registered by loadable modules */ for (fcn = CleanupHookTable; fcn != NULL; fcn = fcn->next) { (*fcn->h_function_pointer)(); } + /* Close the AdjRefCount queue file */ + AdjRefCount(-1, 0); + + /* Shut down the indexer thread */ + lprintf(CTDL_INFO, "Waiting for the indexer thread to shut down\n"); + pthread_join(indexer_thread_tid, NULL); + + /* Shut down the checkpoint thread */ + lprintf(CTDL_INFO, "Waiting for the checkpoint thread to shut down\n"); + pthread_join(checkpoint_thread_tid, NULL); + /* Close databases */ - lprintf(7, "Closing databases\n"); + lprintf(CTDL_INFO, "Closing databases\n"); close_databases(); /* Do system-dependent stuff */ sysdep_master_cleanup(); - /* Now go away. */ - lprintf(3, "citserver: exiting.\n"); - fflush(stdout); fflush(stderr); - exit(0); -} +#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); + } + } -/* - * Free any per-session data allocated by modules or whatever - */ -void deallocate_user_data(struct CitContext *con) -{ - struct CtdlSessData *ptr; + /* Now go away. */ + lprintf(CTDL_NOTICE, "citserver: Exiting with status %d\n", exitcode); + fflush(stdout); fflush(stderr); - 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); + unlink(pid_file_name); + exit(exitcode); } - /* - * Terminate a session and remove its context data structure. + * Terminate a session. */ void RemoveContext (struct CitContext *con) { - struct CitContext *ptr = NULL; - struct CitContext *ToFree = NULL; - if (con==NULL) { - lprintf(5, "WARNING: RemoveContext() called with NULL!\n"); - return; - } - lprintf(9, "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(7, "Removing context for session %d\n", con->cs_pid); - begin_critical_section(S_SESSION_TABLE); - if (ContextList == con) { - ToFree = ContextList; - ContextList = ContextList->next; - --num_sessions; - } - else { - for (ptr = ContextList; ptr != NULL; ptr = ptr->next) { - if (ptr->next == con) { - ToFree = ptr->next; - ptr->next = ptr->next->next; - --num_sessions; - } - } - } - end_critical_section(S_SESSION_TABLE); - - if (ToFree == NULL) { - lprintf(9, "RemoveContext() found nothing to remove\n"); + lprintf(CTDL_ERR, + "WARNING: RemoveContext() called with NULL!\n"); return; } + 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); become_session(NULL); /* Now handle all of the administrivia. */ - lprintf(7, "Calling logout(%d)\n", con->cs_pid); + lprintf(CTDL_DEBUG, "Calling logout(%d)\n", con->cs_pid); logout(con); - unlink(con->temp); - lprintf(3, "Session %d: ended.\n", con->cs_pid); - - /* Deallocate any user-data attached to this session */ - deallocate_user_data(con); + lprintf(CTDL_NOTICE, "[%3d] Session ended.\n", con->cs_pid); /* If the client is still connected, blow 'em away. */ - lprintf(7, "Closing socket %d\n", con->client_socket); + 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 */ - phree(con); - - lprintf(9, "Done with RemoveContext()\n"); -} - - - - - -/* - * 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); - 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(9, "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 = reallok(ptr->sym_data, num_bytes); - return; - } - } - - lprintf(2, "CtdlReallocUserData() ERROR: symbol %ld not found!\n", - requested_sym); + lprintf(CTDL_DEBUG, "Done with RemoveContext()\n"); } - /* * cmd_info() - tell the client about this server */ @@ -335,7 +234,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,17 +242,28 @@ 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 == 1) { + cprintf("1\n"); /* "create new user" never works with host auth */ + } + else { + cprintf("%d\n", config.c_disable_newu); /* otherwise, site defined */ + } + + cprintf("%s\n", config.c_default_cal_zone); + cprintf("000\n"); } /* - * returns an asterisk if there are any express messages waiting, + * returns an asterisk if there are any instant messages waiting, * space otherwise. */ char CtdlCheckExpress(void) { @@ -368,16 +278,16 @@ char CtdlCheckExpress(void) { void cmd_time(void) { time_t tv; - struct tm *tmp; + struct tm tmp; tv = time(NULL); - tmp = localtime(&tv); + localtime_r(&tv, &tmp); /* timezone and daylight global variables are not portable. */ #ifdef HAVE_STRUCT_TM_TM_GMTOFF - cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, tmp->tm_gmtoff, tmp->tm_isdst); + cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, tmp.tm_gmtoff, tmp.tm_isdst); #else - cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, tmp->tm_isdst); + cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst); #endif } @@ -390,15 +300,19 @@ 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; struct stat statbuf; static time_t pc_timestamp = 0; static char public_clients[SIZ]; + static char public_clients_file[SIZ]; -#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,23 +320,24 @@ 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(5, "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(7, "Loading %s\n", PUBLIC_CLIENTS); + lprintf(CTDL_INFO, "Loading %s\n", public_clients_file); - strcpy(public_clients, "127.0.0.1"); + safestrncpy(public_clients, "127.0.0.1", sizeof public_clients); if (hostname_to_dotted_quad(addrbuf, config.c_fqdn) == 0) { strcat(public_clients, "|"); strcat(public_clients, addrbuf); } - fp = fopen("public_clients", "r"); + fp = fopen(public_clients_file, "r"); if (fp != NULL) while (fgets(buf, sizeof buf, fp)!=NULL) { for (i=0; ics_addr); for (i=0; ics_addr, addrbuf)) { - lprintf(9, "... yes it is.\n"); + lprintf(CTDL_DEBUG, "... yes it is.\n"); return(1); } } /* No hits. This is not a public client. */ - lprintf(9, "... no it isn't.\n"); + lprintf(CTDL_DEBUG, "... no it isn't.\n"); return(0); } @@ -467,8 +383,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 +396,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; @@ -498,7 +414,7 @@ void cmd_iden(char *argbuf) } if (do_lookup) { - lprintf(9, "Looking up hostname '%s'\n", from_host); + 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, @@ -510,7 +426,7 @@ void cmd_iden(char *argbuf) } } - lprintf(3,"Client %d/%d/%01d.%02d (%s) from %s\n", + lprintf(CTDL_NOTICE, "Client %d/%d/%01d.%02d (%s) from %s\n", dev_code, cli_code, (rev_level / 100), @@ -527,43 +443,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); - extract(buf,mname,0); - - dirs[0]=mallok(64); - dirs[1]=mallok(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); + snprintf(buf2, sizeof buf2, "%s.%d.%d", + buf, CC->cs_clientdev, CC->cs_clienttyp); + + /* 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 (strlen(targ) == 0) { - mesg_locate(targ,sizeof targ,buf,2,(const char **)dirs); - } + 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); + } + } } - phree(dirs[0]); - phree(dirs[1]); + + free(dirs[0]); + free(dirs[1]); if (strlen(targ)==0) { - cprintf("%d '%s' not found.\n",ERROR + FILE_NOT_FOUND, mname); + 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,28 +529,31 @@ 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; + unbuffer_output(); + if (CtdlAccessCheck(ac_aide)) return; - extract(buf,mname,0); + extract_token(buf, mname, 0, '|', sizeof buf); for (a=0; aroom.QRname); if (viewed->room.QRflags & QR_MAILBOX) { strcpy(real_room, &real_room[11]); } if (viewed->room.QRflags & QR_PRIVATE) { - if ( (CtdlRoomAccess(&viewed->room, &viewer->user) - & UA_KNOWN) == 0) { + CtdlRoomAccess(&viewed->room, &viewer->user, &ra, NULL); + if ( (ra & UA_KNOWN) == 0) { strcpy(real_room, ""); } } @@ -659,6 +613,11 @@ int CtdlAccessCheck(int required_level) { return(-1); } + if ((required_level >= ac_logged_in) && (CC->logged_in == 0)) { + cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN); + return(-1); + } + if (CC->user.axlevel >= 6) return(0); if (required_level >= ac_aide) { cprintf("%d This command requires Aide access.\n", @@ -673,12 +632,6 @@ int CtdlAccessCheck(int required_level) { return(-1); } - if (CC->logged_in) return(0); - if (required_level >= ac_logged_in) { - cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN); - return(-1); - } - /* shhh ... succeed quietly */ return(0); } @@ -701,7 +654,7 @@ void cmd_term(char *cmdbuf) return; } - lprintf(9, "Locating session to kill\n"); + lprintf(CTDL_DEBUG, "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) { @@ -767,7 +720,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; @@ -777,15 +731,21 @@ void cmd_ipgm(char *argbuf) } else { sleep(5); - cprintf("%d Authentication failed.\n", ERROR + PASSWORD_REQUIRED); - lprintf(3, "Warning: ipgm authentication failed.\n"); + 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(); + */ } @@ -800,6 +760,18 @@ void cmd_down(void) { time_to_die = 1; } +/* + * 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); + time_to_die = 1; + shutdown_and_halt = 1; +} + /* * Schedule or cancel a server shutdown */ @@ -856,7 +828,7 @@ void generate_nonce(struct CitContext *con) { */ void begin_session(struct CitContext *con) { - int len; /* should be socklen_t but doesn't work on Macintosh */ + socklen_t len; struct sockaddr_in sin; /* @@ -872,23 +844,23 @@ 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->net_node, ""); 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); 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)) + 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, ""); @@ -896,13 +868,12 @@ 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)) con->nologin = 1; - lprintf(3, "Session started.\n"); + lprintf(CTDL_NOTICE, "Session started.\n"); /* Run any session startup routines registered by loadable modules */ PerformSessionHooks(EVT_START); @@ -917,7 +888,7 @@ void citproto_begin_session() { config.c_nodename, config.c_maxsessions); } else { - cprintf("%d %s Citadel/UX server ready.\n", + cprintf("%d %s Citadel server ready.\n", CIT_OK, config.c_nodename); } } @@ -933,24 +904,35 @@ void do_command_loop(void) { time(&CC->lastcmd); memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ - if (client_gets(cmdbuf) < 1) { - lprintf(3, "Client socket is broken. Ending session.\n"); + if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { + lprintf(CTDL_ERR, "Client disconnected: ending session.\n"); CC->kill_me = 1; return; } - lprintf(5, "Citadel: %s\n", cmdbuf); + + /* Log the server command, but don't show passwords... */ + if ( (strncasecmp(cmdbuf, "PASS", 4)) + && (strncasecmp(cmdbuf, "SETP", 4)) ) { + lprintf(CTDL_INFO, "%s\n", cmdbuf); + } + else { + lprintf(CTDL_INFO, "\n"); + } + + buffer_output(); /* * 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); } @@ -961,16 +943,16 @@ void do_command_loop(void) { CC->cs_flags &= ~CS_POSTING; } - if (!strncasecmp(cmdbuf,"NOOP",4)) { - cprintf("%d%cok\n",CIT_OK,CtdlCheckExpress()); + if (!strncasecmp(cmdbuf, "NOOP", 4)) { + cprintf("%d%cok\n", CIT_OK, CtdlCheckExpress() ); } - else if (!strncasecmp(cmdbuf,"QNOP",4)) { + else if (!strncasecmp(cmdbuf, "QNOP", 4)) { /* do nothing, this command returns no response */ } else if (!strncasecmp(cmdbuf,"QUIT",4)) { - cprintf("%d Goodbye.\n",CIT_OK); + cprintf("%d Goodbye.\n", CIT_OK); CC->kill_me = 1; } @@ -980,7 +962,7 @@ void do_command_loop(void) { else if (!strncasecmp(cmdbuf,"LOUT",4)) { if (CC->logged_in) logout(CC); - cprintf("%d logged out.\n",CIT_OK); + cprintf("%d logged out.\n", CIT_OK); } else if (!strncasecmp(cmdbuf,"USER",4)) { @@ -1051,6 +1033,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]); } @@ -1075,6 +1061,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(); } @@ -1156,7 +1146,7 @@ void do_command_loop(void) { } else if (!strncasecmp(cmdbuf,"LIST",4)) { - cmd_list(); + cmd_list(&cmdbuf[5]); } else if (!strncasecmp(cmdbuf,"CHEK",4)) { @@ -1255,6 +1245,10 @@ void do_command_loop(void) { cmd_down(); } + else if (!strncasecmp(cmdbuf,"HALT",4)) { + cmd_halt(); + } + else if (!strncasecmp(cmdbuf,"SCDN",4)) { cmd_scdn(&cmdbuf[5]); } @@ -1303,16 +1297,21 @@ void do_command_loop(void) { cmd_isme(&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 + CMD_NOT_SUPPORTED); + cprintf("%d Unrecognized or unsupported command.\n", + ERROR + CMD_NOT_SUPPORTED); } - /* Run any after-each-command outines registered by modules */ + unbuffer_output(); + + /* Run any after-each-command routines registered by modules */ PerformSessionHooks(EVT_CMD); } + + +/* + * This loop performs all asynchronous functions. + */ +void do_async_loop(void) { + PerformSessionHooks(EVT_ASYNC); +}