/* $Id$ */
+
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <syslog.h>
#include <limits.h>
-#include "citadel.h"
-#include "server.h"
#include <errno.h>
+#include <stdarg.h>
#include <sys/stat.h>
+#include "citadel.h"
+#include "server.h"
#include "database.h"
#include "msgbase.h"
#include "support.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))
#define msg_repl ((struct repl *)CtdlGetUserData(SYM_REPL))
extern struct config config;
+long config_msgnum;
char *msgkeys[] = {
"", "", "", "", "", "", "", "",
"from",
"", "", "",
"exti",
- "", "",
+ "rfca",
+ "",
"hnod",
"msgn",
"", "", "",
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] == '!')
fp = fopen("network/mail.sysinfo", "r");
if (fp == NULL)
return (MES_ERROR);
- GETSN:do {
+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);
}
* for here is to format text out to 80 columns before sending it
* to the client. The client software may reformat it again.
*/
-void memfmout(int width, char *mptr, char subst)
- /* screen width to use */
- /* where are we going to get our text from? */
- /* nonzero if we should use hypertext mode */
+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 *nl) /* string to terminate lines with */
{
int a, b, c;
int real = 0;
if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10))
ch = 32;
if (((old == 13) || (old == 10)) && (isspace(real))) {
- cprintf("\n");
+ cprintf("%s", nl);
c = 1;
}
if (ch > 126)
if (ch > 32) {
if (((strlen(aaa) + c) > (width - 5)) && (strlen(aaa) > (width - 5))) {
- cprintf("\n%s", aaa);
+ cprintf("%s%s", nl, aaa);
c = strlen(aaa);
aaa[0] = 0;
}
}
if (ch == 32) {
if ((strlen(aaa) + c) > (width - 5)) {
- cprintf("\n");
+ cprintf("%s", nl);
c = 1;
}
cprintf("%s ", aaa);
goto FMTA;
}
if ((ch == 13) || (ch == 10)) {
- cprintf("%s\n", aaa);
+ cprintf("%s%s", aaa, nl);
c = 1;
strcpy(aaa, "");
goto FMTA;
}
goto FMTA;
-FMTEND: cprintf("%s\n", aaa);
+FMTEND: cprintf("%s%s", aaa, nl);
}
}
-/*
- * 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)
-{
- char *ptr;
-
- if (!strcasecmp(cbtype, "multipart/alternative")) {
- strcpy(ma->prefix, partnum);
- strcat(ma->prefix, ".");
- ma->is_ma = 1;
- ma->did_print = 0;
- return;
- }
-
- if ( (!strncasecmp(partnum, ma->prefix, strlen(ma->prefix)))
- && (ma->is_ma == 1)
- && (ma->did_print == 1) ) {
- lprintf(9, "Skipping part %s (%s)\n", partnum, cbtype);
- return;
- }
-
- ma->did_print = 1;
-
- if (!strcasecmp(cbtype, "text/plain")) {
- client_write(content, length);
- }
- else if (!strcasecmp(cbtype, "text/html")) {
- ptr = html_to_ascii(content, 80, 0);
- client_write(ptr, strlen(ptr));
- phree(ptr);
- }
- else if (strncasecmp(cbtype, "multipart/", 10)) {
- cprintf("Part %s: %s (%s) (%d bytes)\n",
- partnum, filename, cbtype, length);
- }
-}
-
-
/*
* Callback function for mime parser that opens a section for downloading
*/
/*
* Load a message from disk into memory.
- * This is used by output_message() and other fetch functions.
+ * This is used by CtdlOutputMsg() and other fetch functions.
*
* NOTE: Caller is responsible for freeing the returned CtdlMessage struct
* using the CtdlMessageFree() function.
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);
}
+/*
+ * 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)
+ {
+ char *ptr;
+ char *wptr;
+ size_t wlen;
+ CIT_UBYTE ch;
+
+ if (!strcasecmp(cbtype, "multipart/alternative")) {
+ strcpy(ma->prefix, partnum);
+ strcat(ma->prefix, ".");
+ ma->is_ma = 1;
+ ma->did_print = 0;
+ return;
+ }
+
+ if ( (!strncasecmp(partnum, ma->prefix, strlen(ma->prefix)))
+ && (ma->is_ma == 1)
+ && (ma->did_print == 1) ) {
+ lprintf(9, "Skipping part %s (%s)\n", partnum, cbtype);
+ return;
+ }
+
+ ma->did_print = 1;
+
+ if ( (!strcasecmp(cbtype, "text/plain"))
+ || (strlen(cbtype)==0) ) {
+ wlen = length;
+ wptr = content;
+ while (wlen--) {
+ ch = *wptr++;
+ if (ch==10) cprintf("\r\n");
+ else cprintf("%c", ch);
+ }
+ }
+ else if (!strcasecmp(cbtype, "text/html")) {
+ ptr = html_to_ascii(content, 80, 0);
+ wlen = strlen(ptr);
+ wptr = ptr;
+ while (wlen--) {
+ ch = *wptr++;
+ if (ch==10) cprintf("\r\n");
+ else cprintf("%c", ch);
+ }
+ phree(ptr);
+ }
+ else if (strncasecmp(cbtype, "multipart/", 10)) {
+ cprintf("Part %s: %s (%s) (%d bytes)\r\n",
+ partnum, filename, cbtype, length);
+ }
+ }
+
/*
- * Get a message off disk. (return value is the message's timestamp)
+ * Get a message off disk. (returns om_* values found in msgbase.h)
*
*/
-void output_message(char *msgid, int mode, int headers_only)
-{
- long msg_num;
- int a, i, k;
+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? */
+) {
+ int i, k;
char buf[1024];
- time_t xtime;
CIT_UBYTE ch;
char allkeys[256];
char display_name[256];
-
- struct CtdlMessage *TheMessage = NULL;
-
+ struct CtdlMessage *TheMessage;
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];
/* */
- msg_num = atol(msgid);
- safestrncpy(mid, msgid, sizeof mid);
+ 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))) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
+ if (do_proto) cprintf("%d Not logged in.\n",
+ ERROR + NOT_LOGGED_IN);
+ 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
* broken production code with nonbroken pre-beta code. :( -- ajc
*
if (!msg_ok) {
- cprintf("%d Message %ld is not in this room.\n",
+ if (do_proto) cprintf("%d Message %ld is not in this room.\n",
ERROR, msg_num);
- return;
+ return(om_no_such_msg);
}
*/
*/
TheMessage = CtdlFetchMessage(msg_num);
if (TheMessage == NULL) {
- cprintf("%d Can't locate msg %ld on disk\n", ERROR, msg_num);
- return;
+ if (do_proto) cprintf("%d Can't locate msg %ld on disk\n",
+ ERROR, msg_num);
+ return(om_no_such_msg);
}
/* Are we downloading a MIME component? */
if (mode == MT_DOWNLOAD) {
if (TheMessage->cm_format_type != FMT_RFC822) {
- cprintf("%d This is not a MIME message.\n",
+ if (do_proto)
+ cprintf("%d This is not a MIME message.\n",
ERROR);
} else if (CC->download_fp != NULL) {
- cprintf("%d You already have a download open.\n",
+ if (do_proto) cprintf(
+ "%d You already have a download open.\n",
ERROR);
} else {
/* Parse the message text component */
* section wasn't found, so print an error
*/
if (CC->download_fp == NULL) {
- cprintf("%d Section %s not found.\n",
+ if (do_proto) cprintf(
+ "%d Section %s not found.\n",
ERROR + FILE_NOT_FOUND,
desired_section);
}
}
CtdlFreeMessage(TheMessage);
- return;
+ return((CC->download_fp != NULL) ? om_ok : om_mime_error);
}
/* now for the user-mode message reading loops */
- cprintf("%d Message %ld:\n", LISTING_FOLLOWS, msg_num);
+ if (do_proto) cprintf("%d Message %ld:\n", LISTING_FOLLOWS, msg_num);
/* Tell the client which format type we're using. If this is a
* MIME message, *lie* about it and tell the user it's fixed-format.
*/
if (mode == MT_CITADEL) {
- if (TheMessage->cm_format_type == FMT_RFC822)
- cprintf("type=1\n");
- else
- cprintf("type=%d\n", TheMessage->cm_format_type);
+ if (TheMessage->cm_format_type == FMT_RFC822) {
+ if (do_proto) cprintf("type=1\n");
+ }
+ else {
+ if (do_proto) cprintf("type=%d\n",
+ TheMessage->cm_format_type);
+ }
}
/* nhdr=yes means that we're only displaying headers, no body */
if ((TheMessage->cm_anon_type == MES_ANON) && (mode == MT_CITADEL)) {
- cprintf("nhdr=yes\n");
+ if (do_proto) cprintf("nhdr=yes\n");
}
/* begin header processing loop for Citadel message format */
if (k != 'M') {
if (TheMessage->cm_fields[k] != NULL) {
if (k == 'A') {
- cprintf("%s=%s\n",
+ if (do_proto) cprintf("%s=%s\n",
msgkeys[k],
display_name);
}
else {
- cprintf("%s=%s\n",
+ if (do_proto) cprintf("%s=%s\n",
msgkeys[k],
TheMessage->cm_fields[k]
);
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') {
- cprintf("Path: %s\n", mptr);
- for (a = 0; a < strlen(mptr); ++a) {
- if (mptr[a] == '!') {
- strcpy(mptr, &mptr[a + 1]);
- a = 0;
- }
- }
strcpy(suser, mptr);
- } else if (i == 'U')
- cprintf("Subject: %s\n", mptr);
+ }
+ 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')
- cprintf("X-Citadel-Room: %s\n", mptr);
+ cprintf("X-Citadel-Room: %s%s",
+ mptr, nl);
else if (i == 'N')
strcpy(snode, mptr);
else if (i == 'R')
- cprintf("To: %s\n", mptr);
+ cprintf("To: %s%s", mptr, nl);
else if (i == 'T') {
- xtime = atol(mptr);
- cprintf("Date: %s", asctime(localtime(&xtime)));
+ generate_rfc822_datestamp(datestamp,
+ atol(mptr) );
+ 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);
}
- cprintf("Message-ID: <%s@%s>\n", mid, snode);
+
+ /* 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);
- cprintf("From: %s@%s (%s)\n", suser, snode, luser);
- cprintf("Organization: %s\n", lnode);
+
+ 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);
}
else if (mode == MT_MIME) { /* list parts only */
mime_parser(mptr, NULL, *list_this_part);
- cprintf("000\n");
+ if (do_proto) cprintf("000\n");
CtdlFreeMessage(TheMessage);
- return;
+ 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) {
- cprintf("000\n");
+ if (do_proto) cprintf("000\n");
CtdlFreeMessage(TheMessage);
- return;
+ return(om_ok);
}
/* signify start of msg text */
if (mode == MT_CITADEL)
- cprintf("text\n");
- if ((mode == MT_RFC822) && (TheMessage->cm_format_type != FMT_RFC822))
- cprintf("\n");
+ if (do_proto) cprintf("text\n");
+ if (mode == MT_RFC822) {
+ 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
* everything to be output completely literally ... regardless of
if (ch == 13)
ch = 10;
if ((ch == 10) || (strlen(buf) > 250)) {
- cprintf("%s\n", buf);
+ cprintf("%s%s", buf, nl);
strcpy(buf, "");
} else {
buf[strlen(buf) + 1] = 0;
}
}
if (strlen(buf) > 0)
- cprintf("%s\n", buf);
+ 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) {
- memfmout(80, mptr, 0);
+ memfmout(80, mptr, 0, nl);
}
/* If the message on disk is format 4 (MIME), we've gotta hand it
}
/* now we're done */
- cprintf("000\n");
+ if (do_proto) cprintf("000\n");
CtdlFreeMessage(TheMessage);
- return;
+ return(om_ok);
}
*/
void cmd_msg0(char *cmdbuf)
{
- char msgid[256];
+ long msgid;
int headers_only = 0;
- extract(msgid, cmdbuf, 0);
+ msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- output_message(msgid, MT_CITADEL, headers_only);
+ CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, 0);
return;
}
*/
void cmd_msg2(char *cmdbuf)
{
- char msgid[256];
+ long msgid;
int headers_only = 0;
- extract(msgid, cmdbuf, 0);
+ msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- output_message(msgid, MT_RFC822, headers_only);
+ 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)
{
- char msgid[256];
+ long msgid;
- extract(msgid, cmdbuf, 0);
-
- output_message(msgid, MT_MIME, 0);
+ msgid = extract_long(cmdbuf, 0);
+ CtdlOutputMsg(msgid, MT_MIME, 0, 1, 0);
}
/*
*/
void cmd_opna(char *cmdbuf)
{
- char msgid[256];
+ long msgid;
CtdlAllocUserData(SYM_DESIRED_SECTION, 64);
- extract(msgid, cmdbuf, 0);
+ msgid = extract_long(cmdbuf, 0);
extract(desired_section, cmdbuf, 1);
- output_message(msgid, MT_DOWNLOAD, 0);
+ CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, 1);
}
getroom(&CC->quickroom, hold_rm);
/* Bump the reference count for this message. */
- AdjRefCount(msgid, +1);
+ if ((flags & SM_DONT_BUMP_REF)==0) {
+ AdjRefCount(msgid, +1);
+ }
/* Return success. */
if (msg != NULL) CtdlFreeMessage(msg);
*
*/
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;
/*
* Save a message to disk
*/
-void CtdlSaveMsg(struct CtdlMessage *msg, /* message to 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];
char content_type[256]; /* We have to learn this */
char recipient[256];
long newmsgid;
- char *mptr;
+ char *mptr = NULL;
struct usersupp userbuf;
int a;
struct SuppMsgInfo smi;
FILE *network_fp = NULL;
static int seqnum = 1;
+ struct CtdlMessage *imsg;
+ char *instr;
+ int mailtype;
lprintf(9, "CtdlSaveMsg() called\n");
- if (is_valid_message(msg) == 0) return; /* self check */
+ 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) {
+ lprintf(1, "ERROR: attempt to save message with NULL body\n");
+ }
switch (msg->cm_format_type) {
case 0:
}
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");
- if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return;
+ if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-1);
/* If this message has an Extended ID, perform replication checks */
lprintf(9, "Performing replication checks\n");
- if (ReplicationChecks(msg) > 0) return;
+ if (ReplicationChecks(msg) > 0) return(-1);
/* Network mail - send a copy to the network program. */
if ((strlen(recipient) > 0) && (mailtype == MES_BINARY)) {
/* 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 &");
}
- if (newmsgid <= 0L) return;
+ if (newmsgid <= 0L) return(-1);
/* Write a supplemental message info record. This doesn't have to
* be a critical section because nobody else knows about this message
/* Now figure out where to store the pointers */
lprintf(9, "Storing pointers\n");
-
/* If this is being done by the networker delivering a private
* message, we want to BYPASS saving the sender's copy (because there
* 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 */
- /* FIX ... nothing's going to get delivered until we add
- some delivery instructions!!! */
if (mailtype == MES_INTERNET) {
CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0);
}
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 */
lprintf(9, "Returning to original room\n");
if (strcasecmp(hold_rm, CC->quickroom.QRname))
getroom(&CC->quickroom, hold_rm);
+
+ /* For internet mail, generate delivery instructions
+ * (Yes, this is recursive! Deal with it!)
+ */
+ if (mailtype == MES_INTERNET) {
+ lprintf(9, "Generating delivery instructions\n");
+ 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),
+ 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;
+ CtdlSaveMsg(imsg, "", SMTP_SPOOLOUT_ROOM, MES_LOCAL);
+ CtdlFreeMessage(imsg);
+ }
+
+ return(newmsgid);
}
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);
}
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);
}
struct SuppMsgInfo smi;
lprintf(9, "CtdlDeleteMessages(%s, %ld, %s)\n",
- room_name, dmsgnum, content_type);
+ room_name, dmsgnum, content_type ? content_type : "NULL");
/* get room record, obtaining a lock... */
if (lgetroom(&qrbuf, room_name) != 0) {
*/
begin_critical_section(S_SUPPMSGMAIN);
GetSuppMsgInfo(&smi, msgnum);
+ lprintf(9, "Ref count for message <%ld> before write is <%d>\n",
+ msgnum, smi.smi_refcount);
smi.smi_refcount += incr;
PutSuppMsgInfo(&smi);
end_critical_section(S_SUPPMSGMAIN);
-
lprintf(9, "Ref count for message <%ld> after write is <%d>\n",
msgnum, smi.smi_refcount);
FILE *fp, *tempfp;
char filename[PATH_MAX];
char cmdbuf[256];
- int ch;
+ char ch;
struct quickroom qrbuf;
char roomname[ROOMNAMELEN];
struct CtdlMessage *msg;
/* Create the requested room if we have to. */
if (getroom(&qrbuf, roomname) != 0) {
- create_room(roomname, 4, "", 0);
+ create_room(roomname,
+ ( (is_mailbox != NULL) ? 4 : 3 ),
+ "", 0);
}
/* If the caller specified this object as unique, delete all
* other objects of this type that are currently in the room.
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) {
+ config_msgnum = msgnum;
+}
+
+
+char *CtdlGetSysConfig(char *sysconfname) {
+ char hold_rm[ROOMNAMELEN];
+ long msgnum;
+ char *conf;
+ struct CtdlMessage *msg;
+ char buf[256];
+
+ strcpy(hold_rm, CC->quickroom.QRname);
+ if (getroom(&CC->quickroom, SYSCONFIGROOM) != 0) {
+ getroom(&CC->quickroom, hold_rm);
+ return NULL;
+ }
+
+
+ /* 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);
+ msgnum = config_msgnum;
+ end_critical_section(S_CONFIG);
+
+ if (msgnum < 0L) {
+ conf = NULL;
+ }
+ else {
+ msg = CtdlFetchMessage(msgnum);
+ if (msg != NULL) {
+ conf = strdoop(msg->cm_fields['M']);
+ CtdlFreeMessage(msg);
+ }
+ else {
+ conf = NULL;
+ }
+ }
+
+ getroom(&CC->quickroom, hold_rm);
+
+ lprintf(9, "eggstracting...\n");
+ if (conf != NULL) do {
+ extract_token(buf, conf, 0, '\n');
+ lprintf(9, "eggstracted <%s>\n", buf);
+ strcpy(conf, &conf[strlen(buf)+1]);
+ } while ( (strlen(conf)>0) && (strlen(buf)>0) );
+
+ return(conf);
+}
+
+void CtdlPutSysConfig(char *sysconfname, char *sysconfdata) {
+ char temp[PATH_MAX];
+ FILE *fp;
+
+ strcpy(temp, tmpnam(NULL));
+
+ fp = fopen(temp, "w");
+ if (fp == NULL) return;
+ fprintf(fp, "%s", sysconfdata);
+ fclose(fp);
+
+ /* this handy API function does all the work for us */
+ CtdlWriteObject(SYSCONFIGROOM, sysconfname, temp, NULL, 0, 1, 0);
+ unlink(temp);
+}
projects / citadel.git / blobdiff