X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=d0c7007ff37cdd020b21e8c76f7752f7c6a57d5f;hb=ece8da4e0b7e2b371494b7c58a53041da6773d6b;hp=825d756e544ff6150a851210f1a72154119b2b59;hpb=8d1aa3abcbc0872607064e7769275bab86c67a5c;p=citadel.git diff --git a/citadel/citserver.c b/citadel/citserver.c index 825d756e5..d0c7007ff 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -3,6 +3,21 @@ * * Main source module for the Citadel server * + * Copyright (c) 1987-2009 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" @@ -26,6 +41,10 @@ # endif #endif +#if HAVE_BACKTRACE +#include +#endif + #include #include #include @@ -36,9 +55,11 @@ #include #include #include +#include #include "citadel.h" #include "server.h" #include "sysdep_decls.h" +#include "threads.h" #include "citserver.h" #include "config.h" #include "database.h" @@ -51,20 +72,68 @@ #include "file_ops.h" #include "policy.h" #include "control.h" -#include "tools.h" #include "euidindex.h" -#include "serv_network.h" +#include "context.h" +#include "svn_revision.h" #ifndef HAVE_SNPRINTF #include "snprintf.h" #endif -struct CitContext *ContextList = NULL; -struct CitContext* next_session = NULL; +#include "ctdl_module.h" + + 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. + */ +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) + CtdlLogPrintf(1, "%s\n", strings[i]); + else + CtdlLogPrintf(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) + CtdlLogPrintf(1, "%s\n", strings[i]); + else + CtdlLogPrintf(1, "%p\n", stack_frames[i]); + } + free(strings); +#endif + exit(-1); +} /* * Various things that need to be initialized at startup @@ -74,49 +143,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"); } @@ -138,31 +215,20 @@ void master_cleanup(int exitcode) { /* 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(CTDL_INFO, "Closing databases\n"); - close_databases(); - - /* flush the networker stuff */ - destroy_network_queue_room(); - /* 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); @@ -172,57 +238,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); @@ -245,15 +276,31 @@ 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"); } @@ -271,7 +318,7 @@ char CtdlCheckExpress(void) { } } -void cmd_time(void) +void cmd_time(char *argbuf) { time_t tv; struct tm tmp; @@ -300,11 +347,16 @@ 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]; +#define LOCALHOSTSTR "127.0.0.1" + snprintf(public_clients_file, sizeof public_clients_file, "%s/public_clients", @@ -318,55 +370,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) { - 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); } - 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); } @@ -404,13 +472,13 @@ 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; } 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, @@ -422,7 +490,7 @@ 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), @@ -475,12 +543,12 @@ void cmd_mesg(char *mname) /* Otherwise, look for the requested file by name. */ else { mesg_locate(targ, sizeof targ, buf2, 2, (const char **)dirs); - if (strlen(targ) == 0) { + if (IsEmptyStr(targ)) { snprintf(buf2, sizeof buf2, "%s.%d", buf, CC->cs_clientdev); mesg_locate(targ, sizeof targ, buf2, 2, (const char **)dirs); - if (strlen(targ) == 0) { + if (IsEmptyStr(targ)) { mesg_locate(targ, sizeof targ, buf, 2, (const char **)dirs); } @@ -490,7 +558,7 @@ void cmd_mesg(char *mname) free(dirs[0]); free(dirs[1]); - if (strlen(targ)==0) { + if (IsEmptyStr(targ)) { cprintf("%d '%s' not found. (Searching in %s and %s)\n", ERROR + FILE_NOT_FOUND, mname, @@ -535,7 +603,7 @@ void cmd_emsg(char *mname) if (CtdlAccessCheck(ac_aide)) return; extract_token(buf, mname, 0, '|', sizeof buf); - for (a=0; a=0 && strcmp(buf, "000")) { fprintf(mfp, "%s\n", buf); } @@ -572,8 +640,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; @@ -589,9 +657,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], ""); } @@ -640,7 +708,7 @@ int CtdlAccessCheck(int required_level) { void cmd_term(char *cmdbuf) { int session_num; - struct CitContext *ccptr; + CitContext *ccptr; int found_it = 0; int allowed = 0; @@ -650,7 +718,7 @@ void cmd_term(char *cmdbuf) return; } - lprintf(CTDL_DEBUG, "Locating session to kill\n"); + CtdlLogPrintf(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) { @@ -688,7 +756,7 @@ 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); } @@ -729,19 +797,9 @@ void cmd_ipgm(char *argbuf) sleep(5); cprintf("%d Authentication failed.\n", ERROR + PASSWORD_REQUIRED); - lprintf(CTDL_ERR, "Warning: ipgm authentication failed.\n"); + 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(); - */ } @@ -759,31 +817,34 @@ 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); + cprintf(Reply, CIT_OK + SERVER_SHUTTING_DOWN); } - time_to_die = 1; + 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; cprintf("%d Halting server. Goodbye.\n", CIT_OK); - time_to_die = 1; + CtdlThreadStopAll(); shutdown_and_halt = 1; } @@ -793,14 +854,29 @@ void cmd_halt(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) + { + 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; + } + + 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); } @@ -825,7 +901,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); @@ -841,7 +917,7 @@ 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; @@ -859,13 +935,14 @@ 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_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->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) { @@ -878,17 +955,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); @@ -904,35 +1014,61 @@ 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); +} /* * This loop recognizes all server commands. */ 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); + CtdlLogPrintf(CTDL_INFO, "%s\n", cmdbuf); } else { - lprintf(CTDL_INFO, "\n"); + CtdlLogPrintf(CTDL_INFO, "\n"); } buffer_output(); @@ -951,6 +1087,8 @@ void do_command_loop(void) { safestrncpy(CC->lastcmdname, cmdbuf, sizeof(CC->lastcmdname)); time(&CC->lastidle); } + + CtdlThreadName(cmdbuf); if ((strncasecmp(cmdbuf, "ENT0", 4)) && (strncasecmp(cmdbuf, "MESG", 4)) @@ -959,369 +1097,15 @@ void do_command_loop(void) { CC->cs_flags &= ~CS_POSTING; } - if (!strncasecmp(cmdbuf, "NOOP", 4)) { - cprintf("%d%cok\n", CIT_OK, CtdlCheckExpress() ); - } - - 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); - 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", CIT_OK); - } - - else if (!strncasecmp(cmdbuf,"USER",4)) { - cmd_user(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"PASS",4)) { - cmd_pass(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"NEWU",4)) { - cmd_newu(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"CREU",4)) { - cmd_creu(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"SETP",4)) { - cmd_setp(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"LRMS",4)) { - cmd_lrms(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"LKRA",4)) { - cmd_lkra(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"LKRN",4)) { - cmd_lkrn(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"LKRO",4)) { - cmd_lkro(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"LZRM",4)) { - cmd_lzrm(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"LPRM",4)) { - cmd_lprm(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"GETU",4)) { - cmd_getu(); - } - - else if (!strncasecmp(cmdbuf,"SETU",4)) { - cmd_setu(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"GOTO",4)) { - cmd_goto(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"MSGS",4)) { - cmd_msgs(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"WHOK",4)) { - cmd_whok(); - } - - else if (!strncasecmp(cmdbuf,"RDIR",4)) { - cmd_rdir(); - } - - else if (!strncasecmp(cmdbuf,"EUID",4)) { - cmd_euid(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"MSG0",4)) { - cmd_msg0(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"MSG2",4)) { - cmd_msg2(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"MSG3",4)) { - cmd_msg3(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"MSG4",4)) { - cmd_msg4(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"MSGP",4)) { - cmd_msgp(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"OPNA",4)) { - cmd_opna(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"DLAT",4)) { - cmd_dlat(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"INFO",4)) { - cmd_info(); - } - - else if (!strncasecmp(cmdbuf,"SLRP",4)) { - cmd_slrp(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"INVT",4)) { - cmd_invt_kick(&cmdbuf[5],1); - } - - else if (!strncasecmp(cmdbuf,"KICK",4)) { - cmd_invt_kick(&cmdbuf[5],0); - } - - else if (!strncasecmp(cmdbuf,"GETR",4)) { - cmd_getr(); - } - - else if (!strncasecmp(cmdbuf,"SETR",4)) { - cmd_setr(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"GETA",4)) { - cmd_geta(); - } - - else if (!strncasecmp(cmdbuf,"SETA",4)) { - cmd_seta(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"ENT0",4)) { - cmd_ent0(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"RINF",4)) { - cmd_rinf(); - } - - else if (!strncasecmp(cmdbuf,"DELE",4)) { - cmd_dele(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"KILL",4)) { - cmd_kill(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"CRE8",4)) { - cmd_cre8(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"MOVE",4)) { - cmd_move(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"FORG",4)) { - cmd_forg(); - } - - else if (!strncasecmp(cmdbuf,"MESG",4)) { - cmd_mesg(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"EMSG",4)) { - cmd_emsg(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"GNUR",4)) { - cmd_gnur(); - } - - else if (!strncasecmp(cmdbuf,"VALI",4)) { - cmd_vali(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"EINF",4)) { - cmd_einf(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"LIST",4)) { - cmd_list(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"CHEK",4)) { - cmd_chek(); - } - - else if (!strncasecmp(cmdbuf,"DELF",4)) { - cmd_delf(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"MOVF",4)) { - cmd_movf(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"NETF",4)) { - cmd_netf(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"OPEN",4)) { - cmd_open(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"CLOS",4)) { - cmd_clos(); - } - - else if (!strncasecmp(cmdbuf,"UOPN",4)) { - cmd_uopn(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"UCLS",4)) { - cmd_ucls(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"READ",4)) { - cmd_read(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"WRIT",4)) { - cmd_writ(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"QUSR",4)) { - cmd_qusr(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"ECHO",4)) { - cmd_echo(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"OIMG",4)) { - cmd_oimg(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"MORE",4)) { - cmd_more(); - } - - else if (!strncasecmp(cmdbuf,"NDOP",4)) { - cmd_ndop(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"NUOP",4)) { - cmd_nuop(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"LFLR",4)) { - cmd_lflr(); - } - - else if (!strncasecmp(cmdbuf,"CFLR",4)) { - cmd_cflr(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"KFLR",4)) { - cmd_kflr(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"EFLR",4)) { - cmd_eflr(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"IDEN",4)) { - cmd_iden(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"IPGM",4)) { - cmd_ipgm(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"TERM",4)) { - cmd_term(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"DOWN",4)) { - cmd_down(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf,"HALT",4)) { - cmd_halt(); - } - - else if (!strncasecmp(cmdbuf,"SCDN",4)) { - cmd_scdn(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "UIMG", 4)) { - cmd_uimg(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "TIME", 4)) { - cmd_time(); - } - - else if (!strncasecmp(cmdbuf, "AGUP", 4)) { - cmd_agup(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "ASUP", 4)) { - cmd_asup(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "GPEX", 4)) { - cmd_gpex(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "SPEX", 4)) { - cmd_spex(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "CONF", 4)) { - cmd_conf(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "SEEN", 4)) { - cmd_seen(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "GTSN", 4)) { - cmd_gtsn(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "VIEW", 4)) { - cmd_view(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "ISME", 4)) { - cmd_isme(&cmdbuf[5]); - } - - else if (!DLoader_Exec_Cmd(cmdbuf)) { - cprintf("%d Unrecognized or unsupported command.\n", - ERROR + CMD_NOT_SUPPORTED); - } + if (!DLoader_Exec_Cmd(cmdbuf)) { + 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); } @@ -1331,3 +1115,38 @@ void do_command_loop(void) { void do_async_loop(void) { PerformSessionHooks(EVT_ASYNC); } + + + + + + + +/*****************************************************************************/ +/* MODULE INITIALIZATION STUFF */ +/*****************************************************************************/ + +CTDL_MODULE_INIT(citserver) +{ + if (!threading) { + CtdlRegisterProtoHook(cmd_noop, "NOOP", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_qnop, "QNOP", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_quit, "QUIT", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_lout, "LOUT", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_asyn, "ASYN", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_info, "INFO", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_mesg, "MESG", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_emsg, "EMSG", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_echo, "ECHO", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_more, "MORE", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_iden, "IDEN", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_ipgm, "IPGM", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_term, "TERM", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_down, "DOWN", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_halt, "HALT", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_scdn, "SCDN", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_time, "TIME", "Autoconverted. TODO: document me."); + } + /* return our Subversion id for the Log */ + return "$Id$"; +}