]> code.citadel.org Git - citadel.git/blobdiff - citadel/serv_chat.c
* Variable names, comments, documentation, etc... removed the acronym 'BBS'
[citadel.git] / citadel / serv_chat.c
index 14ac7e6a8333259936efe53361f0f0bcb8cf6a23..b323dab7a5590a46f2a9efb93afc0fe6bcc11373 100644 (file)
@@ -1,11 +1,11 @@
 /*
- * serv_chat.c
+ * $Id$
  * 
  * This module handles all "real time" communication between users.  The
  * modes of communication currently supported are Chat and Paging.
  *
- * $Id$
  */
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/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 <pthread.h>
 #include "citadel.h"
 #include "server.h"
-#include <syslog.h>
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
+#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;
-
-#define MODULE_NAME    "Chat module"
-#define MODULE_AUTHOR  "Art Cancro"
-#define MODULE_EMAIL   "ajc@uncnsrd.mt-kisco.ny.us"
-#define MAJOR_VERSION  1
-#define MINOR_VERSION  0
-
-static struct DLModule_Info info =
-{
-       MODULE_NAME,
-       MODULE_AUTHOR,
-       MODULE_EMAIL,
-       MAJOR_VERSION,
-       MINOR_VERSION
-};
-
-struct DLModule_Info *Dynamic_Module_Init(void)
-{
-       CtdlRegisterProtoHook(cmd_chat, "CHAT", "Begin real-time chat");
-       CtdlRegisterProtoHook(cmd_pexp, "PEXP", "Poll for express messages");
-       CtdlRegisterProtoHook(cmd_sexp, "SEXP", "Send an express message");
-       return &info;
-}
+/*
+ * 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 *roomname, char *username)
+void allwrite(char *cmdbuf, int flag, char *username)
 {
        FILE *fp;
-       char bcast[256];
+       char bcast[SIZ];
        char *un;
        struct ChatLine *clptr, *clnew;
        time_t now;
@@ -73,20 +66,23 @@ void allwrite(char *cmdbuf, int flag, char *roomname, char *username)
        if (CC->fake_username[0])
                un = CC->fake_username;
        else
-               un = CC->usersupp.fullname;
+               un = CC->user.fullname;
        if (flag == 1) {
-               sprintf(bcast, ":|<%s %s>", un, cmdbuf);
+               snprintf(bcast, sizeof bcast, ":|<%s %s>", un, cmdbuf);
        } else if (flag == 0) {
-               sprintf(bcast, "%s|%s", un, cmdbuf);
+               snprintf(bcast, sizeof bcast, "%s|%s", un, cmdbuf);
        } else if (flag == 2) {
-               sprintf(bcast, ":|<%s whispers %s>", un, cmdbuf);
+               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",
@@ -96,15 +92,16 @@ void allwrite(char *cmdbuf, int flag, char *roomname, char *username)
        time(&now);
        clnew->next = NULL;
        clnew->chat_time = now;
-       strncpy(clnew->chat_room, roomname, sizeof clnew->chat_room);
+       safestrncpy(clnew->chat_room, CC->room.QRname,
+                       sizeof clnew->chat_room);
        clnew->chat_room[sizeof clnew->chat_room - 1] = 0;
        if (username) {
-               strncpy(clnew->chat_username, username,
+               safestrncpy(clnew->chat_username, username,
                        sizeof clnew->chat_username);
                clnew->chat_username[sizeof clnew->chat_username - 1] = 0;
        } else
                clnew->chat_username[0] = '\0';
-       strcpy(clnew->chat_text, bcast);
+       safestrncpy(clnew->chat_text, bcast, sizeof clnew->chat_text);
 
        /* Here's the critical section.
         * First, add the new message to the queue...
@@ -120,16 +117,12 @@ void allwrite(char *cmdbuf, int flag, char *roomname, char *username)
        }
 
        /* Then, before releasing the lock, free the expired messages */
-       while (1) {
-               if (ChatQueue == NULL)
-                       goto DONE_FREEING;
-               if ((now - ChatQueue->chat_time) < 120L)
-                       goto DONE_FREEING;
+       while ((ChatQueue != NULL) && (now - ChatQueue->chat_time >= 120L)) {
                clptr = ChatQueue;
                ChatQueue = ChatQueue->next;
-               phree(clptr);
+               free(clptr);
        }
-      DONE_FREEING:end_critical_section(S_CHATQUEUE);
+       end_critical_section(S_CHATQUEUE);
 }
 
 
@@ -159,42 +152,90 @@ t_context *find_context(char **unstr)
 }
 
 /*
- * List users in chat.  Setting allflag to 1 also lists users elsewhere.
+ * List users in chat.
+ * allflag ==  0 = list users in chat
+ *             1 = list users in chat, followed by users not in chat
+ *             2 = display count only
  */
 
 void do_chat_listing(int allflag)
 {
        struct CitContext *ccptr;
+       int count = 0;
+       int count_elsewhere = 0;
+       char roomname[ROOMNAMELEN];
 
-       cprintf(":|\n:| Users currently in chat:\n");
+       if ((allflag == 0) || (allflag == 1))
+               cprintf(":|\n:| Users currently in chat:\n");
        begin_critical_section(S_SESSION_TABLE);
        for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
-               if ((!strcasecmp(ccptr->cs_room, "<chat>"))
+               if (ccptr->cs_flags & CS_CHAT) {
+                       if (!strcasecmp(ccptr->room.QRname,
+                          CC->room.QRname)) {
+                               ++count;
+                       }
+                       else {
+                               ++count_elsewhere;
+                       }
+               }
+
+               GenerateRoomDisplay(roomname, ccptr, CC);
+               if ((CC->user.axlevel < 6)
+                  && (strlen(ccptr->fake_roomname)>0)) {
+                       strcpy(roomname, ccptr->fake_roomname);
+               }
+
+               if ((ccptr->cs_flags & CS_CHAT)
                    && ((ccptr->cs_flags & CS_STEALTH) == 0)) {
-                       cprintf(":| %-25s <%s>\n", (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user, ccptr->chat_room);
+                       if ((allflag == 0) || (allflag == 1)) {
+                               cprintf(":| %-25s <%s>:\n",
+                                       (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user,
+                                       roomname);
+                       }
                }
        }
 
        if (allflag == 1) {
                cprintf(":|\n:| Users not in chat:\n");
                for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
-                       if ((strcasecmp(ccptr->cs_room, "<chat>"))
+
+                       GenerateRoomDisplay(roomname, ccptr, CC);
+                       if ((CC->user.axlevel < 6)
+                       && (strlen(ccptr->fake_roomname)>0)) {
+                               strcpy(roomname, ccptr->fake_roomname);
+                       }
+
+                       if (((ccptr->cs_flags & CS_CHAT) == 0)
                            && ((ccptr->cs_flags & CS_STEALTH) == 0)) {
-                               cprintf(":| %-25s <%s>:\n", (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user, (ccptr->fake_roomname[0]) ? ccptr->fake_roomname : ccptr->cs_room);
+                               cprintf(":| %-25s <%s>:\n",
+                                       (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user,
+                                       roomname);
                        }
                }
        }
        end_critical_section(S_SESSION_TABLE);
+
+       if (allflag == 2) {
+               if (count > 1) {
+                       cprintf(":|There are %d users here.\n", count);
+               }
+               else {
+                       cprintf(":|Note: you are the only one here.\n");
+               }
+               if (count_elsewhere > 0) {
+                       cprintf(":|There are %d users chatting in other rooms.\n", count_elsewhere);
+               }
+       }
+
        cprintf(":|\n");
 }
 
 
 void cmd_chat(char *argbuf)
 {
-       char cmdbuf[256];
+       char cmdbuf[SIZ];
        char *un;
        char *strptr1;
-       char hold_cs_room[ROOMNAMELEN];
        int MyLastMsg, ThisLastMsg;
        struct ChatLine *clptr;
        struct CitContext *t_context;
@@ -204,27 +245,38 @@ void cmd_chat(char *argbuf)
                cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
                return;
        }
-       strcpy(CC->chat_room, "Main room");
 
-       strcpy(hold_cs_room, CC->cs_room);
        CC->cs_flags = CC->cs_flags | CS_CHAT;
-       set_wtmpsupp("<chat>");
        cprintf("%d Entering chat mode (type '/help' for available commands)\n",
                START_CHAT_MODE);
+       unbuffer_output();
 
        MyLastMsg = ChatLastMsg;
 
        if ((CC->cs_flags & CS_STEALTH) == 0) {
-               allwrite("<entering chat>", 0, CC->chat_room, NULL);
+               allwrite("<entering chat>", 0, NULL);
        }
        strcpy(cmdbuf, "");
 
+       do_chat_listing(2);
+
        while (1) {
                int ok_cmd;
+               int linelen;
 
                ok_cmd = 0;
-               cmdbuf[strlen(cmdbuf) + 1] = 0;
-               retval = client_read_to(&cmdbuf[strlen(cmdbuf)], 1, 2);
+               linelen = strlen(cmdbuf);
+               if (linelen > 100) --linelen;   /* truncate too-long lines */
+               cmdbuf[linelen + 1] = 0;
+
+               retval = client_read_to(&cmdbuf[linelen], 1, 2);
+
+               if (retval < 0 || CC->kill_me) {        /* socket broken? */
+                       if ((CC->cs_flags & CS_STEALTH) == 0) {
+                               allwrite("<disconnected>", 0, NULL);
+                       }
+                       return;
+               }
 
                /* if we have a complete line, do send processing */
                if (strlen(cmdbuf) > 0)
@@ -246,12 +298,11 @@ void cmd_chat(char *argbuf)
 
                                if (!strcmp(cmdbuf, "000")) {
                                        if ((CC->cs_flags & CS_STEALTH) == 0) {
-                                               allwrite("<exiting chat>", 0, CC->chat_room, NULL);
+                                               allwrite("<exiting chat>", 0, NULL);
                                        }
                                        sleep(1);
                                        cprintf("000\n");
                                        CC->cs_flags = CC->cs_flags - CS_CHAT;
-                                       set_wtmpsupp(hold_cs_room);
                                        return;
                                }
                                if ((!strcasecmp(cmdbuf, "/help"))
@@ -265,8 +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(":|/join   (join new room) \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;
                                }
@@ -279,36 +332,38 @@ void cmd_chat(char *argbuf)
                                        ok_cmd = 1;
                                }
                                if (!strncasecmp(cmdbuf, "/me ", 4)) {
-                                       allwrite(&cmdbuf[4], 1, CC->chat_room, NULL);
+                                       allwrite(&cmdbuf[4], 1, NULL);
                                        ok_cmd = 1;
                                }
                                if (!strncasecmp(cmdbuf, "/msg ", 5)) {
                                        ok_cmd = 1;
                                        strptr1 = &cmdbuf[5];
                                        if ((t_context = find_context(&strptr1))) {
-                                               allwrite(strptr1, 2, "", CC->curr_user);
+                                               allwrite(strptr1, 2, CC->curr_user);
                                                if (strcasecmp(CC->curr_user, t_context->curr_user))
-                                                       allwrite(strptr1, 2, "", 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");
                                }
-                               if (!strncasecmp(cmdbuf, "/join ", 6)) {
+                               /* 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;
-                                       allwrite("<changing rooms>", 0, CC->chat_room, NULL);
-                                       if (!cmdbuf[6])
-                                               strcpy(CC->chat_room, "Main room");
-                                       else {
-                                               strncpy(CC->chat_room, &cmdbuf[6],
-                                                  sizeof CC->chat_room);
-                                               CC->chat_room[sizeof CC->chat_room - 1] = 0;
-                                       }
-                                       allwrite("<joining room>", 0, CC->chat_room, NULL);
+                                       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)) {
                                        ok_cmd = 1;
-                                       allwrite(cmdbuf, 0, CC->chat_room, NULL);
+                                       allwrite(cmdbuf, 0, NULL);
                                }
                                if ((!ok_cmd) && (cmdbuf[0]) && (cmdbuf[0] != '\n'))
                                        cprintf(":|Command %s is not understood.\n", cmdbuf);
@@ -326,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->chat_room, 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;
+                                               }
                                        }
                                }
                        }
@@ -337,44 +407,170 @@ void cmd_chat(char *argbuf)
 }
 
 
+
+/*
+ * Delete any remaining instant messages
+ */
+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)
+                       free(CC->FirstExpressMessage->text);
+               free(CC->FirstExpressMessage);
+               CC->FirstExpressMessage = ptr;
+               }
+       end_critical_section(S_SESSION_TABLE);
+       }
+
+
+
+
 /*
- * poll for express messages
+ * Poll for instant messages (OLD METHOD -- ***DEPRECATED ***)
  */
 void cmd_pexp(char *argbuf)
-{                              /* arg unused */
-       char *ptr;
+{
+       struct ExpressMessage *ptr, *holdptr;
+
+       if (CC->FirstExpressMessage == NULL) {
+               cprintf("%d No instant messages waiting.\n", ERROR + MESSAGE_NOT_FOUND);
+               return;
+       }
+       begin_critical_section(S_SESSION_TABLE);
+       ptr = CC->FirstExpressMessage;
+       CC->FirstExpressMessage = NULL;
+       end_critical_section(S_SESSION_TABLE);
+
+       cprintf("%d Express msgs:\n", LISTING_FOLLOWS);
+       while (ptr != NULL) {
+               if (ptr->flags && EM_BROADCAST)
+                       cprintf("Broadcast message ");
+               else if (ptr->flags && EM_CHAT)
+                       cprintf("Chat request ");
+               else if (ptr->flags && EM_GO_AWAY)
+                       cprintf("Please logoff now, as requested ");
+               else
+                       cprintf("Message ");
+               cprintf("from %s:\n", ptr->sender);
+               if (ptr->text != NULL)
+                       memfmout(80, ptr->text, 0, "\n");
+
+               holdptr = ptr->next;
+               if (ptr->text != NULL) free(ptr->text);
+               free(ptr);
+               ptr = holdptr;
+       }
+       cprintf("000\n");
+}
+
+
+/*
+ * Get instant messages (new method)
+ */
+void cmd_gexp(char *argbuf) {
+       struct ExpressMessage *ptr;
 
-       if (CC->ExpressMessages == NULL) {
-               cprintf("%d No express messages waiting.\n", ERROR);
+       if (CC->FirstExpressMessage == NULL) {
+               cprintf("%d No instant messages waiting.\n", ERROR + MESSAGE_NOT_FOUND);
                return;
        }
+
        begin_critical_section(S_SESSION_TABLE);
-       ptr = CC->ExpressMessages;
-       CC->ExpressMessages = NULL;
+       ptr = CC->FirstExpressMessage;
+       CC->FirstExpressMessage = CC->FirstExpressMessage->next;
        end_critical_section(S_SESSION_TABLE);
 
-       cprintf("%d Express msgs:\n%s", LISTING_FOLLOWS, ptr);
-       if (ptr[strlen(ptr)] != '\n')
-               cprintf("\n");
+       cprintf("%d %d|%ld|%d|%s|%s\n",
+               LISTING_FOLLOWS,
+               ((ptr->next != NULL) ? 1 : 0),          /* more msgs? */
+               (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");
+               free(ptr->text);
+               }
        cprintf("000\n");
+       free(ptr);
+}
+
+/*
+ * Asynchronously deliver instant messages
+ */
+void cmd_gexp_async(void) {
+
+       /* Only do this if the session can handle asynchronous protocol */
+       if (CC->is_async == 0) return;
 
-       phree(ptr);
+       /* And don't do it if there's nothing to send. */
+       if (CC->FirstExpressMessage == NULL) return;
+
+       cprintf("%d instant msg\n", ASYNC_MSG + ASYNC_GEXP);
 }
 
+/*
+ * Back end support function for send_instant_message() and company
+ */
+void add_xmsg_to_context(struct CitContext *ccptr, 
+                       struct ExpressMessage *newmsg) 
+{
+       struct ExpressMessage *findend;
+
+       if (ccptr->FirstExpressMessage == NULL) {
+               ccptr->FirstExpressMessage = newmsg;
+       }
+       else {
+               findend = ccptr->FirstExpressMessage;
+               while (findend->next != NULL) {
+                       findend = findend->next;
+               }
+               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;
+       int message_sent = 0;           /* number of successful sends */
+
        struct CitContext *ccptr;
-       char *msgptr;
+       struct ExpressMessage *newmsg;
        char *un;
-       int newlen;
-       FILE *fp;
+       size_t msglen = 0;
+       int do_send = 0;                /* set to 1 to actually page, not
+                                        * just check to see if we can.
+                                        */
+       struct savelist *sl = NULL;     /* list of rooms to save this page */
+       struct savelist *sptr;
+       struct CtdlMessage *logmsg;
+       long msgnum;
+
+       if (strlen(x_msg) > 0) {
+               msglen = strlen(x_msg) + 4;
+               do_send = 1;
+               }
 
        /* find the target user's context and append the message */
        begin_critical_section(S_SESSION_TABLE);
@@ -383,28 +579,35 @@ 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;
-
-               if ((!strcasecmp(un, x_user))
-                   || (!strcasecmp(x_user, "broadcast"))) {
-                       if (strlen(x_msg) > 0) {
-                               strcpy(ccptr->last_pager, CC->curr_user);
-                               if (ccptr->ExpressMessages == NULL) {
-                                       newlen = strlen(x_msg) + 80;
-                                       msgptr = mallok(newlen);
-                                       memset(msgptr, 0, newlen);
-                               } else {
-                                       newlen = (strlen(ccptr->ExpressMessages)
-                                                 + strlen(x_msg) + 80);
-                                       msgptr = reallok(
-                                        ccptr->ExpressMessages, newlen);
-                               }
-                               if (msgptr != NULL) {
-                                       sprintf(&msgptr[strlen(msgptr)],
-                                               "%s from %s:\n %s\n",
-                                               ((!strcasecmp(x_user, "broadcast")) ? "Broadcast message" : "Message"),
-                                               lun, x_msg);
-                                       ccptr->ExpressMessages = msgptr;
+                       un = ccptr->user.fullname;
+
+               if ( ((!strcasecmp(un, x_user))
+                   || (!strcasecmp(x_user, "broadcast")))
+                   && ((ccptr->disable_exp == 0)
+                   || (CC->user.axlevel >= 6)) ) {
+                       if (do_send) {
+                               newmsg = (struct ExpressMessage *)
+                                       malloc(sizeof (struct ExpressMessage));
+                               memset(newmsg, 0,
+                                       sizeof (struct ExpressMessage));
+                               time(&(newmsg->timestamp));
+                               safestrncpy(newmsg->sender, lun,
+                                           sizeof newmsg->sender);
+                               if (!strcasecmp(x_user, "broadcast"))
+                                       newmsg->flags |= EM_BROADCAST;
+                               newmsg->text = strdup(x_msg);
+
+                               add_xmsg_to_context(ccptr, newmsg);
+
+                               /* and log it ... */
+                               if (ccptr != CC) {
+                                       sptr = (struct savelist *)
+                                               malloc(sizeof(struct savelist));
+                                       sptr->next = sl;
+                                       MailboxName(sptr->roomname,
+                                                   sizeof sptr->roomname,
+                                               &ccptr->user, PAGELOGROOM);
+                                       sl = sptr;
                                }
                        }
                        ++message_sent;
@@ -412,32 +615,60 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
        }
        end_critical_section(S_SESSION_TABLE);
 
-       /* Log the page to disk if configured to do so */
-       if ((strlen(config.c_logpages) > 0) && (strlen(x_msg) > 0)) {
-               fp = fopen(CC->temp, "wb");
-               fprintf(fp, "%c%c%c", 255, MES_NORMAL, 0);
-               fprintf(fp, "Psysop%c", 0);
-               fprintf(fp, "T%ld%c", time(NULL), 0);
-               fprintf(fp, "A%s%c", lun, 0);
-               fprintf(fp, "R%s%c", x_user, 0);
-               fprintf(fp, "O%s%c", config.c_logpages, 0);
-               fprintf(fp, "N%s%c", NODENAME, 0);
-               fprintf(fp, "M%s\n%c", x_msg, 0);
-               fclose(fp);
-               save_message(CC->temp, "", config.c_logpages, M_LOCAL, 1);
-               unlink(CC->temp);
+       /* Log the page to disk if configured to do so  */
+       if ( (do_send) && (message_sent) ) {
+
+               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'] = 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.
+                */
+               create_room(PAGELOGROOM, 4, "", 0, 1, 0, VIEW_BBS);
+               msgnum = CtdlSubmitMsg(logmsg, 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, 1, VIEW_BBS);
+                       CtdlSaveMsgPointerInRoom(config.c_logpages, msgnum, 0);
+               }
+
+               /* Save a copy in each recipient's log room, creating those
+                * rooms if necessary.  Note that we create as a type 5 room
+                * rather than 4, which indicates that it's a personal room
+                * but we've already supplied the namespace prefix.
+                */
+               while (sl != NULL) {
+                       create_room(sl->roomname, 5, "", 0, 1, 1, VIEW_BBS);
+                       CtdlSaveMsgPointerInRoom(sl->roomname, msgnum, 0);
+                       sptr = sl->next;
+                       free(sl);
+                       sl = sptr;
+               }
+
+               CtdlFreeMessage(logmsg);
        }
+
        return (message_sent);
 }
 
 /*
- * send express messages  <bc>
+ * send instant messages  <bc>
  */
 void cmd_sexp(char *argbuf)
 {
        int message_sent = 0;
-       char x_user[256];
-       char x_msg[256];
+       char x_user[USERNAME_SIZE];
+       char x_msg[1024];
        char *lun;              /* <bc> */
        char *x_big_msgbuf = NULL;
 
@@ -448,62 +679,144 @@ void cmd_sexp(char *argbuf)
        if (CC->fake_username[0])
                lun = CC->fake_username;
        else
-               lun = CC->usersupp.fullname;
+               lun = CC->user.fullname;
 
-       extract(x_user, argbuf, 0);
-
-       if (!strcmp(x_user, ".")) {
-               strcpy(x_user, CC->last_pager);
-       }
-       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;
        }
        /* This loop handles text-transfer pages */
        if (!strcmp(x_msg, "-")) {
-               message_sent = send_express_message(lun, x_user, "");
+               message_sent = PerformXmsgHooks(lun, x_user, "");
                if (message_sent == 0) {
-                       cprintf("%d No user '%s' logged in.\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(256);
-               memset(x_big_msgbuf, 0, 256);
-               while (client_gets(x_msg), strcmp(x_msg, "000")) {
-                       x_big_msgbuf = reallok(x_big_msgbuf,
+               x_big_msgbuf = malloc(SIZ);
+               memset(x_big_msgbuf, 0, SIZ);
+               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')
                                strcat(x_big_msgbuf, "\n");
                        strcat(x_big_msgbuf, x_msg);
                }
-               send_express_message(lun, x_user, x_big_msgbuf);
-               phree(x_big_msgbuf);
+               PerformXmsgHooks(lun, x_user, x_big_msgbuf);
+               free(x_big_msgbuf);
 
                /* This loop handles inline pages */
        } else {
-               message_sent = send_express_message(lun, x_user, x_msg);
+               message_sent = PerformXmsgHooks(lun, x_user, x_msg);
 
                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 No user '%s' logged in.\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);
                }
 
 
        }
 }
+
+
+
+/*
+ * Enter or exit paging-disabled mode
+ */
+void cmd_dexp(char *argbuf)
+{
+       int new_state;
+
+       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", CIT_OK, CC->disable_exp);
+}
+
+
+/*
+ * Request client termination
+ */
+void cmd_reqt(char *argbuf) {
+       struct CitContext *ccptr;
+       int sessions = 0;
+       int which_session;
+       struct ExpressMessage *newmsg;
+
+       if (CtdlAccessCheck(ac_aide)) return;
+       which_session = extract_int(argbuf, 0);
+
+       begin_critical_section(S_SESSION_TABLE);
+       for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
+               if ((ccptr->cs_pid == which_session) || (which_session == 0)) {
+
+                       newmsg = (struct ExpressMessage *)
+                               malloc(sizeof (struct ExpressMessage));
+                       memset(newmsg, 0,
+                               sizeof (struct ExpressMessage));
+                       time(&(newmsg->timestamp));
+                       safestrncpy(newmsg->sender, CC->user.fullname,
+                                   sizeof newmsg->sender);
+                       newmsg->flags |= EM_GO_AWAY;
+                       newmsg->text = strdup("Automatic logoff requested.");
+
+                       add_xmsg_to_context(ccptr, newmsg);
+                       ++sessions;
+
+               }
+       }
+       end_critical_section(S_SESSION_TABLE);
+       cprintf("%d Sent termination request to %d sessions.\n", CIT_OK, sessions);
+}
+
+
+
+char *serv_chat_init(void)
+{
+       CtdlRegisterProtoHook(cmd_chat, "CHAT", "Begin real-time chat");
+       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_ASYNC);
+       CtdlRegisterSessionHook(delete_instant_messages, EVT_STOP);
+       CtdlRegisterXmsgHook(send_instant_message, XMSG_PRI_LOCAL);
+       return "$Id$";
+}
+