]> code.citadel.org Git - citadel.git/blobdiff - citadel/serv_chat.c
* Cc: and Bcc: support. Not finished yet.
[citadel.git] / citadel / serv_chat.c
index 03473dd970531db0c1632987b207574d067fc8ec..8b4e28c78586539e8c3b447a777c3358354e9986 100644 (file)
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
 #endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <syslog.h>
+#include "serv_extensions.h"
 #include "serv_chat.h"
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "dynloader.h"
 #include "tools.h"
 #include "msgbase.h"
 #include "user_ops.h"
 #include "room_ops.h"
 
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+
 struct ChatLine *ChatQueue = NULL;
 int ChatLastMsg = 0;
 
-extern struct CitContext *ContextList;
-
-
+/*
+ * This message can be set to anything you want, but it is
+ * checked for consistency so don't move it away from here.
+ */
+#define KICKEDMSG "You have been kicked out of this room."
 
 void allwrite(char *cmdbuf, int flag, char *username)
 {
@@ -53,20 +66,23 @@ void allwrite(char *cmdbuf, int flag, char *username)
        if (CC->fake_username[0])
                un = CC->fake_username;
        else
-               un = CC->usersupp.fullname;
+               un = CC->user.fullname;
        if (flag == 1) {
                snprintf(bcast, sizeof bcast, ":|<%s %s>", un, cmdbuf);
        } else if (flag == 0) {
                snprintf(bcast, sizeof bcast, "%s|%s", un, cmdbuf);
        } else if (flag == 2) {
                snprintf(bcast, sizeof bcast, ":|<%s whispers %s>", un, cmdbuf);
+       } else if (flag == 3) {
+               snprintf(bcast, sizeof bcast, ":|%s", KICKEDMSG);
        }
        if ((strcasecmp(cmdbuf, "NOOP")) && (flag != 2)) {
                fp = fopen(CHATLOG, "a");
-               fprintf(fp, "%s\n", bcast);
+               if (fp != NULL)
+                       fprintf(fp, "%s\n", bcast);
                fclose(fp);
        }
-       clnew = (struct ChatLine *) mallok(sizeof(struct ChatLine));
+       clnew = (struct ChatLine *) malloc(sizeof(struct ChatLine));
        memset(clnew, 0, sizeof(struct ChatLine));
        if (clnew == NULL) {
                fprintf(stderr, "citserver: cannot alloc chat line: %s\n",
@@ -76,7 +92,7 @@ void allwrite(char *cmdbuf, int flag, char *username)
        time(&now);
        clnew->next = NULL;
        clnew->chat_time = now;
-       safestrncpy(clnew->chat_room, CC->quickroom.QRname,
+       safestrncpy(clnew->chat_room, CC->room.QRname,
                        sizeof clnew->chat_room);
        clnew->chat_room[sizeof clnew->chat_room - 1] = 0;
        if (username) {
@@ -104,7 +120,7 @@ void allwrite(char *cmdbuf, int flag, char *username)
        while ((ChatQueue != NULL) && (now - ChatQueue->chat_time >= 120L)) {
                clptr = ChatQueue;
                ChatQueue = ChatQueue->next;
-               phree(clptr);
+               free(clptr);
        }
        end_critical_section(S_CHATQUEUE);
 }
@@ -154,8 +170,8 @@ void do_chat_listing(int allflag)
        begin_critical_section(S_SESSION_TABLE);
        for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
                if (ccptr->cs_flags & CS_CHAT) {
-                       if (!strcasecmp(ccptr->quickroom.QRname,
-                          CC->quickroom.QRname)) {
+                       if (!strcasecmp(ccptr->room.QRname,
+                          CC->room.QRname)) {
                                ++count;
                        }
                        else {
@@ -164,7 +180,7 @@ void do_chat_listing(int allflag)
                }
 
                GenerateRoomDisplay(roomname, ccptr, CC);
-               if ((CC->usersupp.axlevel < 6)
+               if ((CC->user.axlevel < 6)
                   && (strlen(ccptr->fake_roomname)>0)) {
                        strcpy(roomname, ccptr->fake_roomname);
                }
@@ -184,7 +200,7 @@ void do_chat_listing(int allflag)
                for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
 
                        GenerateRoomDisplay(roomname, ccptr, CC);
-                       if ((CC->usersupp.axlevel < 6)
+                       if ((CC->user.axlevel < 6)
                        && (strlen(ccptr->fake_roomname)>0)) {
                                strcpy(roomname, ccptr->fake_roomname);
                        }
@@ -233,6 +249,7 @@ void cmd_chat(char *argbuf)
        CC->cs_flags = CC->cs_flags | CS_CHAT;
        cprintf("%d Entering chat mode (type '/help' for available commands)\n",
                START_CHAT_MODE);
+       unbuffer_output();
 
        MyLastMsg = ChatLastMsg;
 
@@ -254,7 +271,7 @@ void cmd_chat(char *argbuf)
 
                retval = client_read_to(&cmdbuf[linelen], 1, 2);
 
-               if (retval < 0) {       /* socket broken? */
+               if (retval < 0 || CC->kill_me) {        /* socket broken? */
                        if ((CC->cs_flags & CS_STEALTH) == 0) {
                                allwrite("<disconnected>", 0, NULL);
                        }
@@ -299,7 +316,10 @@ void cmd_chat(char *argbuf)
                                        cprintf(":|/whobbs (list users in chat -and- elsewhere) \n");
                                        cprintf(":|/me     ('action' line, ala irc) \n");
                                        cprintf(":|/msg    (send private message, ala irc) \n");
-                                       cprintf(":|/quit   (return to the BBS) \n");
+                                       if (is_room_aide()) {
+                                               cprintf(":|/kick   (kick another user out of this room) \n");
+                                       }
+                                       cprintf(":|/quit   (exit from this chat) \n");
                                        cprintf(":|\n");
                                        ok_cmd = 1;
                                }
@@ -323,7 +343,22 @@ void cmd_chat(char *argbuf)
                                                if (strcasecmp(CC->curr_user, t_context->curr_user))
                                                        allwrite(strptr1, 2, t_context->curr_user);
                                        } else
-                                               cprintf(":|User not found.\n", cmdbuf);
+                                               cprintf(":|User not found.\n");
+                                       cprintf("\n");
+                               }
+                               /* The /kick function is implemented by sending a specific
+                                * message to the kicked-out user's context.  When that message
+                                * is processed by the read loop, that context will exit.
+                                */
+                               if ( (!strncasecmp(cmdbuf, "/kick ", 6)) && (is_room_aide()) ) {
+                                       ok_cmd = 1;
+                                       strptr1 = &cmdbuf[6];
+                                       strcat(strptr1, " ");
+                                       if ((t_context = find_context(&strptr1))) {
+                                               if (strcasecmp(CC->curr_user, t_context->curr_user))
+                                                       allwrite(strptr1, 3, t_context->curr_user);
+                                       } else
+                                               cprintf(":|User not found.\n");
                                        cprintf("\n");
                                }
                                if ((cmdbuf[0] != '/') && (strlen(cmdbuf) > 0)) {
@@ -346,8 +381,23 @@ void cmd_chat(char *argbuf)
                        ThisLastMsg = ChatLastMsg;
                        for (clptr = ChatQueue; clptr != NULL; clptr = clptr->next) {
                                if ((clptr->chat_seq > MyLastMsg) && ((!clptr->chat_username[0]) || (!strncasecmp(un, clptr->chat_username, 32)))) {
-                                       if ((!clptr->chat_room[0]) || (!strncasecmp(CC->quickroom.QRname, clptr->chat_room, ROOMNAMELEN))) {
+                                       if ((!clptr->chat_room[0]) || (!strncasecmp(CC->room.QRname, clptr->chat_room, ROOMNAMELEN))) {
+                                               /* Output new chat data */
                                                cprintf("%s\n", clptr->chat_text);
+
+                                               /* See if we've been force-quitted (kicked etc.) */
+                                               if (!strcmp(&clptr->chat_text[2], KICKEDMSG)) {
+                                                       allwrite("<kicked out of this room>", 0, NULL);
+                                                       cprintf("000\n");
+                                                       CC->cs_flags = CC->cs_flags - CS_CHAT;
+
+                                                       /* Kick user out of room */
+                                                       CtdlInvtKick(CC->user.fullname, 0);
+
+                                                       /* And return to the Lobby */
+                                                       usergoto(config.c_baseroom, 0, 0, NULL, NULL);
+                                                       return;
+                                               }
                                        }
                                }
                        }
@@ -359,17 +409,17 @@ void cmd_chat(char *argbuf)
 
 
 /*
- * Delete any remaining express messages
+ * Delete any remaining instant messages
  */
-void delete_express_messages(void) {
+void delete_instant_messages(void) {
        struct ExpressMessage *ptr;
 
        begin_critical_section(S_SESSION_TABLE);
        while (CC->FirstExpressMessage != NULL) {
                ptr = CC->FirstExpressMessage->next;
                if (CC->FirstExpressMessage->text != NULL)
-                       phree(CC->FirstExpressMessage->text);
-               phree(CC->FirstExpressMessage);
+                       free(CC->FirstExpressMessage->text);
+               free(CC->FirstExpressMessage);
                CC->FirstExpressMessage = ptr;
                }
        end_critical_section(S_SESSION_TABLE);
@@ -379,14 +429,14 @@ void delete_express_messages(void) {
 
 
 /*
- * Poll for express messages (OLD METHOD -- ***DEPRECATED ***)
+ * Poll for instant messages (OLD METHOD -- ***DEPRECATED ***)
  */
 void cmd_pexp(char *argbuf)
 {
        struct ExpressMessage *ptr, *holdptr;
 
        if (CC->FirstExpressMessage == NULL) {
-               cprintf("%d No express messages waiting.\n", ERROR);
+               cprintf("%d No instant messages waiting.\n", ERROR + MESSAGE_NOT_FOUND);
                return;
        }
        begin_critical_section(S_SESSION_TABLE);
@@ -409,8 +459,8 @@ void cmd_pexp(char *argbuf)
                        memfmout(80, ptr->text, 0, "\n");
 
                holdptr = ptr->next;
-               if (ptr->text != NULL) phree(ptr->text);
-               phree(ptr);
+               if (ptr->text != NULL) free(ptr->text);
+               free(ptr);
                ptr = holdptr;
        }
        cprintf("000\n");
@@ -418,13 +468,13 @@ void cmd_pexp(char *argbuf)
 
 
 /*
- * Get express messages (new method)
+ * Get instant messages (new method)
  */
 void cmd_gexp(char *argbuf) {
        struct ExpressMessage *ptr;
 
        if (CC->FirstExpressMessage == NULL) {
-               cprintf("%d No express messages waiting.\n", ERROR);
+               cprintf("%d No instant messages waiting.\n", ERROR + MESSAGE_NOT_FOUND);
                return;
        }
 
@@ -436,21 +486,21 @@ void cmd_gexp(char *argbuf) {
        cprintf("%d %d|%ld|%d|%s|%s\n",
                LISTING_FOLLOWS,
                ((ptr->next != NULL) ? 1 : 0),          /* more msgs? */
-               ptr->timestamp,                         /* time sent */
+               (long)ptr->timestamp,                           /* time sent */
                ptr->flags,                             /* flags */
                ptr->sender,                            /* sender of msg */
                config.c_nodename);                     /* static for now */
        if (ptr->text != NULL) {
                memfmout(80, ptr->text, 0, "\n");
                if (ptr->text[strlen(ptr->text)-1] != '\n') cprintf("\n");
-               phree(ptr->text);
+               free(ptr->text);
                }
        cprintf("000\n");
-       phree(ptr);
+       free(ptr);
 }
 
 /*
- * Asynchronously deliver express messages'
+ * Asynchronously deliver instant messages
  */
 void cmd_gexp_async(void) {
 
@@ -460,12 +510,11 @@ void cmd_gexp_async(void) {
        /* And don't do it if there's nothing to send. */
        if (CC->FirstExpressMessage == NULL) return;
 
-       cprintf("%d express msg\n", ASYNC_MSG + ASYNC_GEXP);
-       cmd_gexp("");
+       cprintf("%d instant msg\n", ASYNC_MSG + ASYNC_GEXP);
 }
 
 /*
- * Back end support function for send_express_message() and company
+ * Back end support function for send_instant_message() and company
  */
 void add_xmsg_to_context(struct CitContext *ccptr, 
                        struct ExpressMessage *newmsg) 
@@ -482,17 +531,27 @@ void add_xmsg_to_context(struct CitContext *ccptr,
                }
                findend->next = newmsg;
        }
+
+       /* If the target context is a session which can handle asynchronous
+        * messages, go ahead and set the flag for that.
+        */
+       if (ccptr->is_async) {
+               ccptr->async_waiting = 1;
+               if (ccptr->state == CON_IDLE) {
+                       ccptr->state = CON_READY;
+               }
+       }
 }
 
 
 
 
 /* 
- * This is the back end to the express message sending function.  
+ * This is the back end to the instant message sending function.  
  * Returns the number of users to which the message was sent.
  * Sending a zero-length message tests for recipients without sending messages.
  */
-int send_express_message(char *lun, char *x_user, char *x_msg)
+int send_instant_message(char *lun, char *x_user, char *x_msg)
 {
        int message_sent = 0;           /* number of successful sends */
 
@@ -506,7 +565,6 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
        struct savelist *sl = NULL;     /* list of rooms to save this page */
        struct savelist *sptr;
        struct CtdlMessage *logmsg;
-       char roomname[ROOMNAMELEN];
        long msgnum;
 
        if (strlen(x_msg) > 0) {
@@ -521,15 +579,15 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
                if (ccptr->fake_username[0])    /* <bc> */
                        un = ccptr->fake_username;
                else
-                       un = ccptr->usersupp.fullname;
+                       un = ccptr->user.fullname;
 
                if ( ((!strcasecmp(un, x_user))
                    || (!strcasecmp(x_user, "broadcast")))
                    && ((ccptr->disable_exp == 0)
-                   || (CC->usersupp.axlevel >= 6)) ) {
+                   || (CC->user.axlevel >= 6)) ) {
                        if (do_send) {
                                newmsg = (struct ExpressMessage *)
-                                       mallok(sizeof (struct ExpressMessage));
+                                       malloc(sizeof (struct ExpressMessage));
                                memset(newmsg, 0,
                                        sizeof (struct ExpressMessage));
                                time(&(newmsg->timestamp));
@@ -537,7 +595,7 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
                                            sizeof newmsg->sender);
                                if (!strcasecmp(x_user, "broadcast"))
                                        newmsg->flags |= EM_BROADCAST;
-                               newmsg->text = strdoop(x_msg);
+                               newmsg->text = strdup(x_msg);
 
                                add_xmsg_to_context(ccptr, newmsg);
 
@@ -547,7 +605,8 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
                                                malloc(sizeof(struct savelist));
                                        sptr->next = sl;
                                        MailboxName(sptr->roomname,
-                                               &ccptr->usersupp, PAGELOGROOM);
+                                                   sizeof sptr->roomname,
+                                               &ccptr->user, PAGELOGROOM);
                                        sl = sptr;
                                }
                        }
@@ -559,28 +618,27 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
        /* Log the page to disk if configured to do so  */
        if ( (do_send) && (message_sent) ) {
 
-               logmsg = mallok(sizeof(struct CtdlMessage));
+               logmsg = malloc(sizeof(struct CtdlMessage));
                memset(logmsg, 0, sizeof(struct CtdlMessage));
                logmsg->cm_magic = CTDLMESSAGE_MAGIC;
                logmsg->cm_anon_type = MES_NORMAL;
                logmsg->cm_format_type = 0;
-               logmsg->cm_fields['A'] = strdoop(lun);
-               logmsg->cm_fields['N'] = strdoop(NODENAME);
-               logmsg->cm_fields['O'] = strdoop(PAGELOGROOM);
-               logmsg->cm_fields['R'] = strdoop(x_user);
-               logmsg->cm_fields['M'] = strdoop(x_msg);
+               logmsg->cm_fields['A'] = strdup(lun);
+               logmsg->cm_fields['N'] = strdup(NODENAME);
+               logmsg->cm_fields['O'] = strdup(PAGELOGROOM);
+               logmsg->cm_fields['R'] = strdup(x_user);
+               logmsg->cm_fields['M'] = strdup(x_msg);
 
 
                /* Save a copy of the message in the sender's log room,
                 * creating the room if necessary.
                 */
-               MailboxName(roomname, &CC->usersupp, PAGELOGROOM);
-               create_room(roomname, 4, "", 0, 1);
-               msgnum = CtdlSaveMsg(logmsg, "", roomname, MES_LOCAL);
+               create_room(PAGELOGROOM, 4, "", 0, 1, 0, VIEW_BBS);
+               msgnum = CtdlSubmitMsg(logmsg, NULL, NULL, NULL, PAGELOGROOM);
 
                /* Now save a copy in the global log room, if configured */
                if (strlen(config.c_logpages) > 0) {
-                       create_room(config.c_logpages, 3, "", 0, 1);
+                       create_room(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS);
                        CtdlSaveMsgPointerInRoom(config.c_logpages, msgnum, 0);
                }
 
@@ -590,10 +648,10 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
                 * but we've already supplied the namespace prefix.
                 */
                while (sl != NULL) {
-                       create_room(sl->roomname, 5, "", 0, 1);
+                       create_room(sl->roomname, 5, "", 0, 1, 1, VIEW_BBS);
                        CtdlSaveMsgPointerInRoom(sl->roomname, msgnum, 0);
                        sptr = sl->next;
-                       phree(sl);
+                       free(sl);
                        sl = sptr;
                }
 
@@ -604,13 +662,13 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
 }
 
 /*
- * send express messages  <bc>
+ * send instant messages  <bc>
  */
 void cmd_sexp(char *argbuf)
 {
        int message_sent = 0;
-       char x_user[SIZ];
-       char x_msg[SIZ];
+       char x_user[USERNAME_SIZE];
+       char x_msg[1024];
        char *lun;              /* <bc> */
        char *x_big_msgbuf = NULL;
 
@@ -621,17 +679,16 @@ void cmd_sexp(char *argbuf)
        if (CC->fake_username[0])
                lun = CC->fake_username;
        else
-               lun = CC->usersupp.fullname;
-
-       extract(x_user, argbuf, 0);
+               lun = CC->user.fullname;
 
-       extract(x_msg, argbuf, 1);
+       extract_token(x_user, argbuf, 0, '|', sizeof x_user);
+       extract_token(x_msg, argbuf, 1, '|', sizeof x_msg);
 
        if (!x_user[0]) {
-               cprintf("%d You were not previously paged.\n", ERROR);
+               cprintf("%d You were not previously paged.\n", ERROR + NO_SUCH_USER);
                return;
        }
-       if ((!strcasecmp(x_user, "broadcast")) && (CC->usersupp.axlevel < 6)) {
+       if ((!strcasecmp(x_user, "broadcast")) && (CC->user.axlevel < 6)) {
                cprintf("%d Higher access required to send a broadcast.\n",
                        ERROR + HIGHER_ACCESS_REQUIRED);
                return;
@@ -640,17 +697,23 @@ void cmd_sexp(char *argbuf)
        if (!strcmp(x_msg, "-")) {
                message_sent = PerformXmsgHooks(lun, x_user, "");
                if (message_sent == 0) {
-                       cprintf("%d '%s' is not logged in "
-                               "or is not accepting pages.\n",
-                               ERROR, x_user);
+                       if (getuser(NULL, x_user))
+                               cprintf("%d '%s' does not exist.\n",
+                                               ERROR + NO_SUCH_USER, x_user);
+                       else
+                               cprintf("%d '%s' is not logged in "
+                                               "or is not accepting pages.\n",
+                                               ERROR + RESOURCE_NOT_OPEN, x_user);
                        return;
                }
+               unbuffer_output();
                cprintf("%d Transmit message (will deliver to %d users)\n",
                        SEND_LISTING, message_sent);
-               x_big_msgbuf = mallok(SIZ);
+               x_big_msgbuf = malloc(SIZ);
                memset(x_big_msgbuf, 0, SIZ);
-               while (client_gets(x_msg), strcmp(x_msg, "000")) {
-                       x_big_msgbuf = reallok(x_big_msgbuf,
+               while (client_getln(x_msg, sizeof x_msg),
+                     strcmp(x_msg, "000")) {
+                       x_big_msgbuf = realloc(x_big_msgbuf,
                               strlen(x_big_msgbuf) + strlen(x_msg) + 4);
                        if (strlen(x_big_msgbuf) > 0)
                           if (x_big_msgbuf[strlen(x_big_msgbuf)] != '\n')
@@ -658,7 +721,7 @@ void cmd_sexp(char *argbuf)
                        strcat(x_big_msgbuf, x_msg);
                }
                PerformXmsgHooks(lun, x_user, x_big_msgbuf);
-               phree(x_big_msgbuf);
+               free(x_big_msgbuf);
 
                /* This loop handles inline pages */
        } else {
@@ -666,16 +729,20 @@ void cmd_sexp(char *argbuf)
 
                if (message_sent > 0) {
                        if (strlen(x_msg) > 0)
-                               cprintf("%d Message sent", OK);
+                               cprintf("%d Message sent", CIT_OK);
                        else
-                               cprintf("%d Ok to send message", OK);
+                               cprintf("%d Ok to send message", CIT_OK);
                        if (message_sent > 1)
                                cprintf(" to %d users", message_sent);
                        cprintf(".\n");
                } else {
-                       cprintf("%d '%s' is not logged in "
-                               "or is not accepting pages.\n",
-                               ERROR, x_user);
+                       if (getuser(NULL, x_user))
+                               cprintf("%d '%s' does not exist.\n",
+                                               ERROR + NO_SUCH_USER, x_user);
+                       else
+                               cprintf("%d '%s' is not logged in "
+                                               "or is not accepting pages.\n",
+                                               ERROR + RESOURCE_NOT_OPEN, x_user);
                }
 
 
@@ -691,18 +758,16 @@ void cmd_dexp(char *argbuf)
 {
        int new_state;
 
-       if (!CC->logged_in) {
-               cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
-               return;
-               }
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
        new_state = extract_int(argbuf, 0);
        if ((new_state == 0) || (new_state == 1)) {
                CC->disable_exp = new_state;
-               }
-       cprintf("%d %d\n", OK, CC->disable_exp);
        }
 
+       cprintf("%d %d\n", CIT_OK, CC->disable_exp);
+}
+
 
 /*
  * Request client termination
@@ -721,14 +786,14 @@ void cmd_reqt(char *argbuf) {
                if ((ccptr->cs_pid == which_session) || (which_session == 0)) {
 
                        newmsg = (struct ExpressMessage *)
-                               mallok(sizeof (struct ExpressMessage));
+                               malloc(sizeof (struct ExpressMessage));
                        memset(newmsg, 0,
                                sizeof (struct ExpressMessage));
                        time(&(newmsg->timestamp));
-                       safestrncpy(newmsg->sender, CC->usersupp.fullname,
+                       safestrncpy(newmsg->sender, CC->user.fullname,
                                    sizeof newmsg->sender);
                        newmsg->flags |= EM_GO_AWAY;
-                       newmsg->text = strdoop("Automatic logoff requested.");
+                       newmsg->text = strdup("Automatic logoff requested.");
 
                        add_xmsg_to_context(ccptr, newmsg);
                        ++sessions;
@@ -736,22 +801,22 @@ void cmd_reqt(char *argbuf) {
                }
        }
        end_critical_section(S_SESSION_TABLE);
-       cprintf("%d Sent termination request to %d sessions.\n", OK, sessions);
+       cprintf("%d Sent termination request to %d sessions.\n", CIT_OK, sessions);
 }
 
 
 
-char *Dynamic_Module_Init(void)
+char *serv_chat_init(void)
 {
        CtdlRegisterProtoHook(cmd_chat, "CHAT", "Begin real-time chat");
-       CtdlRegisterProtoHook(cmd_pexp, "PEXP", "Poll for express messages");
-       CtdlRegisterProtoHook(cmd_gexp, "GEXP", "Get express messages");
-       CtdlRegisterProtoHook(cmd_sexp, "SEXP", "Send an express message");
-       CtdlRegisterProtoHook(cmd_dexp, "DEXP", "Disable express messages");
+       CtdlRegisterProtoHook(cmd_pexp, "PEXP", "Poll for instant messages");
+       CtdlRegisterProtoHook(cmd_gexp, "GEXP", "Get instant messages");
+       CtdlRegisterProtoHook(cmd_sexp, "SEXP", "Send an instant message");
+       CtdlRegisterProtoHook(cmd_dexp, "DEXP", "Disable instant messages");
        CtdlRegisterProtoHook(cmd_reqt, "REQT", "Request client termination");
-       CtdlRegisterSessionHook(cmd_gexp_async, EVT_CMD);
-       CtdlRegisterSessionHook(delete_express_messages, EVT_STOP);
-       CtdlRegisterXmsgHook(send_express_message, XMSG_PRI_LOCAL);
+       CtdlRegisterSessionHook(cmd_gexp_async, EVT_ASYNC);
+       CtdlRegisterSessionHook(delete_instant_messages, EVT_STOP);
+       CtdlRegisterXmsgHook(send_instant_message, XMSG_PRI_LOCAL);
        return "$Id$";
 }