/*
* Implements the message store.
*
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2015 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
* GNU General Public License for more details.
*/
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.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 <ctype.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <stdio.h>
#include <regex.h>
+#include <libcitadel.h>
#include "md5.h"
-#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
-#include "database.h"
-#include "msgbase.h"
-#include "support.h"
-#include "sysdep_decls.h"
+#include "ctdl_module.h"
#include "citserver.h"
-#include "room_ops.h"
-#include "user_ops.h"
-#include "file_ops.h"
-#include "config.h"
#include "control.h"
+#include "config.h"
+#include "clientsocket.h"
#include "genstamp.h"
+#include "room_ops.h"
+#include "user_ops.h"
+
#include "internet_addressing.h"
#include "euidindex.h"
+#include "msgbase.h"
#include "journaling.h"
-#include "citadel_dirs.h"
-#include "clientsocket.h"
-#include "threads.h"
-
-#include "ctdl_module.h"
struct addresses_to_be_filed *atbf = NULL;
Msg->cm_fields[which] = malloc(length + 1);
memcpy(Msg->cm_fields[which], buf, length);
Msg->cm_fields[which][length] = '\0';
+ Msg->cm_lengths[which] = length;
}
void CM_SetFieldLONG(struct CtdlMessage *Msg, eMsgField which, long lvalue)
if (Msg->cm_fields[WhichToCut] == NULL)
return;
- if (strlen(Msg->cm_fields[WhichToCut]) > maxlen)
+ if (Msg->cm_lengths[WhichToCut] > maxlen)
+ {
Msg->cm_fields[WhichToCut][maxlen] = '\0';
+ Msg->cm_lengths[WhichToCut] = maxlen;
+ }
}
void CM_FlushField(struct CtdlMessage *Msg, eMsgField which)
if (Msg->cm_fields[which] != NULL)
free (Msg->cm_fields[which]);
Msg->cm_fields[which] = NULL;
+ Msg->cm_lengths[which] = 0;
+}
+void CM_Flush(struct CtdlMessage *Msg)
+{
+ int i;
+
+ if (CM_IsValidMsg(Msg) == 0)
+ return;
+
+ for (i = 0; i < 256; ++i)
+ {
+ CM_FlushField(Msg, i);
+ }
}
void CM_CopyField(struct CtdlMessage *Msg, eMsgField WhichToPutTo, eMsgField WhichtToCopy)
if (Msg->cm_fields[WhichtToCopy] != NULL)
{
- len = strlen(Msg->cm_fields[WhichtToCopy]);
+ len = Msg->cm_lengths[WhichtToCopy];
Msg->cm_fields[WhichToPutTo] = malloc(len + 1);
- memcpy(Msg->cm_fields[WhichToPutTo], Msg->cm_fields[WhichToPutTo], len);
+ memcpy(Msg->cm_fields[WhichToPutTo], Msg->cm_fields[WhichtToCopy], len);
Msg->cm_fields[WhichToPutTo][len] = '\0';
+ Msg->cm_lengths[WhichToPutTo] = len;
}
else
+ {
Msg->cm_fields[WhichToPutTo] = NULL;
+ Msg->cm_lengths[WhichToPutTo] = 0;
+ }
}
long newmsgsize;
char *new;
- oldmsgsize = strlen(Msg->cm_fields[which]) + 1;
+ oldmsgsize = Msg->cm_lengths[which] + 1;
newmsgsize = length + oldmsgsize;
new = malloc(newmsgsize);
memcpy(new + length, Msg->cm_fields[which], oldmsgsize);
free(Msg->cm_fields[which]);
Msg->cm_fields[which] = new;
+ Msg->cm_lengths[which] = newmsgsize - 1;
}
else {
Msg->cm_fields[which] = malloc(length + 1);
memcpy(Msg->cm_fields[which], buf, length);
Msg->cm_fields[which][length] = '\0';
+ Msg->cm_lengths[which] = length;
}
}
Msg->cm_fields[which] = *buf;
*buf = NULL;
+ Msg->cm_lengths[which] = length;
}
void CM_SetAsFieldSB(struct CtdlMessage *Msg, eMsgField which, StrBuf **buf)
if (Msg->cm_fields[which] != NULL)
free (Msg->cm_fields[which]);
+ Msg->cm_lengths[which] = StrLength(*buf);
Msg->cm_fields[which] = SmashStrBuf(buf);
}
{
if (Msg->cm_fields[which] != NULL)
{
- *retlen = strlen(Msg->cm_fields[which]);
+ *retlen = Msg->cm_lengths[which];
*ret = Msg->cm_fields[which];
Msg->cm_fields[which] = NULL;
+ Msg->cm_lengths[which] = 0;
}
else
{
for (i = 0; i < 256; ++i)
if (msg->cm_fields[i] != NULL) {
free(msg->cm_fields[i]);
+ msg->cm_lengths[i] = 0;
}
msg->cm_magic = 0; /* just in case */
int CM_DupField(eMsgField i, struct CtdlMessage *OrgMsg, struct CtdlMessage *NewMsg)
{
long len;
- len = strlen(OrgMsg->cm_fields[i]);
+ len = OrgMsg->cm_lengths[i];
NewMsg->cm_fields[i] = malloc(len + 1);
if (NewMsg->cm_fields[i] == NULL)
return 0;
memcpy(NewMsg->cm_fields[i], OrgMsg->cm_fields[i], len);
NewMsg->cm_fields[i][len] = '\0';
+ NewMsg->cm_lengths[i] = len;
return 1;
}
if (IsEmptyStr(template->cm_fields[i])) continue;
return 1;
}
- if (strcasecmp(msg->cm_fields[i],
- template->cm_fields[i])) return 1;
+ if ((template->cm_lengths[i] != msg->cm_lengths[i]) ||
+ (strcasecmp(msg->cm_fields[i], template->cm_fields[i])))
+ return 1;
}
}
free(msglist);
return -1;
}
- msg = CtdlFetchMessage(msglist[a], 1);
+ msg = CtdlFetchMessage(msglist[a], 1, 1);
if (msg != NULL) {
if (CtdlMsgCmp(msg, compare)) {
msglist[a] = 0L;
MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
return;
}
- len = 0;
client_write(nl, nllen);
column = 0;
}
/*
* Callback function for mime parser that opens a section for downloading
+ * we use serv_files function here:
*/
+extern void OpenCmdResult(char *filename, const char *mime_type);
void mime_download(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length,
char *encoding, char *cbid, void *cbuserdata)
}
}
-
-/*
- * Load a message from disk into memory.
- * This is used by CtdlOutputMsg() and other fetch functions.
- *
- * NOTE: Caller is responsible for freeing the returned CtdlMessage struct
- * using the CtdlMessageFree() function.
- */
-struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body)
+struct CtdlMessage *CtdlDeserializeMessage(long msgnum, int with_body, const char *Buffer, long Length)
{
struct CitContext *CCC = CC;
- struct cdbdata *dmsgtext;
struct CtdlMessage *ret = NULL;
- char *mptr;
- char *upper_bound;
+ const char *mptr;
+ const char *upper_bound;
cit_uint8_t ch;
cit_uint8_t field_header;
+ eMsgField which;
- MSG_syslog(LOG_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body);
- dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
- if (dmsgtext == NULL) {
- MSG_syslog(LOG_ERR, "CtdlFetchMessage(%ld, %d) Failed!\n", msgnum, with_body);
- return NULL;
- }
- mptr = dmsgtext->ptr;
- upper_bound = mptr + dmsgtext->len;
+ mptr = Buffer;
+ upper_bound = Buffer + Length;
/* Parse the three bytes that begin EVERY message on disk.
* The first is always 0xFF, the on-disk magic number.
ch = *mptr++;
if (ch != 255) {
MSG_syslog(LOG_ERR, "Message %ld appears to be corrupted.\n", msgnum);
- cdb_free(dmsgtext);
return NULL;
}
ret = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
* have just processed the 'M' (message text) field.
*/
do {
+ field_header = '\0';
long len;
+
+ /* work around possibly buggy messages: */
+ while (field_header == '\0')
+ {
+ if (mptr >= upper_bound) {
+ break;
+ }
+ field_header = *mptr++;
+ }
if (mptr >= upper_bound) {
break;
}
- field_header = *mptr++;
+ which = field_header;
len = strlen(mptr);
- CM_SetField(ret, field_header, mptr, len);
+
+ CM_SetField(ret, which, mptr, len);
mptr += len + 1; /* advance to next field */
} while ((mptr < upper_bound) && (field_header != 'M'));
+ return (ret);
+}
+
+
+/*
+ * Load a message from disk into memory.
+ * This is used by CtdlOutputMsg() and other fetch functions.
+ *
+ * NOTE: Caller is responsible for freeing the returned CtdlMessage struct
+ * using the CtdlMessageFree() function.
+ */
+struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body, int run_msg_hooks)
+{
+ struct CitContext *CCC = CC;
+ struct cdbdata *dmsgtext;
+ struct CtdlMessage *ret = NULL;
+
+ MSG_syslog(LOG_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body);
+ dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
+ if (dmsgtext == NULL) {
+ MSG_syslog(LOG_ERR, "CtdlFetchMessage(%ld, %d) Failed!\n", msgnum, with_body);
+ return NULL;
+ }
+
+ if (dmsgtext->ptr[dmsgtext->len - 1] != '\0')
+ {
+ MSG_syslog(LOG_ERR, "CtdlFetchMessage(%ld, %d) Forcefully terminating message!!\n", msgnum, with_body);
+ dmsgtext->ptr[dmsgtext->len - 1] = '\0';
+ }
+
+ ret = CtdlDeserializeMessage(msgnum, with_body, dmsgtext->ptr, dmsgtext->len);
+
cdb_free(dmsgtext);
+ if (ret == NULL) {
+ return NULL;
+ }
+
/* Always make sure there's something in the msg text field. If
* it's NULL, the message text is most likely stored separately,
* so go ahead and fetch that. Failing that, just set a dummy
if ( (CM_IsEmpty(ret, eMesageText)) && (with_body) ) {
dmsgtext = cdb_fetch(CDB_BIGMSGS, &msgnum, sizeof(long));
if (dmsgtext != NULL) {
- CM_SetAsField(ret, eMesageText, &dmsgtext->ptr, dmsgtext->len);
+ CM_SetAsField(ret, eMesageText, &dmsgtext->ptr, dmsgtext->len - 1);
cdb_free(dmsgtext);
}
}
}
/* Perform "before read" hooks (aborting if any return nonzero) */
- if (PerformMessageHooks(ret, EVT_BEFOREREAD) > 0) {
+ if (run_msg_hooks && (PerformMessageHooks(ret, NULL, EVT_BEFOREREAD) > 0)) {
CM_Free(ret);
return NULL;
}
*
*/
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? */
- char *section, /* NULL or a message/rfc822 section */
- int flags, /* various flags; see msgbase.h */
- char **Author,
- char **Address
+ 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? */
+ char *section, /* NULL or a message/rfc822 section */
+ int flags, /* various flags; see msgbase.h */
+ char **Author,
+ char **Address,
+ char **MessageID
) {
struct CitContext *CCC = CC;
struct CtdlMessage *TheMessage = NULL;
* request that we don't even bother loading the body into memory.
*/
if (headers_only == HEADERS_FAST) {
- TheMessage = CtdlFetchMessage(msg_num, 0);
+ TheMessage = CtdlFetchMessage(msg_num, 0, 1);
}
else {
- TheMessage = CtdlFetchMessage(msg_num, 1);
+ TheMessage = CtdlFetchMessage(msg_num, 1, 1);
}
if (TheMessage == NULL) {
if (section) if (!IsEmptyStr(section)) if (strcmp(section, "0")) {
memset(&encap, 0, sizeof encap);
safestrncpy(encap.desired_section, section, sizeof encap.desired_section);
- mime_parser(TheMessage->cm_fields[eMesageText],
- NULL,
- *extract_encapsulated_message,
- NULL, NULL, (void *)&encap, 0
- );
+ mime_parser(CM_RANGE(TheMessage, eMesageText),
+ *extract_encapsulated_message,
+ NULL, NULL, (void *)&encap, 0
+ );
if ((Author != NULL) && (*Author == NULL))
{
- *Author = TheMessage->cm_fields[eAuthor];
- TheMessage->cm_fields[eAuthor] = NULL;
+ long len;
+ CM_GetAsField(TheMessage, eAuthor, Author, &len);
}
if ((Address != NULL) && (*Address == NULL))
{
- *Address = TheMessage->cm_fields[erFc822Addr];
- TheMessage->cm_fields[erFc822Addr] = NULL;
+ long len;
+ CM_GetAsField(TheMessage, erFc822Addr, Address, &len);
+ }
+ if ((MessageID != NULL) && (*MessageID == NULL))
+ {
+ long len;
+ CM_GetAsField(TheMessage, emessageId, MessageID, &len);
}
CM_Free(TheMessage);
TheMessage = NULL;
retcode = CtdlOutputPreLoadedMsg(TheMessage, mode, headers_only, do_proto, crlf, flags);
if ((Author != NULL) && (*Author == NULL))
{
- *Author = TheMessage->cm_fields[eAuthor];
- TheMessage->cm_fields[eAuthor] = NULL;
+ long len;
+ CM_GetAsField(TheMessage, eAuthor, Author, &len);
}
if ((Address != NULL) && (*Address == NULL))
{
- *Address = TheMessage->cm_fields[erFc822Addr];
- TheMessage->cm_fields[erFc822Addr] = NULL;
+ long len;
+ CM_GetAsField(TheMessage, erFc822Addr, Address, &len);
+ }
+ if ((MessageID != NULL) && (*MessageID == NULL))
+ {
+ long len;
+ CM_GetAsField(TheMessage, emessageId, MessageID, &len);
}
CM_Free(TheMessage);
void OutputRFC822MsgHeaders(
struct CtdlMessage *TheMessage,
int flags, /* should the bessage be exported clean */
- const char *nl,
+ const char *nl, int nlen,
char *mid, long sizeof_mid,
char *suser, long sizeof_suser,
char *luser, long sizeof_luser,
char *mpptr = NULL;
char *hptr;
- for (i = 0; i < 256; ++i) {
- if (TheMessage->cm_fields[i]) {
- mptr = mpptr = TheMessage->cm_fields[i];
-
- if (i == eAuthor) {
+ for (i = 0; i < NDiskFields; ++i) {
+ if (TheMessage->cm_fields[FieldOrder[i]]) {
+ mptr = mpptr = TheMessage->cm_fields[FieldOrder[i]];
+ switch (FieldOrder[i]) {
+ case eAuthor:
safestrncpy(luser, mptr, sizeof_luser);
safestrncpy(suser, mptr, sizeof_suser);
- }
- else if (i == 'Y') {
+ break;
+ case eCarbonCopY:
if ((flags & QP_EADDR) != 0) {
mptr = qp_encode_email_addrs(mptr);
}
sanitize_truncated_recipient(mptr);
cprintf("CC: %s%s", mptr, nl);
- }
- else if (i == 'P') {
+ break;
+ case eMessagePath:
cprintf("Return-Path: %s%s", mptr, nl);
- }
- else if (i == eListID) {
+ break;
+ case eListID:
cprintf("List-ID: %s%s", mptr, nl);
- }
- else if (i == 'V') {
+ break;
+ case eenVelopeTo:
if ((flags & QP_EADDR) != 0)
mptr = qp_encode_email_addrs(mptr);
hptr = mptr;
hptr ++;
if (!IsEmptyStr(hptr))
cprintf("Envelope-To: %s%s", hptr, nl);
- }
- else if (i == 'U') {
+ break;
+ case eMsgSubject:
cprintf("Subject: %s%s", mptr, nl);
subject_found = 1;
- }
- else if (i == 'I')
+ break;
+ case emessageId:
safestrncpy(mid, mptr, sizeof_mid); /// TODO: detect @ here and copy @nodename in if not found.
- else if (i == erFc822Addr)
+ break;
+ case erFc822Addr:
safestrncpy(fuser, mptr, sizeof_fuser);
- /* else if (i == 'O')
+ /* case eOriginalRoom:
cprintf("X-Citadel-Room: %s%s",
- mptr, nl); */
- else if (i == 'N')
+ mptr, nl)
+ break;
+ ; */
+ case eNodeName:
safestrncpy(snode, mptr, sizeof_snode);
- else if (i == 'R')
- {
+ break;
+ case eRecipient:
if (haschar(mptr, '@') == 0)
{
sanitize_truncated_recipient(mptr);
- cprintf("To: %s@%s", mptr, config.c_fqdn);
+ cprintf("To: %s@%s", mptr, CtdlGetConfigStr("c_fqdn"));
cprintf("%s", nl);
}
else
cprintf("To: %s", mptr);
cprintf("%s", nl);
}
- }
- else if (i == 'T') {
+ break;
+ case eTimestamp:
datestring(datestamp, sizeof datestamp,
atol(mptr), DATESTRING_RFC822);
cprintf("Date: %s%s", datestamp, nl);
- }
- else if (i == 'W') {
+ break;
+ case eWeferences:
cprintf("References: ");
k = num_tokens(mptr, '|');
for (j=0; j<k; ++j) {
cprintf(" ");
}
}
- }
- else if (i == eReplyTo) {
+ break;
+ case eReplyTo:
hptr = mptr;
while ((*hptr != '\0') && isspace(*hptr))
hptr ++;
if (!IsEmptyStr(hptr))
cprintf("Reply-To: %s%s", mptr, nl);
+ break;
+
+ case eRemoteRoom:
+ case eDestination:
+ case eExclusiveID:
+ case eHumanNode:
+ case eJournal:
+ case eMesageText:
+ case eBig_message:
+ case eOriginalRoom:
+ case eSpecialField:
+ case eErrorMsg:
+ case eSuppressIdx:
+ case eExtnotify:
+ case eVltMsgNum:
+ /* these don't map to mime message headers. */
+ break;
+
}
if (mptr != mpptr)
free (mptr);
int headers_only, /* eschew the message body? */
int flags, /* should the bessage be exported clean? */
- const char *nl)
+ const char *nl, int nlen)
{
cit_uint8_t prev_ch;
int eoh = 0;
int outlen = 0;
int nllen = strlen(nl);
char *mptr;
+ int lfSent = 0;
mptr = TheMessage->cm_fields[eMesageText];
MSGM_syslog(LOG_ERR, "Dump_RFC822HeadersBody(): aborting due to write failure.\n");
return;
}
+ lfSent = (outbuf[outlen - 1] == '\n');
outlen = 0;
}
}
if (outlen > 0) {
client_write(outbuf, outlen);
+ lfSent = (outbuf[outlen - 1] == '\n');
}
+ if (!lfSent)
+ client_write(nl, nlen);
}
void DumpFormatFixed(
struct CtdlMessage *TheMessage,
int mode, /* how would you like that message? */
- const char *nl)
+ const char *nl, int nllen)
{
cit_uint8_t ch;
char buf[SIZ];
int buflen;
int xlline = 0;
- int nllen = strlen (nl);
char *mptr;
mptr = TheMessage->cm_fields[eMesageText];
) {
struct CitContext *CCC = CC;
int i;
- char *mptr = NULL;
const char *nl; /* newline string */
+ int nlen;
struct ma_info ma;
/* Buffers needed for RFC822 translation. These are all filled
strcpy(mid, "unknown");
nl = (crlf ? "\r\n" : "\n");
+ nlen = crlf ? 2 : 1;
if (!CM_IsValidMsg(TheMessage)) {
MSGM_syslog(LOG_ERR,
* Pad it with spaces in order to avoid changing the RFC822 length of the message.
*/
if ( (flags & SUPPRESS_ENV_TO) && (!CM_IsEmpty(TheMessage, eenVelopeTo)) ) {
- memset(TheMessage->cm_fields[eenVelopeTo], ' ', strlen(TheMessage->cm_fields[eenVelopeTo]));
+ memset(TheMessage->cm_fields[eenVelopeTo], ' ', TheMessage->cm_lengths[eenVelopeTo]);
}
/* Are we downloading a MIME component? */
ERROR + RESOURCE_BUSY);
} else {
/* Parse the message text component */
- mptr = TheMessage->cm_fields[eMesageText];
- mime_parser(mptr, NULL, *mime_download, NULL, NULL, NULL, 0);
+ mime_parser(CM_RANGE(TheMessage, eMesageText),
+ *mime_download, NULL, NULL, NULL, 0);
/* If there's no file open by this time, the requested
* section wasn't found, so print an error
*/
/* Parse the message text component */
int found_it = 0;
- mptr = TheMessage->cm_fields[eMesageText];
- mime_parser(mptr, NULL, *mime_spew_section, NULL, NULL, (void *)&found_it, 0);
+ mime_parser(CM_RANGE(TheMessage, eMesageText),
+ *mime_spew_section, NULL, NULL, (void *)&found_it, 0);
/* If section wasn't found, print an error
*/
if (!found_it) {
strcpy(suser, "");
strcpy(luser, "");
strcpy(fuser, "");
- strcpy(snode, NODENAME);
+ memcpy(snode, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")) + 1);
if (mode == MT_RFC822)
OutputRFC822MsgHeaders(
TheMessage,
flags,
- nl,
+ nl, nlen,
mid, sizeof(mid),
suser, sizeof(suser),
luser, sizeof(luser),
/* Tell the client about the MIME parts in this message */
if (TheMessage->cm_format_type == FMT_RFC822) {
if ( (mode == MT_CITADEL) || (mode == MT_MIME) ) {
- mptr = TheMessage->cm_fields[eMesageText];
memset(&ma, 0, sizeof(struct ma_info));
- mime_parser(mptr, NULL,
+ mime_parser(CM_RANGE(TheMessage, eMesageText),
(do_proto ? *list_this_part : NULL),
(do_proto ? *list_this_pref : NULL),
(do_proto ? *list_this_suff : NULL),
TheMessage,
headers_only,
flags,
- nl);
+ nl, nlen);
goto DONE;
}
}
DumpFormatFixed(
TheMessage,
mode, /* how would you like that message? */
- nl);
+ nl, nlen);
/* If the message on disk is format 0 (Citadel vari-format), we
* output using the formatter at 80 columns. This is the final output
* message to the reader's screen width.
*/
if (TheMessage->cm_format_type == FMT_CITADEL) {
- mptr = TheMessage->cm_fields[eMesageText];
-
if (mode == MT_MIME) {
cprintf("Content-type: text/x-citadel-variformat\n\n");
}
- memfmout(mptr, nl);
+ memfmout(TheMessage->cm_fields[eMesageText], nl);
}
/* If the message on disk is format 4 (MIME), we've gotta hand it
strcpy(ma.chosen_part, "1");
ma.chosen_pref = 9999;
ma.dont_decode = CCC->msg4_dont_decode;
- mime_parser(mptr, NULL,
- *choose_preferred, *fixed_output_pre,
- *fixed_output_post, (void *)&ma, 1);
- mime_parser(mptr, NULL,
- *output_preferred, NULL, NULL, (void *)&ma, 1);
+ mime_parser(CM_RANGE(TheMessage, eMesageText),
+ *choose_preferred, *fixed_output_pre,
+ *fixed_output_post, (void *)&ma, 1);
+ mime_parser(CM_RANGE(TheMessage, eMesageText),
+ *output_preferred, NULL, NULL, (void *)&ma, 1);
}
else {
ma.use_fo_hooks = 1;
- mime_parser(mptr, NULL,
- *fixed_output, *fixed_output_pre,
- *fixed_output_post, (void *)&ma, 0);
+ mime_parser(CM_RANGE(TheMessage, eMesageText),
+ *fixed_output, *fixed_output_pre,
+ *fixed_output_post, (void *)&ma, 0);
}
}
msg = supplied_msg;
}
else {
- msg = CtdlFetchMessage(msgid, 0);
+ msg = CtdlFetchMessage(msgid, 0, 1);
}
if (msg != NULL) {
* called by server-side modules.
*
*/
-long send_message(struct CtdlMessage *msg) {
+long CtdlSaveThisMessage(struct CtdlMessage *msg, long msgid, int Reply) {
struct CitContext *CCC = CC;
- long newmsgid;
long retval;
- char msgidbuf[256];
- long msgidbuflen;
struct ser_ret smr;
int is_bigmsg = 0;
char *holdM = NULL;
+ long holdMLen = 0;
- /* Get a new message number */
- newmsgid = get_new_message_number();
- msgidbuflen = snprintf(msgidbuf, sizeof msgidbuf, "%08lX-%08lX@%s",
- (long unsigned int) time(NULL),
- (long unsigned int) newmsgid,
- config.c_fqdn
- );
-
- /* Generate an ID if we don't have one already */
- if (CM_IsEmpty(msg, emessageId)) {
- CM_SetField(msg, emessageId, msgidbuf, msgidbuflen);
- }
-
- /* If the message is big, set its body aside for storage elsewhere */
- if (!CM_IsEmpty(msg, eMesageText)) {
- if (strlen(msg->cm_fields[eMesageText]) > BIGMSG) {
- is_bigmsg = 1;
- holdM = msg->cm_fields[eMesageText];
- msg->cm_fields[eMesageText] = NULL;
- }
+ /*
+ * If the message is big, set its body aside for storage elsewhere
+ * and we hide the message body from the serializer
+ */
+ if (!CM_IsEmpty(msg, eMesageText) && msg->cm_lengths[eMesageText] > BIGMSG)
+ {
+ is_bigmsg = 1;
+ holdM = msg->cm_fields[eMesageText];
+ msg->cm_fields[eMesageText] = NULL;
+ holdMLen = msg->cm_lengths[eMesageText];
+ msg->cm_lengths[eMesageText] = 0;
}
/* Serialize our data structure for storage in the database */
CtdlSerializeMessage(&smr, msg);
if (is_bigmsg) {
+ /* put the message body back into the message */
msg->cm_fields[eMesageText] = holdM;
+ msg->cm_lengths[eMesageText] = holdMLen;
}
if (smr.len == 0) {
- cprintf("%d Unable to serialize message\n",
- ERROR + INTERNAL_ERROR);
+ if (Reply) {
+ cprintf("%d Unable to serialize message\n",
+ ERROR + INTERNAL_ERROR);
+ }
+ else {
+ MSGM_syslog(LOG_ERR, "CtdlSaveMessage() unable to serialize message");
+
+ }
return (-1L);
}
/* Write our little bundle of joy into the message base */
- if (cdb_store(CDB_MSGMAIN, &newmsgid, (int)sizeof(long),
- smr.ser, smr.len) < 0) {
- MSGM_syslog(LOG_ERR, "Can't store message\n");
- retval = 0L;
- } else {
+ retval = cdb_store(CDB_MSGMAIN, &msgid, (int)sizeof(long),
+ smr.ser, smr.len);
+ if (retval < 0) {
+ MSG_syslog(LOG_ERR, "Can't store message %ld: %ld", msgid, retval);
+ }
+ else {
if (is_bigmsg) {
- cdb_store(CDB_BIGMSGS,
- &newmsgid,
- (int)sizeof(long),
- holdM,
- (strlen(holdM) + 1)
+ retval = cdb_store(CDB_BIGMSGS,
+ &msgid,
+ (int)sizeof(long),
+ holdM,
+ (holdMLen + 1)
);
+ if (retval < 0) {
+ MSG_syslog(LOG_ERR, "failed to store message body for msgid %ld: %ld",
+ msgid, retval);
+ }
}
- retval = newmsgid;
}
/* Free the memory we used for the serialized message */
free(smr.ser);
+ return(retval);
+}
+
+long send_message(struct CtdlMessage *msg) {
+ long newmsgid;
+ long retval;
+ char msgidbuf[256];
+ long msgidbuflen;
+
+ /* Get a new message number */
+ newmsgid = get_new_message_number();
+
+ /* Generate an ID if we don't have one already */
+ if (CM_IsEmpty(msg, emessageId)) {
+ msgidbuflen = snprintf(msgidbuf, sizeof msgidbuf, "%08lX-%08lX@%s",
+ (long unsigned int) time(NULL),
+ (long unsigned int) newmsgid,
+ CtdlGetConfigStr("c_fqdn")
+ );
+
+ CM_SetField(msg, emessageId, msgidbuf, msgidbuflen);
+ }
+
+ retval = CtdlSaveThisMessage(msg, newmsgid, 1);
+
+ if (retval == 0) {
+ retval = newmsgid;
+ }
+
/* Return the *local* message ID to the caller
* (even if we're storing an incoming network message)
*/
* serialized message in memory. THE LATTER MUST BE FREED BY THE CALLER.
*/
void CtdlSerializeMessage(struct ser_ret *ret, /* return values */
- struct CtdlMessage *msg) /* unserialized msg */
+ struct CtdlMessage *msg) /* unserialized msg */
{
struct CitContext *CCC = CC;
- size_t wlen, fieldlen;
+ size_t wlen;
int i;
- long lengths[NDiskFields];
-
- memset(lengths, 0, sizeof(lengths));
/*
* Check for valid message format
ret->len = 3;
for (i=0; i < NDiskFields; ++i)
if (msg->cm_fields[FieldOrder[i]] != NULL)
- {
- lengths[i] = strlen(msg->cm_fields[FieldOrder[i]]);
- ret->len += lengths[i] + 2;
- }
+ ret->len += msg->cm_lengths[FieldOrder[i]] + 2;
ret->ser = malloc(ret->len);
if (ret->ser == NULL) {
for (i=0; i < NDiskFields; ++i)
if (msg->cm_fields[FieldOrder[i]] != NULL)
{
- fieldlen = lengths[i];
ret->ser[wlen++] = (char)FieldOrder[i];
memcpy(&ret->ser[wlen],
msg->cm_fields[FieldOrder[i]],
- fieldlen+1);
+ msg->cm_lengths[FieldOrder[i]] + 1);
- wlen = wlen + fieldlen + 1;
+ wlen = wlen + msg->cm_lengths[FieldOrder[i]] + 1;
}
if (ret->len != wlen) {
* Save a message to disk and submit it into the delivery system.
*/
long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */
- struct recptypes *recps, /* recipients (if mail) */
+ recptypes *recps, /* recipients (if mail) */
const char *force, /* force a particular room? */
int flags /* should the message be exported clean? */
)
{
- char submit_filename[128];
char hold_rm[ROOMNAMELEN];
char actual_rm[ROOMNAMELEN];
char force_room[ROOMNAMELEN];
char content_type[SIZ]; /* We have to learn this */
char recipient[SIZ];
+ char bounce_to[1024];
const char *room;
long newmsgid;
const char *mptr = NULL;
struct ctdluser userbuf;
int a, i;
struct MetaData smi;
- FILE *network_fp = NULL;
- static int seqnum = 1;
- struct CtdlMessage *imsg = NULL;
- char *instr = NULL;
- size_t instr_alloc = 0;
- struct ser_ret smr;
- char *hold_R, *hold_D;
char *collected_addresses = NULL;
struct addresses_to_be_filed *aptr = NULL;
StrBuf *saved_rfc822_version = NULL;
int qualified_for_journaling = 0;
CitContext *CCC = MyContext();
- char bounce_to[1024] = "";
- int rv = 0;
MSGM_syslog(LOG_DEBUG, "CtdlSubmitMsg() called\n");
if (CM_IsValidMsg(msg) == 0) return(-1); /* self check */
if (TWITDETECT) {
if (CCC->user.axlevel == AxProbU) {
strcpy(hold_rm, actual_rm);
- strcpy(actual_rm, config.c_twitroom);
+ strcpy(actual_rm, CtdlGetConfigStr("c_twitroom"));
MSGM_syslog(LOG_DEBUG, "Diverting to twit room\n");
}
}
MSG_syslog(LOG_INFO, "Final selection: %s (%s)\n", actual_rm, room);
if (strcasecmp(actual_rm, CCC->room.QRname)) {
/* CtdlGetRoom(&CCC->room, actual_rm); */
- CtdlUserGoto(actual_rm, 0, 1, NULL, NULL);
+ CtdlUserGoto(actual_rm, 0, 1, NULL, NULL, NULL, NULL);
}
/*
/* Perform "before save" hooks (aborting if any return nonzero) */
MSGM_syslog(LOG_DEBUG, "Performing before-save hooks\n");
- if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-3);
+ if (PerformMessageHooks(msg, recps, EVT_BEFORESAVE) > 0) return(-3);
/*
* If this message has an Exclusive ID, and the room is replication
if ((!CCC->internal_pgm) || (recps == NULL)) {
if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 1, msg) != 0) {
MSGM_syslog(LOG_ERR, "ERROR saving message pointer!\n");
- CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
+ CtdlSaveMsgPointerInRoom(CtdlGetConfigStr("c_aideroom"), newmsgid, 0, msg);
}
}
/* Bump this user's messages posted counter. */
MSGM_syslog(LOG_DEBUG, "Updating user\n");
- CtdlGetUserLock(&CCC->user, CCC->curr_user);
+ CtdlLockGetCurrentUser();
CCC->user.posted = CCC->user.posted + 1;
- CtdlPutUserLock(&CCC->user);
+ CtdlPutCurrentUserLock();
/* Decide where bounces need to be delivered */
- if ((recps != NULL) && (recps->bounce_to != NULL)) {
- safestrncpy(bounce_to, recps->bounce_to, sizeof bounce_to);
- }
- else if (CCC->logged_in) {
- snprintf(bounce_to, sizeof bounce_to, "%s@%s", CCC->user.fullname, config.c_nodename);
- }
- else {
- snprintf(bounce_to, sizeof bounce_to, "%s@%s", msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]);
+ if ((recps != NULL) && (recps->bounce_to == NULL))
+ {
+ if (CCC->logged_in)
+ snprintf(bounce_to, sizeof bounce_to, "%s@%s",
+ CCC->user.fullname, CtdlGetConfigStr("c_nodename"));
+ else
+ snprintf(bounce_to, sizeof bounce_to, "%s@%s",
+ msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]);
+ recps->bounce_to = bounce_to;
}
+
+ CM_SetFieldLONG(msg, eVltMsgNum, newmsgid);
+
/* If this is private, local mail, make a copy in the
* recipient's mailbox and bump the reference count.
*/
if ((recps != NULL) && (recps->num_local > 0))
- for (i=0; i<num_tokens(recps->recp_local, '|'); ++i) {
- long recipientlen;
- recipientlen = extract_token(recipient,
- recps->recp_local, i,
- '|', sizeof recipient);
- MSG_syslog(LOG_DEBUG, "Delivering private local mail to <%s>\n",
- recipient);
+ {
+ char *pch;
+ int ntokens;
+
+ pch = recps->recp_local;
+ recps->recp_local = recipient;
+ ntokens = num_tokens(pch, '|');
+ for (i=0; i<ntokens; ++i)
+ {
+ extract_token(recipient, pch, i, '|', sizeof recipient);
+ MSG_syslog(LOG_DEBUG, "Delivering private local mail to <%s>\n", recipient);
if (CtdlGetUser(&userbuf, recipient) == 0) {
CtdlMailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM);
CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg);
CtdlBumpNewMailCounter(userbuf.usernum);
- if (!IsEmptyStr(config.c_funambol_host) || !IsEmptyStr(config.c_pager_program)) {
- /* Generate a instruction message for the Funambol notification
- * server, in the same style as the SMTP queue
- */
- long instrlen;
- instr_alloc = 1024;
- instr = malloc(instr_alloc);
- instrlen = snprintf(
- instr, instr_alloc,
- "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
- "bounceto|%s\n",
- SPOOLMIME,
- newmsgid,
- (long)time(NULL), //todo: time() is expensive!
- bounce_to
- );
-
- imsg = malloc(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;
- CM_SetField(imsg, eMsgSubject, HKEY("QMSG"));
- CM_SetField(imsg, eAuthor, HKEY("Citadel"));
- CM_SetField(imsg, eJournal, HKEY("do not journal"));
- CM_SetAsField(imsg, eMesageText, &instr, instrlen);
- CM_SetField(imsg, eExtnotify, recipient, recipientlen);
- CtdlSubmitMsg(imsg, NULL, FNBL_QUEUE_ROOM, 0);
- CM_Free(imsg);
- }
+ PerformMessageHooks(msg, recps, EVT_AFTERUSRMBOXSAVE);
}
else {
MSG_syslog(LOG_DEBUG, "No user <%s>\n", recipient);
- CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
+ CtdlSaveMsgPointerInRoom(CtdlGetConfigStr("c_aideroom"), newmsgid, 0, msg);
}
}
+ recps->recp_local = pch;
+ }
/* Perform "after save" hooks */
MSGM_syslog(LOG_DEBUG, "Performing after-save hooks\n");
- CM_SetFieldLONG(msg, eVltMsgNum, newmsgid);
- PerformMessageHooks(msg, EVT_AFTERSAVE);
+ PerformMessageHooks(msg, recps, EVT_AFTERSAVE);
CM_FlushField(msg, eVltMsgNum);
- /* For IGnet mail, we have to save a new copy into the spooler for
- * each recipient, with the R and D fields set to the recipient and
- * destination-node. This has two ugly side effects: all other
- * recipients end up being unlisted in this recipient's copy of the
- * message, and it has to deliver multiple messages to the same
- * node. We'll revisit this again in a year or so when everyone has
- * a network spool receiver that can handle the new style messages.
- */
- if ((recps != NULL) && (recps->num_ignet > 0))
- for (i=0; i<num_tokens(recps->recp_ignet, '|'); ++i) {
- extract_token(recipient, recps->recp_ignet, i,
- '|', sizeof recipient);
-
- hold_R = msg->cm_fields[eRecipient];
- hold_D = msg->cm_fields[eDestination];
- msg->cm_fields[eRecipient] = malloc(SIZ);
- msg->cm_fields[eDestination] = malloc(128);
- extract_token(msg->cm_fields[eRecipient], recipient, 0, '@', SIZ);
- extract_token(msg->cm_fields[eDestination], recipient, 1, '@', 128);
-
- CtdlSerializeMessage(&smr, msg);
- if (smr.len > 0) {
- snprintf(submit_filename, sizeof submit_filename,
- "%s/netmail.%04lx.%04x.%04x",
- ctdl_netin_dir,
- (long) getpid(), CCC->cs_pid, ++seqnum);
- network_fp = fopen(submit_filename, "wb+");
- if (network_fp != NULL) {
- rv = fwrite(smr.ser, smr.len, 1, network_fp);
- if (rv == -1) {
- MSG_syslog(LOG_EMERG, "CtdlSubmitMsg(): Couldn't write network spool file: %s\n",
- strerror(errno));
- }
- fclose(network_fp);
- }
- free(smr.ser);
- }
-
- free(msg->cm_fields[eRecipient]);
- free(msg->cm_fields[eDestination]);
- msg->cm_fields[eRecipient] = hold_R;
- msg->cm_fields[eDestination] = hold_D;
- }
-
/* Go back to the room we started from */
MSG_syslog(LOG_DEBUG, "Returning to original room %s\n", hold_rm);
if (strcasecmp(hold_rm, CCC->room.QRname))
- CtdlUserGoto(hold_rm, 0, 1, NULL, NULL);
-
- /* For internet mail, generate delivery instructions.
- * Yes, this is recursive. Deal with it. Infinite recursion does
- * not happen because the delivery instructions message does not
- * contain a recipient.
- */
- if ((recps != NULL) && (recps->num_internet > 0)) {
- StrBuf *SpoolMsg = NewStrBuf();
- long nTokens;
-
- MSGM_syslog(LOG_DEBUG, "Generating delivery instructions\n");
-
- StrBufPrintf(SpoolMsg,
- "Content-type: "SPOOLMIME"\n"
- "\n"
- "msgid|%ld\n"
- "submitted|%ld\n"
- "bounceto|%s\n",
- newmsgid,
- (long)time(NULL),
- bounce_to);
-
- if (recps->envelope_from != NULL) {
- StrBufAppendBufPlain(SpoolMsg, HKEY("envelope_from|"), 0);
- StrBufAppendBufPlain(SpoolMsg, recps->envelope_from, -1, 0);
- StrBufAppendBufPlain(SpoolMsg, HKEY("\n"), 0);
- }
- if (recps->sending_room != NULL) {
- StrBufAppendBufPlain(SpoolMsg, HKEY("source_room|"), 0);
- StrBufAppendBufPlain(SpoolMsg, recps->sending_room, -1, 0);
- StrBufAppendBufPlain(SpoolMsg, HKEY("\n"), 0);
- }
-
- nTokens = num_tokens(recps->recp_internet, '|');
- for (i = 0; i < nTokens; i++) {
- long len;
- len = extract_token(recipient, recps->recp_internet, i, '|', sizeof recipient);
- if (len > 0) {
- StrBufAppendBufPlain(SpoolMsg, HKEY("remote|"), 0);
- StrBufAppendBufPlain(SpoolMsg, recipient, len, 0);
- StrBufAppendBufPlain(SpoolMsg, HKEY("|0||\n"), 0);
- }
- }
-
- imsg = malloc(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[eMsgSubject] = strdup("QMSG");
- imsg->cm_fields[eAuthor] = strdup("Citadel");
- imsg->cm_fields[eJournal] = strdup("do not journal");
- imsg->cm_fields[eMesageText] = SmashStrBuf(&SpoolMsg); /* imsg owns this memory now */
- CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
- CM_Free(imsg);
- }
+ CtdlUserGoto(hold_rm, 0, 1, NULL, NULL, NULL, NULL);
/*
* Any addresses to harvest for someone's address book?
}
else {
if (recps == NULL) {
- qualified_for_journaling = config.c_journal_pubmsgs;
+ qualified_for_journaling = CtdlGetConfigInt("c_journal_pubmsgs");
}
else if (recps->num_local + recps->num_ignet + recps->num_internet > 0) {
- qualified_for_journaling = config.c_journal_email;
+ qualified_for_journaling = CtdlGetConfigInt("c_journal_email");
}
else {
- qualified_for_journaling = config.c_journal_pubmsgs;
+ qualified_for_journaling = CtdlGetConfigInt("c_journal_pubmsgs");
}
}
}
}
+ if ((recps != NULL) && (recps->bounce_to == bounce_to))
+ recps->bounce_to = NULL;
+
/* Done. */
return(newmsgid);
}
const char *subject)
{
struct CtdlMessage *msg;
- struct recptypes *recp = NULL;
+ recptypes *recp = NULL;
msg = malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_format_type = format_type;
if (from != NULL) {
- msg->cm_fields[eAuthor] = strdup(from);
+ CM_SetField(msg, eAuthor, from, strlen(from));
}
else if (fromaddr != NULL) {
- msg->cm_fields[eAuthor] = strdup(fromaddr);
- if (strchr(msg->cm_fields[eAuthor], '@')) {
- *strchr(msg->cm_fields[eAuthor], '@') = 0;
+ char *pAt;
+ CM_SetField(msg, eAuthor, fromaddr, strlen(fromaddr));
+ pAt = strchr(msg->cm_fields[eAuthor], '@');
+ if (pAt != NULL) {
+ CM_CutFieldAt(msg, eAuthor, pAt - msg->cm_fields[eAuthor]);
}
}
else {
msg->cm_fields[eAuthor] = strdup("Citadel");
}
- if (fromaddr != NULL) msg->cm_fields[erFc822Addr] = strdup(fromaddr);
- if (room != NULL) msg->cm_fields[eOriginalRoom] = strdup(room);
- msg->cm_fields[eNodeName] = strdup(NODENAME);
+ if (fromaddr != NULL) CM_SetField(msg, erFc822Addr, fromaddr, strlen(fromaddr));
+ if (room != NULL) CM_SetField(msg, eOriginalRoom, room, strlen(room));
+ CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
if (to != NULL) {
- msg->cm_fields[eRecipient] = strdup(to);
+ CM_SetField(msg, eRecipient, to, strlen(to));
recp = validate_recipients(to, NULL, 0);
}
if (subject != NULL) {
- msg->cm_fields[eMsgSubject] = strdup(subject);
+ CM_SetField(msg, eMsgSubject, subject, strlen(subject));
}
- msg->cm_fields[eMesageText] = strdup(text);
+ CM_SetField(msg, eMesageText, text, strlen(text));
CtdlSubmitMsg(msg, recp, room, 0);
CM_Free(msg);
const char *subject,
int nCriterions,
const char **CritStr,
- long *CritStrLen,
+ const long *CritStrLen,
long ccid,
long ioid,
time_t NOW)
StrBuf *guid;
char timestamp[64];
long tslen;
- time_t tsday = NOW / (8*60*60); /* just care for a day... */
+ static const time_t tsday = (8*60*60); /* just care for a day... */
+ time_t seenstamp;
tslen = snprintf(timestamp, sizeof(timestamp), "%ld", tsday);
MD5Init(&md5context);
if (StrLength(guid) > 40)
StrBufCutAt(guid, 40, NULL);
- if (CheckIfAlreadySeen("FPAideMessage",
- guid,
- NOW,
- tsday,
- eUpdate,
- ccid,
- ioid)!= 0)
+ seenstamp = CheckIfAlreadySeen("FPAideMessage",
+ guid,
+ NOW,
+ tsday,
+ eUpdate,
+ ccid,
+ ioid);
+ if ((seenstamp > 0) && (seenstamp < tsday))
{
FreeStrBuf(&guid);
/* yes, we did. flood protection kicks in. */
syslog(LOG_DEBUG,
- "not sending message again\n");
+ "not sending message again - %ld < %ld \n", seenstamp, tsday);
return;
}
- FreeStrBuf(&guid);
- /* no, this message isn't sent recently; go ahead. */
- quickie_message(from,
- fromaddr,
- to,
- room,
- text,
- format_type,
- subject);
+ else
+ {
+ syslog(LOG_DEBUG,
+ "sending message. %ld >= %ld", seenstamp, tsday);
+ FreeStrBuf(&guid);
+ /* no, this message isn't sent recently; go ahead. */
+ quickie_message(from,
+ fromaddr,
+ to,
+ room,
+ text,
+ format_type,
+ subject);
+ }
}
IO->SendBuf.fd);
fd = fopen(fn, "a+");
+ if (fd == NULL) {
+ syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno));
+ cit_backtrace();
+ exit(1);
+ }
#endif
ReadMsg = IO->ReadMsg;
if (MsgFinished)
return eReadSuccess;
else
- return eAbort;
+ return eReadFail;
}
return SmashStrBuf(&Message);
}
+struct CtdlMessage *CtdlMakeMessage(
+ struct ctdluser *author, /* author's user structure */
+ char *recipient, /* NULL if it's not mail */
+ char *recp_cc, /* NULL if it's not mail */
+ char *room, /* room where it's going */
+ int type, /* see MES_ types in header file */
+ int format_type, /* variformat, plain text, MIME... */
+ char *fake_name, /* who we're masquerading as */
+ char *my_email, /* which of my email addresses to use (empty is ok) */
+ char *subject, /* Subject (optional) */
+ char *supplied_euid, /* ...or NULL if this is irrelevant */
+ char *preformatted_text, /* ...or NULL to read text from client */
+ char *references /* Thread references */
+)
+{
+ return CtdlMakeMessageLen(
+ author, /* author's user structure */
+ recipient, /* NULL if it's not mail */
+ (recipient)?strlen(recipient) : 0,
+ recp_cc, /* NULL if it's not mail */
+ (recp_cc)?strlen(recp_cc): 0,
+ room, /* room where it's going */
+ (room)?strlen(room): 0,
+ type, /* see MES_ types in header file */
+ format_type, /* variformat, plain text, MIME... */
+ fake_name, /* who we're masquerading as */
+ (fake_name)?strlen(fake_name): 0,
+ my_email, /* which of my email addresses to use (empty is ok) */
+ (my_email)?strlen(my_email): 0,
+ subject, /* Subject (optional) */
+ (subject)?strlen(subject): 0,
+ supplied_euid, /* ...or NULL if this is irrelevant */
+ (supplied_euid)?strlen(supplied_euid):0,
+ preformatted_text, /* ...or NULL to read text from client */
+ (preformatted_text)?strlen(preformatted_text) : 0,
+ references, /* Thread references */
+ (references)?strlen(references):0);
+
+}
/*
* Build a binary message to be saved on disk.
* the rest of the fields when CM_Free() is called.)
*/
-struct CtdlMessage *CtdlMakeMessage(
+struct CtdlMessage *CtdlMakeMessageLen(
struct ctdluser *author, /* author's user structure */
char *recipient, /* NULL if it's not mail */
+ long rcplen,
char *recp_cc, /* NULL if it's not mail */
+ long cclen,
char *room, /* room where it's going */
+ long roomlen,
int type, /* see MES_ types in header file */
int format_type, /* variformat, plain text, MIME... */
char *fake_name, /* who we're masquerading as */
+ long fnlen,
char *my_email, /* which of my email addresses to use (empty is ok) */
+ long myelen,
char *subject, /* Subject (optional) */
+ long subjlen,
char *supplied_euid, /* ...or NULL if this is irrelevant */
+ long euidlen,
char *preformatted_text, /* ...or NULL to read text from client */
- char *references /* Thread references */
- ) {
- char dest_node[256];
+ long textlen,
+ char *references, /* Thread references */
+ long reflen
+ )
+{
+ struct CitContext *CCC = CC;
+ /* Don't confuse the poor folks if it's not routed mail. * /
+ char dest_node[256] = "";*/
+ long blen;
char buf[1024];
struct CtdlMessage *msg;
StrBuf *FakeAuthor;
msg->cm_anon_type = type;
msg->cm_format_type = format_type;
- /* Don't confuse the poor folks if it's not routed mail. */
- strcpy(dest_node, "");
-
- if (recipient != NULL) striplt(recipient);
- if (recp_cc != NULL) striplt(recp_cc);
+ if (recipient != NULL) rcplen = striplt(recipient);
+ if (recp_cc != NULL) cclen = striplt(recp_cc);
/* Path or Return-Path */
- if (my_email == NULL) my_email = "";
-
- if (!IsEmptyStr(my_email)) {
- msg->cm_fields[eMessagePath] = strdup(my_email);
+ if (myelen > 0) {
+ CM_SetField(msg, eMessagePath, my_email, myelen);
}
else {
- snprintf(buf, sizeof buf, "%s", author->fullname);
- msg->cm_fields[eMessagePath] = strdup(buf);
+ CM_SetField(msg, eMessagePath, author->fullname, strlen(author->fullname));
}
convert_spaces_to_underscores(msg->cm_fields[eMessagePath]);
- snprintf(buf, sizeof buf, "%ld", (long)time(NULL)); /* timestamp */
- msg->cm_fields[eTimestamp] = strdup(buf);
+ blen = snprintf(buf, sizeof buf, "%ld", (long)time(NULL));
+ CM_SetField(msg, eTimestamp, buf, blen);
- if ((fake_name != NULL) && (fake_name[0])) { /* author */
- FakeAuthor = NewStrBufPlain (fake_name, -1);
+ if (fnlen > 0) {
+ FakeAuthor = NewStrBufPlain (fake_name, fnlen);
}
else {
FakeAuthor = NewStrBufPlain (author->fullname, -1);
}
StrBufRFC2047encode(&FakeEncAuthor, FakeAuthor);
- msg->cm_fields[eAuthor] = SmashStrBuf(&FakeEncAuthor);
+ CM_SetAsFieldSB(msg, eAuthor, &FakeEncAuthor);
FreeStrBuf(&FakeAuthor);
- if (CC->room.QRflags & QR_MAILBOX) { /* room */
- msg->cm_fields[eOriginalRoom] = strdup(&CC->room.QRname[11]);
+ if (CCC->room.QRflags & QR_MAILBOX) { /* room */
+ CM_SetField(msg, eOriginalRoom, &CCC->room.QRname[11], strlen(&CCC->room.QRname[11]));
}
else {
- msg->cm_fields[eOriginalRoom] = strdup(CC->room.QRname);
+ CM_SetField(msg, eOriginalRoom, CCC->room.QRname, strlen(CCC->room.QRname));
}
- msg->cm_fields[eNodeName] = strdup(NODENAME); /* nodename */
- msg->cm_fields[eHumanNode] = strdup(HUMANNODE); /* hnodename */
+ CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
+ CM_SetField(msg, eHumanNode, CtdlGetConfigStr("c_humannode"), strlen(CtdlGetConfigStr("c_humannode")));
- if ((recipient != NULL) && (recipient[0] != 0)) {
- msg->cm_fields[eRecipient] = strdup(recipient);
- }
- if ((recp_cc != NULL) && (recp_cc[0] != 0)) {
- msg->cm_fields[eCarbonCopY] = strdup(recp_cc);
+ if (rcplen > 0) {
+ CM_SetField(msg, eRecipient, recipient, rcplen);
}
- if (dest_node[0] != 0) {
- msg->cm_fields[eDestination] = strdup(dest_node);
+ if (cclen > 0) {
+ CM_SetField(msg, eCarbonCopY, recp_cc, cclen);
}
- if (!IsEmptyStr(my_email)) {
- msg->cm_fields[erFc822Addr] = strdup(my_email);
+ if (myelen > 0) {
+ CM_SetField(msg, erFc822Addr, my_email, myelen);
}
- else if ( (author == &CC->user) && (!IsEmptyStr(CC->cs_inet_email)) ) {
- msg->cm_fields[erFc822Addr] = strdup(CC->cs_inet_email);
+ else if ( (author == &CCC->user) && (!IsEmptyStr(CCC->cs_inet_email)) ) {
+ CM_SetField(msg, erFc822Addr, CCC->cs_inet_email, strlen(CCC->cs_inet_email));
}
if (subject != NULL) {
long length;
- striplt(subject);
- length = strlen(subject);
+ length = striplt(subject);
if (length > 0) {
long i;
long IsAscii;
(IsAscii = isascii(subject[i]) != 0 ))
i++;
if (IsAscii != 0)
- msg->cm_fields[eMsgSubject] = strdup(subject);
+ CM_SetField(msg, eMsgSubject, subject, subjlen);
else /* ok, we've got utf8 in the string. */
{
- msg->cm_fields[eMsgSubject] = rfc2047encode(subject, length);
+ char *rfc2047Subj;
+ rfc2047Subj = rfc2047encode(subject, length);
+ CM_SetAsField(msg, eMsgSubject, &rfc2047Subj, strlen(rfc2047Subj));
}
}
}
- if (supplied_euid != NULL) {
- msg->cm_fields[eExclusiveID] = strdup(supplied_euid);
+ if (euidlen > 0) {
+ CM_SetField(msg, eExclusiveID, supplied_euid, euidlen);
}
- if ((references != NULL) && (!IsEmptyStr(references))) {
- if (msg->cm_fields[eWeferences] != NULL)
- free(msg->cm_fields[eWeferences]);
- msg->cm_fields[eWeferences] = strdup(references);
+ if (reflen > 0) {
+ CM_SetField(msg, eWeferences, references, reflen);
}
if (preformatted_text != NULL) {
- msg->cm_fields[eMesageText] = preformatted_text;
+ CM_SetField(msg, eMesageText, preformatted_text, textlen);
}
else {
- msg->cm_fields[eMesageText] = CtdlReadMessageBody(HKEY("000"), config.c_maxmsglen, NULL, 0, 0);
+ StrBuf *MsgBody;
+ MsgBody = CtdlReadMessageBodyBuf(HKEY("000"), CtdlGetConfigLong("c_maxmsglen"), NULL, 0, 0);
+ if (MsgBody != NULL) {
+ CM_SetAsFieldSB(msg, eMesageText, &MsgBody);
+ }
}
return(msg);
* API function to delete messages which match a set of criteria
* (returns the actual number of messages deleted)
*/
-int CtdlDeleteMessages(char *room_name, /* which room */
+int CtdlDeleteMessages(const char *room_name, /* which room */
long *dmsgnums, /* array of msg numbers to be deleted */
int num_dmsgnums, /* number of msgs to be deleted, or 0 for "any" */
char *content_type /* or "" for any. regular expressions expected. */
struct ctdlroom qrbuf;
char roomname[ROOMNAMELEN];
struct CtdlMessage *msg;
- char *encoded_message = NULL;
+ StrBuf *encoded_message = NULL;
if (is_mailbox != NULL) {
CtdlMailboxName(roomname, sizeof roomname, is_mailbox, req_room);
MSG_syslog(LOG_DEBUG, "Raw length is %ld\n", (long)raw_length);
if (is_binary) {
- encoded_message = malloc((size_t) (((raw_length * 134) / 100) + 4096 ) );
+ encoded_message = NewStrBufPlain(NULL, (size_t) (((raw_length * 134) / 100) + 4096 ) );
}
else {
- encoded_message = malloc((size_t)(raw_length + 4096));
+ encoded_message = NewStrBufPlain(NULL, (size_t)(raw_length + 4096));
}
- sprintf(encoded_message, "Content-type: %s\n", content_type);
+ StrBufAppendBufPlain(encoded_message, HKEY("Content-type: "), 0);
+ StrBufAppendBufPlain(encoded_message, content_type, -1, 0);
+ StrBufAppendBufPlain(encoded_message, HKEY("\n"), 0);
if (is_binary) {
- sprintf(&encoded_message[strlen(encoded_message)],
- "Content-transfer-encoding: base64\n\n"
- );
+ StrBufAppendBufPlain(encoded_message, HKEY("Content-transfer-encoding: base64\n\n"), 0);
}
else {
- sprintf(&encoded_message[strlen(encoded_message)],
- "Content-transfer-encoding: 7bit\n\n"
- );
+ StrBufAppendBufPlain(encoded_message, HKEY("Content-transfer-encoding: 7bit\n\n"), 0);
}
if (is_binary) {
- CtdlEncodeBase64(
- &encoded_message[strlen(encoded_message)],
- raw_message,
- (int)raw_length,
- 0
- );
+ StrBufBase64Append(encoded_message, NULL, raw_message, raw_length, 0);
}
else {
- memcpy(
- &encoded_message[strlen(encoded_message)],
- raw_message,
- (int)(raw_length+1)
- );
+ StrBufAppendBufPlain(encoded_message, raw_message, raw_length, 0);
}
MSGM_syslog(LOG_DEBUG, "Allocating\n");
msg->cm_magic = CTDLMESSAGE_MAGIC;
msg->cm_anon_type = MES_NORMAL;
msg->cm_format_type = 4;
- msg->cm_fields[eAuthor] = strdup(CCC->user.fullname);
- msg->cm_fields[eOriginalRoom] = strdup(req_room);
- msg->cm_fields[eNodeName] = strdup(config.c_nodename);
- msg->cm_fields[eHumanNode] = strdup(config.c_humannode);
+ CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
+ CM_SetField(msg, eOriginalRoom, req_room, strlen(req_room));
+ CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
+ CM_SetField(msg, eHumanNode, CtdlGetConfigStr("c_humannode"), strlen(CtdlGetConfigStr("c_humannode")));
msg->cm_flags = flags;
- msg->cm_fields[eMesageText] = encoded_message;
+ CM_SetAsFieldSB(msg, eMesageText, &encoded_message);
/* Create the requested room if we have to. */
if (CtdlGetRoom(&qrbuf, roomname) != 0) {
projects / citadel.git / blobdiff