#include <limits.h>
#include "citadel.h"
#include "server.h"
-#include "serv_extensions.h"
#include "serv_chat.h"
-#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
#include "snprintf.h"
#endif
+
+#include "ctdl_module.h"
+
+
+
struct ChatLine *ChatQueue = NULL;
int ChatLastMsg = 0;
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",
while ((ChatQueue != NULL) && (now - ChatQueue->chat_time >= 120L)) {
clptr = ChatQueue;
ChatQueue = ChatQueue->next;
- phree(clptr);
+ free(clptr);
}
end_critical_section(S_CHATQUEUE);
}
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;
if (is_room_aide()) {
cprintf(":|/kick (kick another user out of this room) \n");
}
- cprintf(":|/quit (return to the BBS) \n");
+ cprintf(":|/quit (exit from this chat) \n");
cprintf(":|\n");
ok_cmd = 1;
}
/* 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;
/*
- * 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);
/*
- * 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);
cprintf("Message ");
cprintf("from %s:\n", ptr->sender);
if (ptr->text != NULL)
- memfmout(80, ptr->text, 0, "\n");
+ memfmout(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");
/*
- * 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;
}
cprintf("%d %d|%ld|%d|%s|%s\n",
LISTING_FOLLOWS,
((ptr->next != NULL) ? 1 : 0), /* more msgs? */
- (long)ptr->timestamp, /* time sent */
+ (long)ptr->timestamp, /* time sent */
ptr->flags, /* flags */
ptr->sender, /* sender of msg */
- config.c_nodename); /* static for now */
+ config.c_nodename /* static for now */
+ );
+
if (ptr->text != NULL) {
- memfmout(80, ptr->text, 0, "\n");
+ memfmout(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) {
/* 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)
}
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 */
-
struct CitContext *ccptr;
struct ExpressMessage *newmsg;
char *un;
*/
struct savelist *sl = NULL; /* list of rooms to save this page */
struct savelist *sptr;
- struct CtdlMessage *logmsg;
+ struct CtdlMessage *logmsg = NULL;
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);
for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
- if (ccptr->fake_username[0]) /* <bc> */
+ if (ccptr->fake_username[0]) {
un = ccptr->fake_username;
- else
+ }
+ else {
un = ccptr->user.fullname;
+ }
if ( ((!strcasecmp(un, x_user))
|| (!strcasecmp(x_user, "broadcast")))
|| (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));
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);
/* 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.
*/
- create_room(PAGELOGROOM, 4, "", 0, 1, 0);
+ 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);
- CtdlSaveMsgPointerInRoom(config.c_logpages, msgnum, 0);
+ create_room(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS);
+ CtdlSaveMsgPointerInRoom(config.c_logpages, msgnum, 0, NULL);
}
/* Save a copy in each recipient's log room, creating those
* but we've already supplied the namespace prefix.
*/
while (sl != NULL) {
- create_room(sl->roomname, 5, "", 0, 1, 1);
- CtdlSaveMsgPointerInRoom(sl->roomname, msgnum, 0);
+ create_room(sl->roomname, 5, "", 0, 1, 1, VIEW_BBS);
+ CtdlSaveMsgPointerInRoom(sl->roomname, msgnum, 0, NULL);
sptr = sl->next;
- phree(sl);
+ free(sl);
sl = sptr;
}
}
/*
- * send express messages <bc>
+ * send instant messages
*/
void cmd_sexp(char *argbuf)
{
int message_sent = 0;
- char x_user[SIZ];
- char x_msg[SIZ];
- char *lun; /* <bc> */
+ char x_user[USERNAME_SIZE];
+ char x_msg[1024];
+ char *lun;
char *x_big_msgbuf = NULL;
if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
else
lun = CC->user.fullname;
- extract(x_user, argbuf, 0);
-
- 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 + NO_SUCH_USER);
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;
}
+ 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')
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 {
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);
}
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->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;
-char *serv_chat_init(void)
+CTDL_MODULE_INIT(chat)
{
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 our Subversion id for the Log */
return "$Id$";
}
projects / citadel.git / blobdiff