-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Implements the message store.
+ *
+ */
+
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include "tools.h"
#include "mime_parser.h"
#include "html.h"
+#include "genstamp.h"
+#include "internet_addressing.h"
#define desired_section ((char *)CtdlGetUserData(SYM_DESIRED_SECTION))
#define ma ((struct ma_info *)CtdlGetUserData(SYM_MA_INFO))
"from",
"", "", "",
"exti",
- "", "",
+ "rfca",
+ "",
"hnod",
"msgn",
"", "", "",
{
int i;
- for (i = 0; i < strlen(name); ++i)
+ for (i = 0; i < strlen(name); ++i) {
if (name[i] == '@') {
- if (i > 0)
- if (isspace(name[i - 1])) {
- strcpy(&name[i - 1], &name[i]);
- i = 0;
- }
+ while (isspace(name[i - 1]) && i > 0) {
+ strcpy(&name[i - 1], &name[i]);
+ --i;
+ }
while (isspace(name[i + 1])) {
strcpy(&name[i + 1], &name[i + 2]);
}
}
+ }
}
fclose(fp);
lprintf(7, "Mail is being forwarded to %s\n", name);
+ /* Change "user @ xxx" to "user" if xxx is an alias for this host */
+ for (a=0; a<strlen(name); ++a) {
+ if (name[a] == '@') {
+ if (CtdlHostAlias(&name[a+1]) == hostalias_localhost) {
+ name[a] = 0;
+ lprintf(7, "Changed to <%s>\n", name);
+ }
+ }
+ }
+
/* determine local or remote type, see citadel.h */
for (a = 0; a < strlen(name); ++a)
if (name[a] == '!')
strcpy(bbb, &bbb[1]);
fp = fopen("network/mail.sysinfo", "r");
if (fp == NULL)
- return (MES_ERROR);
- GETSN:do {
+ return (MES_ERROR);
+GETSN: do {
a = getstring(fp, aaa);
} while ((a >= 0) && (strcasecmp(aaa, bbb)));
a = getstring(fp, aaa);
while (bbb[strlen(bbb) - 1] == '_')
bbb[strlen(bbb) - 1] = 0;
sprintf(name, &aaa[4], bbb);
+ lprintf(9, "returning MES_INTERNET\n");
return (MES_INTERNET);
}
if (!strncmp(aaa, "bin", 3)) {
while (bbb[0] == ' ')
strcpy(bbb, &bbb[1]);
sprintf(name, "%s @%s", aaa, bbb);
+ lprintf(9, "returning MES_BINARY\n");
return (MES_BINARY);
}
return (MES_ERROR);
}
+ lprintf(9, "returning MES_LOCAL\n");
return (MES_LOCAL);
}
-void simple_listing(long msgnum)
+void simple_listing(long msgnum, void *userdata)
{
cprintf("%ld\n", msgnum);
}
/*
* API function to perform an operation for each qualifying message in the
- * current room.
+ * current room. (Returns the number of messages processed.)
*/
-void CtdlForEachMessage(int mode, long ref,
+int CtdlForEachMessage(int mode, long ref,
+ int moderation_level,
char *content_type,
struct CtdlMessage *compare,
- void (*CallBack) (long msgnum))
+ void (*CallBack) (long, void *),
+ void *userdata)
{
int a;
struct cdbdata *cdbfr;
long *msglist = NULL;
int num_msgs = 0;
+ int num_processed = 0;
long thismsg;
struct SuppMsgInfo smi;
struct CtdlMessage *msg;
num_msgs = cdbfr->len / sizeof(long);
cdb_free(cdbfr);
} else {
- return; /* No messages at all? No further action. */
+ return 0; /* No messages at all? No further action. */
}
- /* If the caller is looking for a specific MIME type, then filter
- * out all messages which are not of the type requested.
- */
- if (num_msgs > 0)
- if (content_type != NULL)
- if (strlen(content_type) > 0)
- for (a = 0; a < num_msgs; ++a) {
- GetSuppMsgInfo(&smi, msglist[a]);
- if (strcasecmp(smi.smi_content_type, content_type)) {
- msglist[a] = 0L;
- }
- }
+ if (num_msgs > 0) for (a = 0; a < num_msgs; ++a) {
+ GetSuppMsgInfo(&smi, msglist[a]);
+
+ /* Filter out messages that are moderated below the level
+ * currently being viewed at.
+ */
+ if (smi.smi_mod < moderation_level) {
+ msglist[a] = 0L;
+ }
+
+ /* If the caller is looking for a specific MIME type, filter
+ * out all messages which are not of the type requested.
+ */
+ if (content_type != NULL) if (strlen(content_type) > 0) {
+ if (strcasecmp(smi.smi_content_type, content_type)) {
+ msglist[a] = 0L;
+ }
+ }
+ }
num_msgs = sort_msglist(msglist, num_msgs);
|| ((mode == MSGS_LAST) && (a >= (num_msgs - ref)))
|| ((mode == MSGS_FIRST) && (a < ref))
|| ((mode == MSGS_GT) && (thismsg > ref))
+ || ((mode == MSGS_EQ) && (thismsg == ref))
)
) {
- CallBack(thismsg);
+ if (CallBack) CallBack(thismsg, userdata);
+ ++num_processed;
}
}
phree(msglist); /* Clean up */
+ return num_processed;
}
cprintf("%d Message list...\n", LISTING_FOLLOWS);
}
- CtdlForEachMessage(mode, cm_ref, NULL, template, simple_listing);
+ CtdlForEachMessage(mode, cm_ref,
+ CC->usersupp.moderation_filter,
+ NULL, template, simple_listing, NULL);
if (template != NULL) CtdlFreeMessage(template);
cprintf("000\n");
}
void memfmout(
int width, /* screen width to use */
char *mptr, /* where are we going to get our text from? */
- char subst) /* nonzero if we should do substitutions */
+ char subst, /* nonzero if we should do substitutions */
+ char *nl) /* string to terminate lines with */
{
int a, b, c;
int real = 0;
strcpy(buffer, "");
c = 1; /* c is the current pos */
-FMTA: if (subst) {
- while (ch = *mptr, ((ch != 0) && (strlen(buffer) < 126))) {
- ch = *mptr++;
- buffer[strlen(buffer) + 1] = 0;
- buffer[strlen(buffer)] = ch;
- }
+ do {
+ if (subst) {
+ while (ch = *mptr, ((ch != 0) && (strlen(buffer) < 126))) {
+ ch = *mptr++;
+ buffer[strlen(buffer) + 1] = 0;
+ buffer[strlen(buffer)] = ch;
+ }
- if (buffer[0] == '^')
- do_help_subst(buffer);
+ if (buffer[0] == '^')
+ do_help_subst(buffer);
- buffer[strlen(buffer) + 1] = 0;
- a = buffer[0];
- strcpy(buffer, &buffer[1]);
- } else {
- ch = *mptr++;
- }
+ buffer[strlen(buffer) + 1] = 0;
+ a = buffer[0];
+ strcpy(buffer, &buffer[1]);
+ } else {
+ ch = *mptr++;
+ }
- old = real;
- real = ch;
- if (ch <= 0)
- goto FMTEND;
+ old = real;
+ real = ch;
- if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10))
- ch = 32;
- if (((old == 13) || (old == 10)) && (isspace(real))) {
- cprintf("\n");
- c = 1;
- }
- if (ch > 126)
- goto FMTA;
+ if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10))
+ ch = 32;
+ if (((old == 13) || (old == 10)) && (isspace(real))) {
+ cprintf("%s", nl);
+ c = 1;
+ }
+ if (ch > 126)
+ continue;
- if (ch > 32) {
- if (((strlen(aaa) + c) > (width - 5)) && (strlen(aaa) > (width - 5))) {
- cprintf("\n%s", aaa);
- c = strlen(aaa);
- aaa[0] = 0;
+ if (ch > 32) {
+ if (((strlen(aaa) + c) > (width - 5)) && (strlen(aaa) > (width - 5))) {
+ cprintf("%s%s", nl, aaa);
+ c = strlen(aaa);
+ aaa[0] = 0;
+ }
+ b = strlen(aaa);
+ aaa[b] = ch;
+ aaa[b + 1] = 0;
}
- b = strlen(aaa);
- aaa[b] = ch;
- aaa[b + 1] = 0;
- }
- if (ch == 32) {
- if ((strlen(aaa) + c) > (width - 5)) {
- cprintf("\n");
+ if (ch == 32) {
+ if ((strlen(aaa) + c) > (width - 5)) {
+ cprintf("%s", nl);
+ c = 1;
+ }
+ cprintf("%s ", aaa);
+ ++c;
+ c = c + strlen(aaa);
+ strcpy(aaa, "");
+ }
+ if ((ch == 13) || (ch == 10)) {
+ cprintf("%s%s", aaa, nl);
c = 1;
+ strcpy(aaa, "");
}
- cprintf("%s ", aaa);
- ++c;
- c = c + strlen(aaa);
- strcpy(aaa, "");
- goto FMTA;
- }
- if ((ch == 13) || (ch == 10)) {
- cprintf("%s\n", aaa);
- c = 1;
- strcpy(aaa, "");
- goto FMTA;
- }
- goto FMTA;
-FMTEND: cprintf("%s\n", aaa);
+ } while (ch > 0);
+
+ cprintf("%s%s", aaa, nl);
}
* Callback function for mime parser that simply lists the part
*/
void list_this_part(char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, size_t length)
+ void *content, char *cbtype, size_t length, char *encoding,
+ void *cbuserdata)
{
cprintf("part=%s|%s|%s|%s|%s|%d\n",
* Callback function for mime parser that opens a section for downloading
*/
void mime_download(char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, size_t length)
+ void *content, char *cbtype, size_t length, char *encoding,
+ void *cbuserdata)
{
/* Silently go away if there's already a download open... */
if (is_valid_message(msg) == 0) return;
for (i = 0; i < 256; ++i)
- if (msg->cm_fields[i] != NULL)
+ if (msg->cm_fields[i] != NULL) {
phree(msg->cm_fields[i]);
+ }
msg->cm_magic = 0; /* just in case */
phree(msg);
/*
- * Get a message off disk. (return value is the message's timestamp)
- *
+ * Callback function for mime parser that wants to display text
*/
-int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */
- int mode, /* how would you like that message? */
- int headers_only, /* eschew the message body? */
- int do_proto, /* do Citadel protocol responses? */
- FILE *outfp,
- int outsock,
- int crlf /* Use CRLF newlines instead of LF? */
-) {
- int a, i, k;
- char buf[1024];
- time_t xtime;
- CIT_UBYTE ch;
- char allkeys[256];
- char display_name[256];
- struct CtdlMessage *TheMessage;
- char *mptr;
- char *nl; /* newline string */
-
- /* buffers needed for RFC822 translation */
- char suser[256];
- char luser[256];
- char snode[256];
- char lnode[256];
- char mid[256];
- /* */
-
-
- /* BEGIN NESTED FUNCTION omprintf() */
- void omprintf(const char *format, ...) {
- va_list arg_ptr;
- char buf[256];
-
- va_start(arg_ptr, format);
- if (vsnprintf(buf, sizeof buf, format, arg_ptr) == -1)
- buf[sizeof buf - 2] = '\n';
- if (outfp != NULL) {
- fwrite(buf, strlen(buf), 1, outfp);
- }
- else if (outsock >= 0) {
- write(outsock, buf, strlen(buf));
- }
- else {
- client_write(buf, strlen(buf));
- }
- va_end(arg_ptr);
- }
- /* END NESTED FUNCTION omprintf() */
-
- /* BEGIN NESTED FUNCTION omfmout() */
- void omfmout(char *mptr) {
- int b, c;
- int real = 0;
- int old = 0;
- CIT_UBYTE ch;
- char aaa[140];
- char buffer[256];
-
- strcpy(aaa, "");
- old = 255;
- strcpy(buffer, "");
- c = 1; /* c is the current pos */
-
-FMTA: ch = *mptr++;
- old = real;
- real = ch;
- if (ch <= 0)
- goto FMTEND;
-
- if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10))
- ch = 32;
- if (((old == 13) || (old == 10)) && (isspace(real))) {
- omprintf("%s", nl);
- c = 1;
- }
- if (ch > 126)
- goto FMTA;
-
- if (ch > 32) {
- if (((strlen(aaa) + c) > (75)) && (strlen(aaa) > (75))) {
- omprintf("%s%s", nl, aaa);
- c = strlen(aaa);
- aaa[0] = 0;
- }
- b = strlen(aaa);
- aaa[b] = ch;
- aaa[b + 1] = 0;
- }
- if (ch == 32) {
- if ((strlen(aaa) + c) > (75)) {
- omprintf("%s", nl);
- c = 1;
- }
- omprintf("%s ", aaa);
- ++c;
- c = c + strlen(aaa);
- strcpy(aaa, "");
- goto FMTA;
- }
- if ((ch == 13) || (ch == 10)) {
- omprintf("%s%s", aaa, nl);
- c = 1;
- strcpy(aaa, "");
- goto FMTA;
- }
- goto FMTA;
-
-FMTEND: omprintf("%s%s", aaa, nl);
- }
- /* END NESTED FUNCTION omfmout() */
-
- /* BEGIN NESTED FUNCTION fixed_output() */
- /*
- * Callback function for mime parser that wants to display text
- */
- void fixed_output(char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, size_t length)
+void fixed_output(char *name, char *filename, char *partnum, char *disp,
+ void *content, char *cbtype, size_t length, char *encoding,
+ void *cbuserdata)
{
char *ptr;
char *wptr;
size_t wlen;
+ CIT_UBYTE ch;
if (!strcasecmp(cbtype, "multipart/alternative")) {
strcpy(ma->prefix, partnum);
ma->did_print = 1;
- if (!strcasecmp(cbtype, "text/plain")) {
+ if ( (!strcasecmp(cbtype, "text/plain"))
+ || (strlen(cbtype)==0) ) {
wlen = length;
wptr = content;
while (wlen--) {
ch = *wptr++;
- if (ch==10) omprintf("%s", nl);
- else omprintf("%c", ch);
+ if (ch==10) cprintf("\r\n");
+ else cprintf("%c", ch);
}
}
else if (!strcasecmp(cbtype, "text/html")) {
wptr = ptr;
while (wlen--) {
ch = *wptr++;
- if (ch==10) omprintf("%s", nl);
- else omprintf("%c", ch);
+ if (ch==10) cprintf("\r\n");
+ else cprintf("%c", ch);
}
phree(ptr);
}
else if (strncasecmp(cbtype, "multipart/", 10)) {
- omprintf("Part %s: %s (%s) (%d bytes)%s",
- partnum, filename, cbtype, length, nl);
+ cprintf("Part %s: %s (%s) (%d bytes)\r\n",
+ partnum, filename, cbtype, length);
}
}
- /* END NESTED FUNCTION fixed_output() */
+/*
+ * Get a message off disk. (returns om_* values found in msgbase.h)
+ *
+ */
+int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */
+ int mode, /* how would you like that message? */
+ int headers_only, /* eschew the message body? */
+ int do_proto, /* do Citadel protocol responses? */
+ int crlf /* Use CRLF newlines instead of LF? */
+) {
+ struct CtdlMessage *TheMessage;
+ int retcode;
+
+ lprintf(7, "CtdlOutputMsg() msgnum=%ld, mode=%d\n",
+ msg_num, mode);
TheMessage = NULL;
- sprintf(mid, "%ld", msg_num);
- nl = (crlf ? "\r\n" : "\n");
if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
if (do_proto) cprintf("%d Not logged in.\n",
return(om_not_logged_in);
}
- /* FIX ... small security issue
+ /* FIXME ... small security issue
* We need to check to make sure the requested message is actually
* in the current room, and set msg_ok to 1 only if it is. This
* functionality is currently missing because I'm in a hurry to replace
ERROR, msg_num);
return(om_no_such_msg);
}
+
+ retcode = CtdlOutputPreLoadedMsg(
+ TheMessage, msg_num, mode,
+ headers_only, do_proto, crlf);
+
+ CtdlFreeMessage(TheMessage);
+ return(retcode);
+}
+
+
+/*
+ * Get a message off disk. (returns om_* values found in msgbase.h)
+ *
+ */
+int CtdlOutputPreLoadedMsg(struct CtdlMessage *TheMessage,
+ long msg_num,
+ int mode, /* how would you like that message? */
+ int headers_only, /* eschew the message body? */
+ int do_proto, /* do Citadel protocol responses? */
+ int crlf /* Use CRLF newlines instead of LF? */
+) {
+ int i, k;
+ char buf[1024];
+ CIT_UBYTE ch;
+ char allkeys[256];
+ char display_name[256];
+ char *mptr;
+ char *nl; /* newline string */
+
+ /* buffers needed for RFC822 translation */
+ char suser[256];
+ char luser[256];
+ char fuser[256];
+ char snode[256];
+ char lnode[256];
+ char mid[256];
+ char datestamp[256];
+ /* */
+
+ sprintf(mid, "%ld", msg_num);
+ nl = (crlf ? "\r\n" : "\n");
+
+ if (!is_valid_message(TheMessage)) {
+ lprintf(1, "ERROR: invalid preloaded message for output\n");
+ return(om_no_such_msg);
+ }
/* Are we downloading a MIME component? */
if (mode == MT_DOWNLOAD) {
} else {
/* Parse the message text component */
mptr = TheMessage->cm_fields['M'];
- mime_parser(mptr, NULL, *mime_download);
+ mime_parser(mptr, NULL, *mime_download, NULL, 0);
/* If there's no file open by this time, the requested
* section wasn't found, so print an error
*/
desired_section);
}
}
- CtdlFreeMessage(TheMessage);
return((CC->download_fp != NULL) ? om_ok : om_mime_error);
}
strcpy(suser, "");
strcpy(luser, "");
+ strcpy(fuser, "");
strcpy(snode, NODENAME);
strcpy(lnode, HUMANNODE);
if (mode == MT_RFC822) {
+ cprintf("X-UIDL: %ld%s", msg_num, nl);
for (i = 0; i < 256; ++i) {
if (TheMessage->cm_fields[i]) {
mptr = TheMessage->cm_fields[i];
if (i == 'A') {
strcpy(luser, mptr);
- } else if (i == 'P') {
- omprintf("Path: %s%s", mptr, nl);
- for (a = 0; a < strlen(mptr); ++a) {
- if (mptr[a] == '!') {
- strcpy(mptr, &mptr[a + 1]);
- a = 0;
- }
- }
strcpy(suser, mptr);
- } else if (i == 'U')
- omprintf("Subject: %s%s", mptr, nl);
+ }
+ else if (i == 'P') {
+ cprintf("Path: %s%s", mptr, nl);
+ }
+ else if (i == 'U')
+ cprintf("Subject: %s%s", mptr, nl);
else if (i == 'I')
strcpy(mid, mptr);
else if (i == 'H')
strcpy(lnode, mptr);
else if (i == 'O')
- omprintf("X-Citadel-Room: %s%s",
+ cprintf("X-Citadel-Room: %s%s",
mptr, nl);
else if (i == 'N')
strcpy(snode, mptr);
else if (i == 'R')
- omprintf("To: %s%s", mptr, nl);
+ cprintf("To: %s%s", mptr, nl);
else if (i == 'T') {
- xtime = atol(mptr);
- omprintf("Date: %s", asctime(localtime(&xtime)));
+ datestring(datestamp, atol(mptr),
+ DATESTRING_RFC822 );
+ cprintf("Date: %s%s", datestamp, nl);
}
}
}
}
+ for (i=0; i<strlen(suser); ++i) {
+ suser[i] = tolower(suser[i]);
+ if (!isalnum(suser[i])) suser[i]='_';
+ }
+
if (mode == MT_RFC822) {
if (!strcasecmp(snode, NODENAME)) {
strcpy(snode, FQDN);
}
- omprintf("Message-ID: <%s@%s>%s", mid, snode, nl);
+
+ /* Construct a fun message id */
+ cprintf("Message-ID: <%s", mid);
+ if (strchr(mid, '@')==NULL) {
+ cprintf("@%s", snode);
+ }
+ cprintf(">%s", nl);
+
PerformUserHooks(luser, (-1L), EVT_OUTPUTMSG);
- omprintf("From: %s@%s (%s)%s", suser, snode, luser, nl);
- omprintf("Organization: %s%s", lnode, nl);
+
+ if (strlen(fuser) > 0) {
+ cprintf("From: %s (%s)%s", fuser, luser, nl);
+ }
+ else {
+ cprintf("From: %s@%s (%s)%s", suser, snode, luser, nl);
+ }
+
+ cprintf("Organization: %s%s", lnode, nl);
}
/* end header processing loop ... at this point, we're in the text */
mptr = TheMessage->cm_fields['M'];
/* Tell the client about the MIME parts in this message */
- if (TheMessage->cm_format_type == FMT_RFC822) { /* legacy text dump */
+ if (TheMessage->cm_format_type == FMT_RFC822) {
if (mode == MT_CITADEL) {
- mime_parser(mptr, NULL, *list_this_part);
+ mime_parser(mptr, NULL, *list_this_part, NULL, 0);
}
else if (mode == MT_MIME) { /* list parts only */
- mime_parser(mptr, NULL, *list_this_part);
+ mime_parser(mptr, NULL, *list_this_part, NULL, 0);
+ if (do_proto) cprintf("000\n");
+ return(om_ok);
+ }
+ else if (mode == MT_RFC822) { /* unparsed RFC822 dump */
+ /* FIXME ... we have to put some code in here to avoid
+ * printing duplicate header information when both
+ * Citadel and RFC822 headers exist. Preference should
+ * probably be given to the RFC822 headers.
+ */
+ while (ch=*(mptr++), ch!=0) {
+ if (ch==13) ;
+ else if (ch==10) cprintf("%s", nl);
+ else cprintf("%c", ch);
+ }
if (do_proto) cprintf("000\n");
- CtdlFreeMessage(TheMessage);
return(om_ok);
}
}
if (headers_only) {
if (do_proto) cprintf("000\n");
- CtdlFreeMessage(TheMessage);
return(om_ok);
}
/* signify start of msg text */
if (mode == MT_CITADEL)
if (do_proto) cprintf("text\n");
- /* if ((mode == MT_RFC822) && (TheMessage->cm_format_type != FMT_RFC822)) { */
if (mode == MT_RFC822) {
- omprintf("%s", nl);
+ if (TheMessage->cm_fields['U'] == NULL) {
+ cprintf("Subject: (no subject)%s", nl);
+ }
+ cprintf("%s", nl);
}
/* If the format type on disk is 1 (fixed-format), then we want
if (ch == 13)
ch = 10;
if ((ch == 10) || (strlen(buf) > 250)) {
- omprintf("%s%s", buf, nl);
+ cprintf("%s%s", buf, nl);
strcpy(buf, "");
} else {
buf[strlen(buf) + 1] = 0;
}
}
if (strlen(buf) > 0)
- omprintf("%s%s", buf, nl);
+ cprintf("%s%s", buf, nl);
}
/* If the message on disk is format 0 (Citadel vari-format), we
* message to the reader's screen width.
*/
if (TheMessage->cm_format_type == FMT_CITADEL) {
- omfmout(mptr);
+ memfmout(80, mptr, 0, nl);
}
/* If the message on disk is format 4 (MIME), we've gotta hand it
if (TheMessage->cm_format_type == FMT_RFC822) {
CtdlAllocUserData(SYM_MA_INFO, sizeof(struct ma_info));
memset(ma, 0, sizeof(struct ma_info));
- mime_parser(mptr, NULL, *fixed_output);
+ mime_parser(mptr, NULL, *fixed_output, NULL, 0);
}
/* now we're done */
if (do_proto) cprintf("000\n");
- CtdlFreeMessage(TheMessage);
return(om_ok);
}
msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, NULL, -1, 0);
+ CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, 0);
return;
}
msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, NULL, -1, 1);
+ CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, 1);
}
/*
- * display a message (mode 4 - MIME) (FIX ... still evolving, not complete)
+ * display a message (mode 4 - MIME) (FIXME ... still evolving, not complete)
*/
void cmd_msg4(char *cmdbuf)
{
long msgid;
msgid = extract_long(cmdbuf, 0);
- CtdlOutputMsg(msgid, MT_MIME, 0, 1, NULL, -1, 0);
+ CtdlOutputMsg(msgid, MT_MIME, 0, 1, 0);
}
/*
{
long msgid;
- CtdlAllocUserData(SYM_DESIRED_SECTION, 64);
+ CtdlAllocUserData(SYM_DESIRED_SECTION, 256);
msgid = extract_long(cmdbuf, 0);
extract(desired_section, cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, NULL, -1, 1);
+ CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, 1);
}
*
*/
long send_message(struct CtdlMessage *msg, /* pointer to buffer */
- int generate_id, /* generate 'I' field? */
FILE *save_a_copy) /* save a copy to disk? */
{
long newmsgid;
long retval;
- char msgidbuf[32];
+ char msgidbuf[256];
struct ser_ret smr;
/* Get a new message number */
newmsgid = get_new_message_number();
- sprintf(msgidbuf, "%ld", newmsgid);
+ sprintf(msgidbuf, "%ld@%s", newmsgid, config.c_fqdn);
- if (generate_id) {
+ /* Generate an ID if we don't have one already */
+ if (msg->cm_fields['I']==NULL) {
msg->cm_fields['I'] = strdoop(msgidbuf);
}
ret->len = ret->len +
strlen(msg->cm_fields[(int)forder[i]]) + 2;
- lprintf(9, "calling malloc\n");
+ lprintf(9, "calling malloc(%d)\n", ret->len);
ret->ser = mallok(ret->len);
if (ret->ser == NULL) {
ret->len = 0;
/*
* Back end for the ReplicationChecks() function
*/
-void check_repl(long msgnum) {
+void check_repl(long msgnum, void *userdata) {
struct CtdlMessage *msg;
time_t timestamp = (-1L);
lprintf(9, "older!\n");
/* Existing isn't newer? Then delete the old one(s). */
- CtdlDeleteMessages(CC->quickroom.QRname, msgnum, NULL);
+ CtdlDeleteMessages(CC->quickroom.QRname, msgnum, "");
}
memset(template, 0, sizeof(struct CtdlMessage));
template->cm_fields['E'] = strdoop(msg->cm_fields['E']);
- CtdlForEachMessage(MSGS_ALL, 0L, NULL, template, check_repl);
+ CtdlForEachMessage(MSGS_ALL, 0L, (-127), NULL, template,
+ check_repl, NULL);
/* If a newer message exists with the same Extended ID, abort
* this save.
long CtdlSaveMsg(struct CtdlMessage *msg, /* message to save */
char *rec, /* Recipient (mail) */
char *force, /* force a particular room? */
- int mailtype, /* local or remote type */
- int generate_id) /* 1 = generate 'I' field */
+ int supplied_mailtype) /* local or remote type */
{
char aaa[100];
char hold_rm[ROOMNAMELEN];
static int seqnum = 1;
struct CtdlMessage *imsg;
char *instr;
- long imsgid;
+ int mailtype;
lprintf(9, "CtdlSaveMsg() called\n");
if (is_valid_message(msg) == 0) return(-1); /* self check */
+ mailtype = supplied_mailtype;
/* If this message has no timestamp, we take the liberty of
* giving it one, right now.
strcpy(force_room, force);
/* Strip non-printable characters out of the recipient name */
+ lprintf(9, "Checking recipient (if present)\n");
strcpy(recipient, rec);
for (a = 0; a < strlen(recipient); ++a)
if (!isprint(recipient[a]))
strcpy(&recipient[a], &recipient[a + 1]);
+ /* Change "user @ xxx" to "user" if xxx is an alias for this host */
+ for (a=0; a<strlen(recipient); ++a) {
+ if (recipient[a] == '@') {
+ if (CtdlHostAlias(&recipient[a+1])
+ == hostalias_localhost) {
+ recipient[a] = 0;
+ lprintf(7, "Changed to <%s>\n", recipient);
+ mailtype = MES_LOCAL;
+ }
+ }
+ }
+
+ lprintf(9, "Recipient is <%s>\n", recipient);
+
/* Learn about what's inside, because it's what's inside that counts */
lprintf(9, "Learning what's inside\n");
if (msg->cm_fields['M'] == NULL) {
/* advance past header fields */
mptr = msg->cm_fields['M'];
a = strlen(mptr);
- while (--a) {
+ while ((--a) > 0) {
if (!strncasecmp(mptr, "Content-type: ", 14)) {
safestrncpy(content_type, mptr,
sizeof(content_type));
}
lprintf(9, "Possibly relocating\n");
- if (strcasecmp(actual_rm, CC->quickroom.QRname))
+ if (strcasecmp(actual_rm, CC->quickroom.QRname)) {
getroom(&CC->quickroom, actual_rm);
+ }
+
+ /*
+ * If this message has no O (room) field, generate one.
+ */
+ if (msg->cm_fields['O'] == NULL) {
+ msg->cm_fields['O'] = strdoop(CC->quickroom.QRname);
+ }
/* Perform "before save" hooks (aborting if any return nonzero) */
lprintf(9, "Performing before-save hooks\n");
/* Save it to disk */
lprintf(9, "Saving to disk\n");
- newmsgid = send_message(msg, generate_id, network_fp);
+ newmsgid = send_message(msg, network_fp);
if (network_fp != NULL) {
fclose(network_fp);
system("exec nohup ./netproc -i >/dev/null 2>&1 &");
* is no local sender; it would otherwise go to the Trashcan).
*/
if ((!CC->internal_pgm) || (strlen(recipient) == 0)) {
- CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
+ if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0) != 0) {
+ lprintf(3, "ERROR saving message pointer!\n");
+ CtdlSaveMsgPointerInRoom(AIDEROOM, newmsgid, 0);
+ }
}
/* For internet mail, drop a copy in the outbound queue room */
MailboxName(actual_rm, &userbuf, MAILROOM);
CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
}
+ else {
+ lprintf(9, "No user <%s>, saving in %s> instead\n",
+ recipient, AIDEROOM);
+ CtdlSaveMsgPointerInRoom(AIDEROOM, newmsgid, 0);
+ }
}
/* Perform "after save" hooks */
instr = mallok(2048);
sprintf(instr,
"Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
+ "bounceto|%s@%s\n"
"remote|%s|0||\n",
- SPOOLMIME, newmsgid, time(NULL), recipient );
+ SPOOLMIME, newmsgid, time(NULL),
+ msg->cm_fields['A'], msg->cm_fields['N'],
+ recipient );
imsg = mallok(sizeof(struct CtdlMessage));
memset(imsg, 0, sizeof(struct CtdlMessage));
imsg->cm_magic = CTDLMESSAGE_MAGIC;
imsg->cm_anon_type = MES_NORMAL;
imsg->cm_format_type = FMT_RFC822;
+ imsg->cm_fields['A'] = strdoop("Citadel");
imsg->cm_fields['M'] = instr;
- imsgid = send_message(imsg, 1, NULL);
- if (imsgid >= 0L) {
- CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM,
- imsgid,
- SM_DONT_BUMP_REF);
- }
+ CtdlSaveMsg(imsg, "", SMTP_SPOOLOUT_ROOM, MES_LOCAL);
CtdlFreeMessage(imsg);
}
msg->cm_fields['R'] = strdoop(to);
msg->cm_fields['M'] = strdoop(text);
- CtdlSaveMsg(msg, "", room, MES_LOCAL, 1);
+ CtdlSaveMsg(msg, "", room, MES_LOCAL);
CtdlFreeMessage(msg);
syslog(LOG_NOTICE, text);
}
exist is ALWAYS freed */
) {
char buf[256];
+ int linelen;
size_t message_len = 0;
size_t buffer_len = 0;
- char *ptr, *append;
+ char *ptr;
char *m;
if (exist == NULL) {
message_len = 0;
}
/* read in the lines of message text one by one */
- append = NULL;
while ( (client_gets(buf)>0) && strcmp(buf, terminator) ) {
+ /* strip trailing newline type stuff */
+ if (buf[strlen(buf)-1]==10) buf[strlen(buf)-1]=0;
+ if (buf[strlen(buf)-1]==13) buf[strlen(buf)-1]=0;
+
+ linelen = strlen(buf);
+
/* augment the buffer if we have to */
- if ((message_len + strlen(buf) + 2) > buffer_len) {
+ if ((message_len + linelen + 2) > buffer_len) {
lprintf(9, "realloking\n");
ptr = reallok(m, (buffer_len * 2) );
if (ptr == NULL) { /* flush if can't allocate */
} else {
buffer_len = (buffer_len * 2);
m = ptr;
- append = NULL;
lprintf(9, "buffer_len is %d\n", buffer_len);
}
}
- if (append == NULL) append = m;
- while (strlen(append) > 0) ++append;
- strcpy(append, buf);
- strcat(append, "\n");
- message_len = message_len + strlen(buf) + 1;
+ /* Add the new line to the buffer. We avoid using strcat()
+ * because that would involve traversing the entire message
+ * after each line, and this function needs to run fast.
+ */
+ strcpy(&m[message_len], buf);
+ m[message_len + linelen] = '\n';
+ m[message_len + linelen + 1] = 0;
+ message_len = message_len + linelen + 1;
/* if we've hit the max msg length, flush the rest */
if (message_len >= maxlen) {
- while ( (client_gets(buf)>0) && strcmp(buf, terminator)) ;;
+ while ( (client_gets(buf)>0)
+ && strcmp(buf, terminator)) ;;
return(m);
}
}
}
if (!strcasecmp(buf, "sysop")) {
mtsflag = 1;
- goto SKFALL;
}
- if (e != MES_LOCAL)
- goto SKFALL; /* don't search local file */
- if (!strcasecmp(buf, CC->usersupp.fullname)) {
- cprintf("%d Can't send mail to yourself!\n",
- ERROR + NO_SUCH_USER);
- return;
- }
- /* Check to make sure the user exists; also get the correct
- * upper/lower casing of the name.
- */
- a = getuser(&tempUS, buf);
- if (a != 0) {
- cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
- return;
+ else if (e == MES_LOCAL) { /* don't search local file */
+ if (!strcasecmp(buf, CC->usersupp.fullname)) {
+ cprintf("%d Can't send mail to yourself!\n",
+ ERROR + NO_SUCH_USER);
+ return;
+ }
+ /* Check to make sure the user exists; also get the correct
+ * upper/lower casing of the name.
+ */
+ a = getuser(&tempUS, buf);
+ if (a != 0) {
+ cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
+ return;
+ }
+ strcpy(buf, tempUS.fullname);
}
- strcpy(buf, tempUS.fullname);
}
-SKFALL: b = MES_NORMAL;
+ b = MES_NORMAL;
if (CC->quickroom.QRflags & QR_ANONONLY)
b = MES_ANON;
if (CC->quickroom.QRflags & QR_ANONOPT) {
CC->quickroom.QRname, b, e, format_type, "");
if (msg != NULL)
- CtdlSaveMsg(msg, buf, (mtsflag ? AIDEROOM : ""), e, 1);
+ CtdlSaveMsg(msg, buf, (mtsflag ? AIDEROOM : ""), e);
CtdlFreeMessage(msg);
CC->fake_postname[0] = '\0';
return;
}
msg->cm_flags = CM_SKIP_HOOKS;
- if (valid_msg) CtdlSaveMsg(msg, recp, "", e, 0);
+ if (valid_msg) CtdlSaveMsg(msg, recp, "", e);
CtdlFreeMessage(msg);
phree(tempbuf);
}
*/
int CtdlDeleteMessages(char *room_name, /* which room */
long dmsgnum, /* or "0" for any */
- char *content_type /* or NULL for any */
+ char *content_type /* or "" for any */
)
{
if ((dmsgnum == 0L) || (msglist[i] == dmsgnum)) {
delete_this |= 0x01;
}
- if (content_type == NULL) {
+ if (strlen(content_type) == 0) {
delete_this |= 0x02;
} else {
GetSuppMsgInfo(&smi, msglist[i]);
}
delnum = extract_long(delstr, 0);
- num_deleted = CtdlDeleteMessages(CC->quickroom.QRname, delnum, NULL);
+ num_deleted = CtdlDeleteMessages(CC->quickroom.QRname, delnum, "");
if (num_deleted) {
cprintf("%d %d message%s deleted.\n", OK,
/* Now delete the message from the source room,
* if this is a 'move' rather than a 'copy' operation.
*/
- if (is_copy == 0) CtdlDeleteMessages(CC->quickroom.QRname, num, NULL);
+ if (is_copy == 0) CtdlDeleteMessages(CC->quickroom.QRname, num, "");
cprintf("%d Message %s.\n", OK, (is_copy ? "copied" : "moved") );
}
FILE *fp, *tempfp;
char filename[PATH_MAX];
char cmdbuf[256];
- int ch;
+ char ch;
struct quickroom qrbuf;
char roomname[ROOMNAMELEN];
struct CtdlMessage *msg;
CtdlDeleteMessages(roomname, 0L, content_type));
}
/* Now write the data */
- CtdlSaveMsg(msg, "", roomname, MES_LOCAL, 1);
+ CtdlSaveMsg(msg, "", roomname, MES_LOCAL);
CtdlFreeMessage(msg);
}
-void CtdlGetSysConfigBackend(long msgnum) {
+void CtdlGetSysConfigBackend(long msgnum, void *userdata) {
config_msgnum = msgnum;
}
/* We want the last (and probably only) config in this room */
begin_critical_section(S_CONFIG);
config_msgnum = (-1L);
- CtdlForEachMessage(MSGS_LAST, 1, sysconfname, NULL,
- CtdlGetSysConfigBackend);
+ CtdlForEachMessage(MSGS_LAST, 1, (-127), sysconfname, NULL,
+ CtdlGetSysConfigBackend, NULL);
msgnum = config_msgnum;
end_critical_section(S_CONFIG);
CtdlWriteObject(SYSCONFIGROOM, sysconfname, temp, NULL, 0, 1, 0);
unlink(temp);
}
-
-