* The scheduler can now "wake up" a session to deliver async messages.

[citadel.git] / citadel / serv_chat.c

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 9baeaac74d6aecd4bf0f253aaa66b1b6b7468734..89d715faa6d50103990329fa564e45e4a788d5eb 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -408,9 +408,9 @@ 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);
@@ -428,14 +428,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 + MESSAGE_NOT_FOUND);
+               cprintf("%d No instant messages waiting.\n", ERROR + MESSAGE_NOT_FOUND);
                return;
        }
        begin_critical_section(S_SESSION_TABLE);
@@ -467,13 +467,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 + MESSAGE_NOT_FOUND);
+               cprintf("%d No instant messages waiting.\n", ERROR + MESSAGE_NOT_FOUND);
                return;
        }
 
@@ -499,7 +499,7 @@ void cmd_gexp(char *argbuf) {
 }
 
 /*
- * Asynchronously deliver express messages'
+ * Asynchronously deliver instant messages
  */
 void cmd_gexp_async(void) {
 
@@ -509,12 +509,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) 
@@ -531,17 +530,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 */
 
@@ -652,7 +661,7 @@ 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)
 {
@@ -688,9 +697,13 @@ 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 + NO_SUCH_USER, 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;
                }
                cprintf("%d Transmit message (will deliver to %d users)\n",
@@ -721,9 +734,13 @@ void cmd_sexp(char *argbuf)
                                cprintf(" to %d users", message_sent);
                        cprintf(".\n");
                } else {
-                       cprintf("%d '%s' is not logged in "
-                               "or is not accepting pages.\n",
-                               ERROR + NO_SUCH_USER, 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);
                }
 
 
@@ -790,14 +807,14 @@ void cmd_reqt(char *argbuf) {
 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$";
 }