X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=603d3498243b8ee3a5b5b263e94b4c1ae3239925;hb=182f984f6f03067f40a7e01bfa82df95f5605358;hp=dac9d7a9b6299854cb1fe597122017ee67230163;hpb=561072a2d377311c5d00a62b56171bb8a13611c2;p=citadel.git diff --git a/citadel/citserver.c b/citadel/citserver.c index dac9d7a9b..603d34982 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -3,6 +3,21 @@ * * Main source module for the Citadel server * + * Copyright (c) 1987-2010 by the citadel.org team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -14,7 +29,6 @@ #include #include - #if TIME_WITH_SYS_TIME # include # include @@ -44,6 +58,7 @@ #include "citadel.h" #include "server.h" #include "sysdep_decls.h" +#include "threads.h" #include "citserver.h" #include "config.h" #include "database.h" @@ -57,6 +72,8 @@ #include "policy.h" #include "control.h" #include "euidindex.h" +#include "context.h" +#include "svn_revision.h" #ifndef HAVE_SNPRINTF #include "snprintf.h" @@ -64,17 +81,13 @@ #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; int panic_fd; -/** - * \brief print the actual stack frame. +/* + * print the actual stack frame. */ void cit_backtrace(void) { @@ -88,16 +101,16 @@ void cit_backtrace(void) strings = backtrace_symbols(stack_frames, size); for (i = 0; i < size; i++) { if (strings != NULL) - lprintf(1, "%s\n", strings[i]); + CtdlLogPrintf(1, "%s\n", strings[i]); else - lprintf(1, "%p\n", stack_frames[i]); + CtdlLogPrintf(1, "%p\n", stack_frames[i]); } free(strings); #endif } -/** - * \brief print the actual stack frame. +/* + * print the actual stack frame. */ void cit_panic_backtrace(int SigNum) { @@ -111,9 +124,9 @@ void cit_panic_backtrace(int SigNum) strings = backtrace_symbols(stack_frames, size); for (i = 0; i < size; i++) { if (strings != NULL) - lprintf(1, "%s\n", strings[i]); + CtdlLogPrintf(1, "%s\n", strings[i]); else - lprintf(1, "%p\n", stack_frames[i]); + CtdlLogPrintf(1, "%p\n", stack_frames[i]); } free(strings); #endif @@ -128,49 +141,57 @@ void master_startup(void) { unsigned int seed; FILE *urandom; struct ctdlroom qrbuf; + int rv; - lprintf(CTDL_DEBUG, "master_startup() started\n"); + CtdlLogPrintf(CTDL_DEBUG, "master_startup() started\n"); time(&server_startup_time); - lprintf(CTDL_INFO, "Opening databases\n"); + CtdlLogPrintf(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(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); + CtdlLogPrintf(CTDL_INFO, "Creating base rooms (if necessary)\n"); + CtdlCreateRoom(config.c_baseroom, 0, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(AIDEROOM, 3, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(SYSCONFIGROOM, 3, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(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) { + if (CtdlGetRoomLock(&qrbuf, SYSCONFIGROOM) == 0) { qrbuf.QRflags2 |= QR2_SYSTEM; - lputroom(&qrbuf); + CtdlPutRoomLock(&qrbuf); } - lprintf(CTDL_INFO, "Seeding the pseudo-random number generator...\n"); + /* Aide needs to be public postable, else we're not RFC conformant. */ + if (CtdlGetRoomLock(&qrbuf, AIDEROOM) == 0) { + qrbuf.QRflags2 |= QR2_SMTP_PUBLIC; + CtdlPutRoomLock(&qrbuf); + } + + CtdlLogPrintf(CTDL_INFO, "Seeding the pseudo-random number generator...\n"); urandom = fopen("/dev/urandom", "r"); if (urandom != NULL) { - fread(&seed, sizeof seed, 1, urandom); + rv = fread(&seed, sizeof seed, 1, urandom); fclose(urandom); } else { gettimeofday(&tv, NULL); seed = tv.tv_usec; } + srand(seed); srandom(seed); - lprintf(CTDL_INFO, "Initializing ipgm secret\n"); + CtdlLogPrintf(CTDL_INFO, "Initializing ipgm secret\n"); get_config(); config.c_ipgm_secret = rand(); put_config(); - lprintf(CTDL_DEBUG, "master_startup() finished\n"); + CtdlLogPrintf(CTDL_DEBUG, "master_startup() finished\n"); } @@ -192,20 +213,20 @@ void master_cleanup(int exitcode) { /* Close the AdjRefCount queue file */ AdjRefCount(-1, 0); - /* Close databases */ - lprintf(CTDL_INFO, "Closing databases\n"); - close_databases(); - /* Do system-dependent stuff */ sysdep_master_cleanup(); + /* Close databases */ + CtdlLogPrintf(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"); + CtdlLogPrintf(CTDL_NOTICE, "citserver: Halting server without exiting.\n"); fflush(stdout); fflush(stderr); while(1) { sleep(32767); @@ -215,57 +236,22 @@ void master_cleanup(int exitcode) { release_control(); /* Now go away. */ - lprintf(CTDL_NOTICE, "citserver: Exiting with status %d\n", exitcode); + CtdlLogPrintf(CTDL_NOTICE, "citserver: Exiting with status %d\n", exitcode); fflush(stdout); fflush(stderr); if (restart_server != 0) exit(1); + if ((running_as_daemon != 0) && ((exitcode == 0) )) + exitcode = CTDLEXIT_SHUTDOWN; exit(exitcode); } -/* - * Terminate a session. - */ -void RemoveContext (struct CitContext *con) -{ - if (con==NULL) { - 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: 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(CTDL_DEBUG, "Calling logout(%d)\n", con->cs_pid); - logout(con); - - lprintf(CTDL_NOTICE, "[%3d] Session ended.\n", con->cs_pid); - - /* If the client is still connected, blow 'em away. */ - lprintf(CTDL_DEBUG, "Closing socket %d\n", con->client_socket); - close(con->client_socket); - - lprintf(CTDL_DEBUG, "Done with RemoveContext()\n"); -} - - - - - /* * cmd_info() - tell the client about this server */ -void cmd_info(void) { +void cmd_info(char *cmdbuf) { cprintf("%d Server info:\n", LISTING_FOLLOWS); cprintf("%d\n", CC->cs_pid); cprintf("%s\n", config.c_nodename); @@ -288,17 +274,30 @@ void cmd_info(void) { 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 */ + if (config.c_auth_mode == AUTHMODE_NATIVE) { + cprintf("%d\n", config.c_disable_newu); } else { - cprintf("%d\n", config.c_disable_newu); /* otherwise, site defined */ + 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("%s\n", svn_revision()); + + if (config.c_auth_mode == AUTHMODE_NATIVE) { + cprintf("1\n"); /* OpenID is enabled when using native auth */ + } + else { + cprintf("0\n"); /* OpenID is disabled when using non-native auth */ + } cprintf("000\n"); } @@ -317,7 +316,7 @@ char CtdlCheckExpress(void) { } } -void cmd_time(void) +void cmd_time(char *argbuf) { time_t tv; struct tm tmp; @@ -346,15 +345,17 @@ int is_public_client(void) 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]; - snprintf(public_clients_file, - sizeof public_clients_file, - "%s/public_clients", - ctdl_etc_dir); +#define LOCALHOSTSTR "127.0.0.1" + + 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 @@ -364,62 +365,71 @@ int is_public_client(void) */ if (stat(public_clients_file, &statbuf) != 0) { /* No public_clients file exists, so bail out */ - lprintf(CTDL_WARNING, "Warning: '%s' does not exist\n", + CtdlLogPrintf(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_file); + CtdlLogPrintf(CTDL_INFO, "Loading %s\n", public_clients_file); - safestrncpy(public_clients, "127.0.0.1", sizeof public_clients); + 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_file, "r"); - if (fp != NULL) while (fgets(buf, sizeof buf, fp)!=NULL) { - char *ptr; - ptr = buf; - while (!IsEmptyStr(ptr)) { - if (*ptr == '#') { - *ptr = 0; - break; - } + if (fp != NULL) + while ((fgets(buf, sizeof buf, fp)!=NULL) && + (public_clientspos < public_clientsend)){ + char *ptr; + ptr = buf; + while (!IsEmptyStr(ptr)) { + if (*ptr == '#') { + *ptr = 0; + break; + } else ptr++; - } - ptr--; - while (ptr>buf && isspace(*ptr)) { - *(ptr--) = 0; - } - if (hostname_to_dotted_quad(addrbuf, buf) == 0) { - if ((strlen(public_clients) + - strlen(addrbuf) + 2) - < sizeof(public_clients)) { - strcat(public_clients, "|"); - strcat(public_clients, addrbuf); + } + ptr--; + while (ptr>buf && 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); } - lprintf(CTDL_DEBUG, "Checking whether %s is a local or public client\n", + CtdlLogPrintf(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"); + CtdlLogPrintf(CTDL_DEBUG, "... yes it is.\n"); return(1); } } /* No hits. This is not a public client. */ - lprintf(CTDL_DEBUG, "... no it isn't.\n"); + CtdlLogPrintf(CTDL_DEBUG, "... no it isn't.\n"); return(0); } @@ -463,7 +473,7 @@ void cmd_iden(char *argbuf) } if (do_lookup) { - lprintf(CTDL_DEBUG, "Looking up hostname '%s'\n", from_host); + CtdlLogPrintf(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, CC->cs_addr, sizeof CC->cs_addr, @@ -475,13 +485,14 @@ void cmd_iden(char *argbuf) } } - lprintf(CTDL_NOTICE, "Client %d/%d/%01d.%02d (%s) from %s\n", + CtdlLogPrintf(CTDL_NOTICE, "Client %d/%d/%01d.%02d (%s) from %s\n", dev_code, cli_code, (rev_level / 100), (rev_level % 100), desc, - CC->cs_host); + CC->cs_host + ); cprintf("%d Ok\n",CIT_OK); } @@ -613,7 +624,7 @@ void cmd_emsg(char *mname) } cprintf("%d %s\n", SEND_LISTING, targ); - while (client_getln(buf, sizeof buf), strcmp(buf, "000")) { + while (client_getln(buf, sizeof buf) >=0 && strcmp(buf, "000")) { fprintf(mfp, "%s\n", buf); } @@ -625,8 +636,8 @@ void cmd_emsg(char *mname) * user also knows the rooms. */ void GenerateRoomDisplay(char *real_room, - struct CitContext *viewed, - struct CitContext *viewer) { + CitContext *viewed, + CitContext *viewer) { int ra; @@ -642,9 +653,9 @@ void GenerateRoomDisplay(char *real_room, } if (viewed->cs_flags & CS_CHAT) { - while (strlen(real_room) < 14) + while (strlen(real_room) < 14) { strcat(real_room, " "); - + } strcpy(&real_room[14], ""); } @@ -667,7 +678,7 @@ int CtdlAccessCheck(int required_level) { return(-1); } - if (CC->user.axlevel >= 6) return(0); + if (CC->user.axlevel >= AxAideU) return(0); if (required_level >= ac_aide) { cprintf("%d This command requires Aide access.\n", ERROR + HIGHER_ACCESS_REQUIRED); @@ -693,35 +704,19 @@ int CtdlAccessCheck(int required_level) { void cmd_term(char *cmdbuf) { int session_num; - struct CitContext *ccptr; - int found_it = 0; - int allowed = 0; + int terminated = 0; session_num = extract_int(cmdbuf, 0); - if (session_num == CC->cs_pid) { + + terminated = CtdlTerminateOtherSession(session_num); + + if (terminated < 0) { cprintf("%d You can't kill your own session.\n", ERROR + ILLEGAL_VALUE); return; } - 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) { - found_it = 1; - if ((ccptr->user.usernum == CC->user.usernum) - || (CC->user.axlevel >= 6)) { - allowed = 1; - ccptr->kill_me = 1; - } - else { - allowed = 0; - } - } - } - end_critical_section(S_SESSION_TABLE); - - if (found_it) { - if (allowed) { + if (terminated & TERM_FOUND) { + if (terminated == TERM_KILLED) { cprintf("%d Session terminated.\n", CIT_OK); } else { @@ -735,16 +730,14 @@ void cmd_term(char *cmdbuf) } - - - /* * get the paginator prompt */ -void cmd_more(void) { +void cmd_more(char *argbuf) { cprintf("%d %s\n", CIT_OK, config.c_moreprompt); } + /* * echo */ @@ -754,9 +747,8 @@ void cmd_echo(char *etext) } - /* - * identify as internal program + * Perform privilege escalation for an internal program */ void cmd_ipgm(char *argbuf) { @@ -769,8 +761,7 @@ 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,21 +771,10 @@ void cmd_ipgm(char *argbuf) } else { sleep(5); - cprintf("%d Authentication failed.\n", - ERROR + PASSWORD_REQUIRED); - lprintf(CTDL_ERR, "Warning: ipgm authentication failed.\n"); + cprintf("%d Authentication failed.\n", ERROR + PASSWORD_REQUIRED); + CtdlLogPrintf(CTDL_ERR, "Warning: ipgm authentication failed.\n"); CC->kill_me = 1; } - - /* 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(); - */ } @@ -812,26 +792,30 @@ void cmd_down(char *argbuf) { restart_server = extract_int(argbuf, 0); if (restart_server > 0) - Reply = "%d Restarting server. See you soon.\n"; + { + Reply = "%d citserver will now shut down and automatically restart.\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"; + CtdlLogPrintf(CTDL_ERR, "The user requested restart, but not running as daemon! Geronimooooooo!\n"); + Reply = "%d Warning: citserver is not running in daemon mode and is therefore unlikely to restart automatically.\n"; state = ERROR; } cprintf(Reply, state); } else { - cprintf(Reply, CIT_OK + SERVER_SHUTTING_DOWN); + cprintf(Reply, CIT_OK + SERVER_SHUTTING_DOWN); } + CC->kill_me = 1; /* Even the DOWN command has to follow correct proceedure when disconecting */ CtdlThreadStopAll(); } + /* * Halt the server without exiting the server process. */ -void cmd_halt(void) { +void cmd_halt(char *argbuf) { if (CtdlAccessCheck(ac_aide)) return; @@ -840,6 +824,7 @@ void cmd_halt(void) { shutdown_and_halt = 1; } + /* * Schedule or cancel a server shutdown */ @@ -857,7 +842,7 @@ void cmd_scdn(char *argbuf) restart_server = 1; if (!running_as_daemon) { - lprintf(CTDL_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n"); + CtdlLogPrintf(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; } @@ -893,7 +878,7 @@ void cmd_asyn(char *argbuf) * 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) { +void generate_nonce(CitContext *con) { struct timeval tv; memset(con->cs_nonce, NONCE_SIZE, 0); @@ -904,12 +889,10 @@ void generate_nonce(struct CitContext *con) { } - - /* * Back-end function for starting a session */ -void begin_session(struct CitContext *con) +void begin_session(CitContext *con) { socklen_t len; struct sockaddr_in sin; @@ -934,6 +917,7 @@ void begin_session(struct CitContext *con) generate_nonce(con); safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host); safestrncpy(con->cs_addr, "", sizeof con->cs_addr); + con->cs_UDSclientUID = -1; con->cs_host[sizeof con->cs_host - 1] = 0; len = sizeof sin; if (!CC->is_local_socket) { @@ -946,17 +930,50 @@ void begin_session(struct CitContext *con) } else { strcpy(con->cs_host, ""); +#ifdef HAVE_STRUCT_UCRED + { + /* as http://www.wsinnovations.com/softeng/articles/uds.html told us... */ + struct ucred credentials; + socklen_t ucred_length = sizeof(struct ucred); + + /*fill in the user data structure */ + if(getsockopt(con->client_socket, SOL_SOCKET, SO_PEERCRED, &credentials, &ucred_length)) { + CtdlLogPrintf(CTDL_NOTICE, "could obtain credentials from unix domain socket"); + + } + else { + /* the process ID of the process on the other side of the socket */ + /* credentials.pid; */ + + /* the effective UID of the process on the other side of the socket */ + con->cs_UDSclientUID = credentials.uid; + + /* the effective primary GID of the process on the other side of the socket */ + /* credentials.gid; */ + + /* To get supplemental groups, we will have to look them up in our account + database, after a reverse lookup on the UID to get the account name. + We can take this opportunity to check to see if this is a legit account. + */ + } + } +#endif } con->cs_flags = 0; con->upload_type = UPL_FILE; con->dl_is_net = 0; con->nologin = 0; - if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions)) { + if (((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions)) || CtdlWantSingleUser()) { con->nologin = 1; } - lprintf(CTDL_NOTICE, "Session started.\n"); + if (!CC->is_local_socket) { + CtdlLogPrintf(CTDL_NOTICE, "Session started from %s [%s].\n", con->cs_host, con->cs_addr); + } + else { + CtdlLogPrintf(CTDL_NOTICE, "Session started via local socket.\n"); + } /* Run any session startup routines registered by loadable modules */ PerformSessionHooks(EVT_START); @@ -972,12 +989,37 @@ void citproto_begin_session() { CC->kill_me = 1; } else { - cprintf("%d %s Citadel server ready.\n", - CIT_OK, config.c_nodename); + cprintf("%d %s Citadel server ready.\n", CIT_OK, config.c_nodename); + CC->can_receive_im = 1; } } +void cmd_noop(char *argbuf) +{ + cprintf("%d%cok\n", CIT_OK, CtdlCheckExpress() ); +} + + +void cmd_qnop(char *argbuf) +{ + /* do nothing, this command returns no response */ +} + + +void cmd_quit(char *argbuf) +{ + cprintf("%d Goodbye.\n", CIT_OK); + CC->kill_me = 1; +} + + +void cmd_lout(char *argbuf) +{ + if (CC->logged_in) + CtdlUserLogout(); + cprintf("%d logged out.\n", CIT_OK); +} /* @@ -985,22 +1027,25 @@ 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 disconnected: ending session.\n"); + CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\n"); CC->kill_me = 1; + CtdlThreadName(old_name); return; } /* Log the server command, but don't show passwords... */ - if ( (strncasecmp(cmdbuf, "PASS", 4)) - && (strncasecmp(cmdbuf, "SETP", 4)) ) { - lprintf(CTDL_INFO, "%s\n", cmdbuf); + if ( (strncasecmp(cmdbuf, "PASS", 4)) && (strncasecmp(cmdbuf, "SETP", 4)) ) { + CtdlLogPrintf(CTDL_INFO, "%s\n", cmdbuf); } else { - lprintf(CTDL_INFO, "\n"); + CtdlLogPrintf(CTDL_INFO, "