#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 "serv_extensions.h"
#include <syslog.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;
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;
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) {
}
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));
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) {
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 {
}
GenerateRoomDisplay(roomname, ccptr, CC);
- if ((CC->usersupp.axlevel < 6)
+ if ((CC->user.axlevel < 6)
&& (strlen(ccptr->fake_roomname)>0)) {
strcpy(roomname, ccptr->fake_roomname);
}
cprintf(":|\n:| Users not in chat:\n");
for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
+ 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",
void cmd_chat(char *argbuf)
{
- char cmdbuf[256];
+ char cmdbuf[SIZ];
char *un;
char *strptr1;
int MyLastMsg, ThisLastMsg;
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);
}
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");
}
if ((cmdbuf[0] != '/') && (strlen(cmdbuf) > 0)) {
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))) {
cprintf("%s\n", clptr->chat_text);
}
}
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 */
phree(ptr);
}
+/*
+ * Asynchronously deliver express messages'
+ */
+void cmd_gexp_async(void) {
+
+ /* Only do this if the session can handle asynchronous protocol */
+ if (CC->is_async == 0) return;
+
+ /* 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("");
+}
/*
* Back end support function for send_express_message() and company
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) {
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 savelist));
sptr->next = sl;
MailboxName(sptr->roomname,
- &ccptr->usersupp, PAGELOGROOM);
+ sizeof sptr->roomname,
+ &ccptr->user, PAGELOGROOM);
sl = sptr;
}
}
logmsg->cm_fields['R'] = strdoop(x_user);
logmsg->cm_fields['M'] = strdoop(x_msg);
- MailboxName(roomname, &CC->usersupp, PAGELOGROOM);
- create_room(roomname, 4, "", 0);
- msgnum = CtdlSaveMsg(logmsg, "", roomname, MES_LOCAL);
+
+ /* Save a copy of the message in the sender's log room,
+ * creating the room if necessary.
+ */
+ create_room(PAGELOGROOM, 4, "", 0, 1, 0);
+ 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);
+ create_room(config.c_logpages, 3, "", 0, 1, 1);
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, 4, "", 0);
+ create_room(sl->roomname, 5, "", 0, 1, 1);
CtdlSaveMsgPointerInRoom(sl->roomname, msgnum, 0);
sptr = sl->next;
phree(sl);
void cmd_sexp(char *argbuf)
{
int message_sent = 0;
- char x_user[256];
- char x_msg[256];
+ char x_user[SIZ];
+ char x_msg[SIZ];
char *lun; /* <bc> */
char *x_big_msgbuf = NULL;
if (CC->fake_username[0])
lun = CC->fake_username;
else
- lun = CC->usersupp.fullname;
+ lun = CC->user.fullname;
extract(x_user, argbuf, 0);
cprintf("%d You were not previously paged.\n", ERROR);
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;
}
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);
+ x_big_msgbuf = mallok(SIZ);
+ memset(x_big_msgbuf, 0, SIZ);
while (client_gets(x_msg), strcmp(x_msg, "000")) {
x_big_msgbuf = reallok(x_big_msgbuf,
strlen(x_big_msgbuf) + strlen(x_msg) + 4);
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");
{
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
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.");
}
}
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_inithat_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");
CtdlRegisterProtoHook(cmd_dexp, "DEXP", "Disable express 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);
return "$Id$";
projects / citadel.git / blobdiff