* Removed all of the thread cancellation cruft that is no longer necessary

[citadel.git] / citadel / serv_chat.c

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 4511237020f75b95b5157ed7ef92e683504ba86f..88d343e0b8520e843d78bb6deca065cef28e9212 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -19,15 +19,9 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
 #include "citadel.h"
 #include "server.h"
 #include <syslog.h>
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
 #include "serv_chat.h"
 #include "sysdep_decls.h"
 #include "citserver.h"
@@ -42,15 +36,16 @@ int ChatLastMsg = 0;
 
 extern struct CitContext *ContextList;
 
+
+
 char *Dynamic_Module_Init(void)
 {
-       CtdlSendExpressMessageFunc = send_express_message;
-
        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");
        CtdlRegisterSessionHook(delete_express_messages, EVT_STOP);
+       CtdlRegisterXmsgHook(send_express_message, XMSG_PRI_LOCAL);
        return "$Id$";
 }
 
@@ -88,10 +83,10 @@ 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, roomname, 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
@@ -161,13 +156,14 @@ void do_chat_listing(int allflag)
 {
        struct CitContext *ccptr;
        int count = 0;
+       char roomname[ROOMNAMELEN];
 
        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>")) ++count;
-               if ((!strcasecmp(ccptr->cs_room, "<chat>"))
+               if (ccptr->cs_flags & CS_CHAT) ++count;
+               if ((ccptr->cs_flags & CS_CHAT)
                    && ((ccptr->cs_flags & CS_STEALTH) == 0)) {
                        if ((allflag == 0) || (allflag == 1))
                                cprintf(":| %-25s <%s>\n", (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user, ccptr->chat_room);
@@ -177,9 +173,12 @@ void do_chat_listing(int allflag)
        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 (((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);
                        }
                }
        }
@@ -201,7 +200,6 @@ void cmd_chat(char *argbuf)
        char cmdbuf[256];
        char *un;
        char *strptr1;
-       char hold_cs_room[ROOMNAMELEN];
        int MyLastMsg, ThisLastMsg;
        struct ChatLine *clptr;
        struct CitContext *t_context;
@@ -213,9 +211,7 @@ void cmd_chat(char *argbuf)
        }
        strcpy(CC->chat_room, "Main room");
 
-       safestrncpy(hold_cs_room, CC->cs_room, sizeof hold_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);
 
@@ -260,7 +256,6 @@ void cmd_chat(char *argbuf)
                                        sleep(1);
                                        cprintf("000\n");
                                        CC->cs_flags = CC->cs_flags - CS_CHAT;
-                                       set_wtmpsupp(hold_cs_room);
                                        return;
                                }
                                if ((!strcasecmp(cmdbuf, "/help"))
@@ -451,7 +446,6 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
        struct CitContext *ccptr;
        struct ExpressMessage *newmsg, *findend;
        char *un;
-       FILE *fp;
        size_t msglen = 0;
        int do_send = 0;
 
@@ -497,21 +491,11 @@ 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 */
+       /* Log the page to disk if configured to do so  */
        if ((strlen(config.c_logpages) > 0) && (do_send) ) {
-               fp = fopen(CC->temp, "wb");
-               fprintf(fp, "%c%c%c", 255, MES_NORMAL, 0);
-               fprintf(fp, "Psysop%c", 0);
-               fprintf(fp, "T%ld%c", (long)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, MES_LOCAL, 1);
-               unlink(CC->temp);
+               quickie_message(lun, x_user, config.c_logpages, x_msg);
        }
+
        return (message_sent);
 }
 
@@ -550,7 +534,7 @@ void cmd_sexp(char *argbuf)
        }
        /* 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);
                        return;
@@ -567,12 +551,12 @@ void cmd_sexp(char *argbuf)
                                strcat(x_big_msgbuf, "\n");
                        strcat(x_big_msgbuf, x_msg);
                }
-               send_express_message(lun, x_user, x_big_msgbuf);
+               PerformXmsgHooks(lun, x_user, x_big_msgbuf);
                phree(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)