]> code.citadel.org Git - citadel.git/blobdiff - citadel/citserver.c
* Set up the framework for different "views" of a room
[citadel.git] / citadel / citserver.c
index 57fe8e98bb4b8bb9dc962dfea5f1fb83de028d4f..c96ab9f571085a42190261fb220a9d65935ae46d 100644 (file)
 #include "control.h"
 #include "tools.h"
 
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+
 struct CitContext *ContextList = NULL;
 char *unique_session_numbers;
 int ScheduledShutdown = 0;
@@ -154,7 +158,7 @@ void RemoveContext (struct CitContext *con)
        if (con==NULL) {
                lprintf(5, "WARNING: RemoveContext() called with NULL!\n");
                return;
-               }
+       }
 
        /* Remove the context from the global context list.  This needs
         * to get done FIRST to avoid concurrency problems.  It is *vitally*
@@ -166,16 +170,16 @@ void RemoveContext (struct CitContext *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) {
@@ -199,7 +203,7 @@ void RemoveContext (struct CitContext *con)
 
        rec_log(CL_TERMINATE, con->curr_user);
        unlink(con->temp);
-       lprintf(3, "citserver[%3d]: ended.\n", con->cs_pid);
+       lprintf(3, "[%3d] Session ended.\n", con->cs_pid);
        
 
        syslog(LOG_NOTICE,"session %d: ended", con->cs_pid);
@@ -337,19 +341,26 @@ void cmd_info(void) {
 char CtdlCheckExpress(void) {
        if (CC->FirstExpressMessage == NULL) {
                return(' ');
-               }
+       }
        else {
                return('*');
-               }
        }
+}
 
 void cmd_time(void)
 {
    time_t tv;
+   struct tm *tmp;
    
    tv = time(NULL);
+   tmp = localtime(&tv);
    
-   cprintf("%d %ld\n", OK, tv);
+   /* 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);
+#else
+   cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, tmp->tm_isdst);
+#endif
 }
 
 /*
@@ -363,23 +374,26 @@ static int hostnames_match(const char *realname, const char *testname) {
        struct hostent *he;
        int retval = 0;
 
-       if (!strcasecmp(realname, testname))
-               return 1;
+       if (!strcasecmp(realname, testname)) {
+               return(1);
+       }
 
 #ifdef HAVE_NONREENTRANT_NETDB
        begin_critical_section(S_NETDB);
 #endif
 
-       if ((he = gethostbyname(testname)) != NULL)
-               if (!strcasecmp(realname, he->h_name))
+       if ((he = gethostbyname(testname)) != NULL) {
+               if (!strcasecmp(realname, he->h_name)) {
                        retval = 1;
+               }
+       }
 
 #ifdef HAVE_NONREENTRANT_NETDB
        end_critical_section(S_NETDB);
 #endif
 
        return retval;
-       }
+}
 
 /*
  * check a hostname against the public_clients file
@@ -403,12 +417,12 @@ int is_public_client(char *where)
                if (hostnames_match(where,buf)) {
                        fclose(fp);
                        return(1);
-                       }
                }
+       }
 
        fclose(fp);
        return(0);
-       }
+}
 
 
 /*
@@ -452,11 +466,11 @@ void cmd_iden(char *argbuf)
        if (do_lookup) {
                lprintf(9, "Looking up hostname '%s'\n", from_host);
                if ((addr.s_addr = inet_addr(from_host)) != -1) {
-                       locate_host(CC->cs_host, &addr);
+                       locate_host(CC->cs_host, sizeof CC->cs_host, &addr);
                }
                else {
                        safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host);
-                       CC->cs_host[24] = 0;
+                       CC->cs_host[sizeof CC->cs_host - 1] = 0;
                }
        }
 
@@ -475,7 +489,7 @@ void cmd_iden(char *argbuf)
                (rev_level % 100),
                desc,
                CC->cs_host);
-       cprintf("%d Ok\n",OK);
+       cprintf("%d Ok\n",CIT_OK);
 }
 
 
@@ -496,7 +510,7 @@ void cmd_mesg(char *mname)
        dirs[1]=mallok(64);
        strcpy(dirs[0],"messages");
        strcpy(dirs[1],"help");
-       mesg_locate(targ,buf,2,dirs);
+       mesg_locate(targ,sizeof targ,buf,2,(const char **)dirs);
        phree(dirs[0]);
        phree(dirs[1]);
 
@@ -504,25 +518,25 @@ void cmd_mesg(char *mname)
        if (strlen(targ)==0) {
                cprintf("%d '%s' not found.\n",ERROR,mname);
                return;
-               }
+       }
 
        mfp = fopen(targ,"r");
        if (mfp==NULL) {
                cprintf("%d Cannot open '%s': %s\n",
                        ERROR,targ,strerror(errno));
                return;
-               }
+       }
        cprintf("%d %s\n",LISTING_FOLLOWS,buf);
 
        while (fgets(buf, (SIZ-1), mfp)!=NULL) {
                buf[strlen(buf)-1] = 0;
                do_help_subst(buf);
                cprintf("%s\n",buf);
-               }
+       }
 
        fclose(mfp);
        cprintf("000\n");
-       }
+}
 
 
 /*
@@ -541,34 +555,34 @@ void cmd_emsg(char *mname)
        extract(buf,mname,0);
        for (a=0; a<strlen(buf); ++a) {         /* security measure */
                if (buf[a] == '/') buf[a] = '.';
-               }
+       }
 
        dirs[0]=mallok(64);
        dirs[1]=mallok(64);
        strcpy(dirs[0],"messages");
        strcpy(dirs[1],"help");
-       mesg_locate(targ,buf,2,dirs);
+       mesg_locate(targ,sizeof targ,buf,2,(const char**)dirs);
        phree(dirs[0]);
        phree(dirs[1]);
 
        if (strlen(targ)==0) {
                snprintf(targ, sizeof targ, "./help/%s", buf);
-               }
+       }
 
        mfp = fopen(targ,"w");
        if (mfp==NULL) {
                cprintf("%d Cannot open '%s': %s\n",
                        ERROR,targ,strerror(errno));
                return;
-               }
+       }
        cprintf("%d %s\n", SEND_LISTING, targ);
 
        while (client_gets(buf), strcmp(buf, "000")) {
                fprintf(mfp, "%s\n", buf);
-               }
+       }
 
        fclose(mfp);
-       }
+}
 
 
 /* Don't show the names of private rooms unless the viewing
@@ -671,7 +685,7 @@ void cmd_term(char *cmdbuf)
 
        if (found_it) {
                if (allowed) {
-                       cprintf("%d Session terminated.\n", OK);
+                       cprintf("%d Session terminated.\n", CIT_OK);
                }
                else {
                        cprintf("%d You are not allowed to do that.\n",
@@ -691,16 +705,16 @@ void cmd_term(char *cmdbuf)
  * get the paginator prompt
  */
 void cmd_more(void) {
-       cprintf("%d %s\n",OK,config.c_moreprompt);
-       }
+       cprintf("%d %s\n", CIT_OK, config.c_moreprompt);
+}
 
 /*
  * echo 
  */
 void cmd_echo(char *etext)
 {
-       cprintf("%d %s\n",OK,etext);
-       }
+       cprintf("%d %s\n", CIT_OK, etext);
+}
 
 
 
@@ -716,13 +730,13 @@ void cmd_ipgm(char *argbuf)
                CC->internal_pgm = 1;
                strcpy(CC->curr_user, "<internal program>");
                CC->cs_flags = CC->cs_flags|CS_STEALTH;
-               cprintf("%d Authenticated as an internal program.\n",OK);
-               }
+               cprintf("%d Authenticated as an internal program.\n",CIT_OK);
+       }
        else {
                cprintf("%d Authentication failed.\n",ERROR);
                lprintf(3, "Warning: ipgm authentication failed.\n");
-               }
        }
+}
 
 
 /*
@@ -732,9 +746,9 @@ void cmd_down(void) {
 
        if (CtdlAccessCheck(ac_aide)) return;
 
-       cprintf("%d Shutting down server.  Goodbye.\n", OK);
+       cprintf("%d Shutting down server.  Goodbye.\n", CIT_OK);
        time_to_die = 1;
-       }
+}
 
 /*
  * Schedule or cancel a server shutdown
@@ -748,8 +762,8 @@ void cmd_scdn(char *argbuf)
        new_state = extract_int(argbuf, 0);
        if ((new_state == 0) || (new_state == 1)) {
                ScheduledShutdown = new_state;
-               }
-       cprintf("%d %d\n", OK, ScheduledShutdown);
+       }
+       cprintf("%d %d\n", CIT_OK, ScheduledShutdown);
 }
 
 
@@ -764,7 +778,7 @@ void cmd_asyn(char *argbuf)
        if ((new_state == 0) || (new_state == 1)) {
                CC->is_async = new_state;
        }
-       cprintf("%d %d\n", OK, CC->is_async);
+       cprintf("%d %d\n", CIT_OK, CC->is_async);
 }
 
 
@@ -781,7 +795,7 @@ void generate_nonce(struct CitContext *con) {
        gettimeofday(&tv, NULL);
        memset(con->cs_nonce, NONCE_SIZE, 0);
        snprintf(con->cs_nonce, NONCE_SIZE, "<%d%ld@%s>",
-               rand(), tv.tv_usec, config.c_fqdn);
+               rand(), (long)tv.tv_usec, config.c_fqdn);
 }
 
 
@@ -821,7 +835,7 @@ void begin_session(struct CitContext *con)
        if (!CC->is_local_socket) {
                if (!getpeername(con->client_socket,
                   (struct sockaddr *) &sin, &len))
-                       locate_host(con->cs_host, &sin.sin_addr);
+                       locate_host(con->cs_host, sizeof con->cs_host, &sin.sin_addr);
        }
        else {
                strcpy(con->cs_host, "");
@@ -835,7 +849,7 @@ void begin_session(struct CitContext *con)
        if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions))
                con->nologin = 1;
 
-       lprintf(3, "citserver[%3d]: started.\n", con->cs_pid);
+       lprintf(3, "Session started.\n");
 
        /* Run any session startup routines registered by loadable modules */
        PerformSessionHooks(EVT_START);
@@ -850,11 +864,11 @@ void citproto_begin_session() {
                        "(maximum is %d)\n",
                        ERROR+MAX_SESSIONS_EXCEEDED,
                        config.c_nodename, config.c_maxsessions);
-               }
+       }
        else {
                cprintf("%d %s Citadel/UX server ready.\n",
-                       OK, config.c_nodename);
-               }
+                       CIT_OK, config.c_nodename);
+       }
 }
 
 
@@ -873,7 +887,7 @@ void do_command_loop(void) {
                CC->kill_me = 1;
                return;
        }
-       lprintf(5, "citserver[%3d]: %s\n", CC->cs_pid, cmdbuf);
+       lprintf(5, "Citadel: %s\n", cmdbuf);
 
        /*
         * Let other clients see the last command we executed, and
@@ -886,7 +900,7 @@ void do_command_loop(void) {
                safestrncpy(CC->lastcmdname, cmdbuf, 
                        sizeof(CC->lastcmdname) );
                time(&CC->lastidle);
-               }
+       }
                
        if ((strncasecmp(cmdbuf, "ENT0", 4))
           && (strncasecmp(cmdbuf, "MESG", 4))
@@ -896,338 +910,336 @@ void do_command_loop(void) {
        }
                   
        if (!strncasecmp(cmdbuf,"NOOP",4)) {
-               cprintf("%d%cok\n",OK,CtdlCheckExpress());
-               }
+               cprintf("%d%cok\n",CIT_OK,CtdlCheckExpress());
+       }
 
        else if (!strncasecmp(cmdbuf,"QUIT",4)) {
-               cprintf("%d Goodbye.\n",OK);
+               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",OK);
-               }
+               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,"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,"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,"OPNA",4)) {
                cmd_opna(&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,"ENT3",4)) {
-               cmd_ent3(&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();
-               }
+       }
 
        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();
-               }
+       }
 
        else if (!strncasecmp(cmdbuf,"SCDN",4)) {
                cmd_scdn(&cmdbuf[5]);
-               }
-
-       else if (!strncasecmp(cmdbuf, "NSET", 4)) {
-               cmd_nset(&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, "VIEW", 4)) {
+               cmd_view(&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);
-               }
+       else if (!DLoader_Exec_Cmd(cmdbuf)) {
+               cprintf("%d Unrecognized or unsupported command.\n", ERROR);
+              }
 
        /* Run any after-each-command outines registered by modules */
        PerformSessionHooks(EVT_CMD);