/*
* Implements the message store.
*
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2018 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.
*/
+#include <stdlib.h>
+#include <unistd.h>
#include <stdio.h>
#include <regex.h>
+#include <sys/stat.h>
#include <libcitadel.h>
-
#include "md5.h"
-
#include "ctdl_module.h"
#include "citserver.h"
#include "control.h"
#include "genstamp.h"
#include "room_ops.h"
#include "user_ops.h"
-
#include "internet_addressing.h"
#include "euidindex.h"
#include "msgbase.h"
if (msg == NULL)
return 0;
if ((msg->cm_magic) != CTDLMESSAGE_MAGIC) {
- syslog(LOG_WARNING, "CM_IsValidMsg() -- self-check failed\n");
+ syslog(LOG_WARNING, "msgbase: CM_IsValidMsg() self-check failed");
return 0;
}
return 1;
which_user = &CC->user;
}
- syslog(LOG_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %s, %d) in <%s>\n",
+ syslog(LOG_DEBUG, "msgbase: CtdlSetSeen(%d msgs starting with %ld, %s, %d) in <%s>",
num_target_msgnums, target_msgnums[0],
(target_setting ? "SET" : "CLEAR"),
which_set,
}
#endif
- syslog(LOG_DEBUG, "before update: %s\n", ChrPtr(vset));
-
/* Translate the existing sequence set into an array of booleans */
setstr = NewStrBuf();
lostr = NewStrBuf();
vset = new_set;
}
- syslog(LOG_DEBUG, " after update: %s\n", ChrPtr(vset));
-
/* Decide which message set we're manipulating */
switch (which_set) {
case ctdlsetseen_seen:
if (ch == '\n') {
if (client_write(outbuf, len) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
len = 0;
if (client_write(nl, nllen) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
column = 0;
if (column > 72) { /* Beyond 72 columns, break on the next space */
if (client_write(outbuf, len) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
len = 0;
if (client_write(nl, nllen) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
column = 0;
if (column > 1000) { /* Beyond 1000 columns, break anywhere */
if (client_write(outbuf, len) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
len = 0;
if (client_write(nl, nllen) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ syslog(LOG_ERR, "msgbase: memfmout(): aborting due to write failure");
return;
}
column = 0;
if (len) {
if (client_write(outbuf, len) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
client_write(nl, nllen);
) {
CC->download_fp = tmpfile();
if (CC->download_fp == NULL) {
- syslog(LOG_EMERG, "mime_download(): Couldn't write: %s\n",
- strerror(errno));
- cprintf("%d cannot open temporary file: %s\n",
- ERROR + INTERNAL_ERROR, strerror(errno));
+ syslog(LOG_EMERG, "msgbase: mime_download() couldn't write: %m");
+ cprintf("%d cannot open temporary file: %s\n", ERROR + INTERNAL_ERROR, strerror(errno));
return;
}
rv = fwrite(content, length, 1, CC->download_fp);
if (rv <= 0) {
- syslog(LOG_EMERG, "mime_download(): Couldn't write: %s\n",
- strerror(errno));
- cprintf("%d unable to write tempfile.\n",
- ERROR + TOO_BIG);
+ syslog(LOG_EMERG, "msgbase: mime_download() Couldn't write: %m");
+ cprintf("%d unable to write tempfile.\n", ERROR + TOO_BIG);
fclose(CC->download_fp);
CC->download_fp = NULL;
return;
*/
ch = *mptr++;
if (ch != 255) {
- syslog(LOG_ERR, "Message %ld appears to be corrupted.\n", msgnum);
+ syslog(LOG_ERR, "msgbase: message %ld appears to be corrupted", msgnum);
return NULL;
}
ret = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
struct cdbdata *dmsgtext;
struct CtdlMessage *ret = NULL;
- syslog(LOG_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body);
+ syslog(LOG_DEBUG, "msgbase: CtdlFetchMessage(%ld, %d)", msgnum, with_body);
dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
if (dmsgtext == NULL) {
- syslog(LOG_ERR, "CtdlFetchMessage(%ld, %d) Failed!\n", msgnum, with_body);
+ syslog(LOG_ERR, "msgbase: CtdlFetchMessage(%ld, %d) Failed!", msgnum, with_body);
return NULL;
}
if (dmsgtext->ptr[dmsgtext->len - 1] != '\0')
{
- syslog(LOG_ERR, "CtdlFetchMessage(%ld, %d) Forcefully terminating message!!\n", msgnum, with_body);
+ syslog(LOG_ERR, "msgbase: CtdlFetchMessage(%ld, %d) Forcefully terminating message!!", msgnum, with_body);
dmsgtext->ptr[dmsgtext->len - 1] = '\0';
}
struct ma_info *ma;
ma = (struct ma_info *)cbuserdata;
- syslog(LOG_DEBUG, "fixed_output_pre() type=<%s>\n", cbtype);
+ syslog(LOG_DEBUG, "msgbase: fixed_output_pre() type=<%s>", cbtype);
if (!strcasecmp(cbtype, "multipart/alternative")) {
++ma->is_ma;
ma->did_print = 0;
struct ma_info *ma;
ma = (struct ma_info *)cbuserdata;
- syslog(LOG_DEBUG, "fixed_output_post() type=<%s>\n", cbtype);
+ syslog(LOG_DEBUG, "msgbase: fixed_output_post() type=<%s>", cbtype);
if (!strcasecmp(cbtype, "multipart/alternative")) {
--ma->is_ma;
ma->did_print = 0;
ma = (struct ma_info *)cbuserdata;
syslog(LOG_DEBUG,
- "fixed_output() part %s: %s (%s) (%ld bytes)\n",
- partnum, filename, cbtype, (long)length);
+ "msgbase: fixed_output() part %s: %s (%s) (%ld bytes)",
+ partnum, filename, cbtype, (long)length
+ );
/*
* If we're in the middle of a multipart/alternative scope and
* we've already printed another section, skip this one.
*/
if ( (ma->is_ma) && (ma->did_print) ) {
- syslog(LOG_DEBUG, "Skipping part %s (%s)\n", partnum, cbtype);
+ syslog(LOG_DEBUG, "msgbase: skipping part %s (%s)", partnum, cbtype);
return;
}
ma->did_print = 1;
extract_token(buf, CC->preferred_formats, i, '|', sizeof buf);
if ( (!strcasecmp(buf, cbtype)) && (!ma->freeze) ) {
if (i < ma->chosen_pref) {
- syslog(LOG_DEBUG, "Setting chosen part: <%s>\n", partnum);
+ syslog(LOG_DEBUG, "msgbase: setting chosen part to <%s>", partnum);
safestrncpy(ma->chosen_part, partnum, sizeof ma->chosen_part);
ma->chosen_pref = i;
}
cprintf("\n");
if (client_write(text_content, length) == -1)
{
- syslog(LOG_ERR, "output_preferred(): aborting due to write failure.\n");
+ syslog(LOG_ERR, "msgbase: output_preferred() aborting due to write failure");
return;
}
if (add_newline) cprintf("\n");
struct encapmsg encap;
int r;
- syslog(LOG_DEBUG, "CtdlOutputMsg(msgnum=%ld, mode=%d, section=%s)\n",
+ syslog(LOG_DEBUG, "msgbase: CtdlOutputMsg(msgnum=%ld, mode=%d, section=%s)",
msg_num, mode,
(section ? section : "<>")
);
r = check_cached_msglist(msg_num);
}
if (r != om_ok) {
- syslog(LOG_DEBUG, "Security check fail: message %ld is not in %s\n",
+ syslog(LOG_DEBUG, "msgbase: security check fail; message %ld is not in %s",
msg_num, CC->room.QRname
);
if (do_proto) {
if (outlen > 1000) {
if (client_write(outbuf, outlen) == -1)
{
- syslog(LOG_ERR, "Dump_RFC822HeadersBody(): aborting due to write failure.\n");
+ syslog(LOG_ERR, "msgbase: Dump_RFC822HeadersBody() aborting due to write failure");
return;
}
lfSent = (outbuf[outlen - 1] == '\n');
if (client_write(buf, buflen) == -1)
{
- syslog(LOG_ERR, "DumpFormatFixed(): aborting due to write failure.\n");
+ syslog(LOG_ERR, "msgbase: DumpFormatFixed() aborting due to write failure");
return;
}
*buf = '\0';
char snode[100];
char mid[100];
- syslog(LOG_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d\n",
+ syslog(LOG_DEBUG, "msgbase: CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d",
((TheMessage == NULL) ? "NULL" : "not null"),
- mode, headers_only, do_proto, crlf);
+ mode, headers_only, do_proto, crlf
+ );
strcpy(mid, "unknown");
nl = (crlf ? "\r\n" : "\n");
nlen = crlf ? 2 : 1;
if (!CM_IsValidMsg(TheMessage)) {
- syslog(LOG_ERR,
- "ERROR: invalid preloaded message for output\n");
- cit_backtrace ();
+ syslog(LOG_ERR, "msgbase: error; invalid preloaded message for output");
return(om_no_such_msg);
}
int num_msgs_to_be_merged = 0;
syslog(LOG_DEBUG,
- "CtdlSaveMsgPointersInRoom(room=%s, num_msgs=%d, repl=%d, suppress_rca=%d)\n",
- roomname, num_newmsgs, do_repl_check, suppress_refcount_adj
+ "msgbase: CtdlSaveMsgPointersInRoom(room=%s, num_msgs=%d, repl=%d, suppress_rca=%d)",
+ roomname, num_newmsgs, do_repl_check, suppress_refcount_adj
);
strcpy(hold_rm, CC->room.QRname);
if (CtdlGetRoomLock(&CC->room,
((roomname != NULL) ? roomname : CC->room.QRname) )
!= 0) {
- syslog(LOG_ERR, "No such room <%s>\n", roomname);
+ syslog(LOG_ERR, "msgbase: no such room <%s>", roomname);
return(ERROR + ROOM_NOT_FOUND);
}
}
}
- syslog(LOG_DEBUG, "%d unique messages to be merged\n", num_msgs_to_be_merged);
+ syslog(LOG_DEBUG, "msgbase: %d unique messages to be merged", num_msgs_to_be_merged);
/*
* Now merge the new messages
*/
msglist = realloc(msglist, (sizeof(long) * (num_msgs + num_msgs_to_be_merged)) );
if (msglist == NULL) {
- syslog(LOG_ALERT, "ERROR: can't realloc message list!\n");
+ syslog(LOG_ALERT, "msgbase: ERROR; can't realloc message list!");
free(msgs_to_be_merged);
return (ERROR + INTERNAL_ERROR);
}
/* Perform replication checks if necessary */
if ( (DoesThisRoomNeedEuidIndexing(&CC->room)) && (do_repl_check) ) {
- syslog(LOG_DEBUG, "CtdlSaveMsgPointerInRoom() doing repl checks\n");
+ syslog(LOG_DEBUG, "msgbase: CtdlSaveMsgPointerInRoom() doing repl checks");
for (i=0; i<num_msgs_to_be_merged; ++i) {
msgid = msgs_to_be_merged[i];
}
else {
- syslog(LOG_DEBUG, "CtdlSaveMsgPointerInRoom() skips repl checks\n");
+ syslog(LOG_DEBUG, "msgbase: CtdlSaveMsgPointerInRoom() skips repl checks");
}
/* Submit this room for processing by hooks */
ERROR + INTERNAL_ERROR);
}
else {
- syslog(LOG_ERR, "CtdlSaveMessage() unable to serialize message");
+ syslog(LOG_ERR, "msgbase: CtdlSaveMessage() unable to serialize message");
}
return (-1L);
retval = cdb_store(CDB_MSGMAIN, &msgid, (int)sizeof(long),
smr.ser, smr.len);
if (retval < 0) {
- syslog(LOG_ERR, "Can't store message %ld: %ld", msgid, retval);
+ syslog(LOG_ERR, "msgbase: can't store message %ld: %ld", msgid, retval);
}
else {
if (is_bigmsg) {
(holdMLen + 1)
);
if (retval < 0) {
- syslog(LOG_ERR, "failed to store message body for msgid %ld: %ld",
- msgid, retval);
+ syslog(LOG_ERR, "msgbase: failed to store message body for msgid %ld: %ld", msgid, retval);
}
}
}
* Check for valid message format
*/
if (CM_IsValidMsg(msg) == 0) {
- syslog(LOG_ERR, "CtdlSerializeMessage() aborting due to invalid message\n");
+ syslog(LOG_ERR, "msgbase: CtdlSerializeMessage() aborting due to invalid message");
ret->len = 0;
ret->ser = NULL;
return;
ret->ser = malloc(ret->len);
if (ret->ser == NULL) {
- syslog(LOG_ERR, "CtdlSerializeMessage() malloc(%ld) failed: %s\n",
- (long)ret->len, strerror(errno));
+ syslog(LOG_ERR, "msgbase: CtdlSerializeMessage() malloc(%ld) failed: %m", (long)ret->len);
ret->len = 0;
ret->ser = NULL;
return;
}
if (ret->len != wlen) {
- syslog(LOG_ERR, "ERROR: len=%ld wlen=%ld\n",
- (long)ret->len, (long)wlen);
+ syslog(LOG_ERR, "msgbase: ERROR; len=%ld wlen=%ld", (long)ret->len, (long)wlen);
}
return;
if (DoesThisRoomNeedEuidIndexing(&CC->room) == 0) return;
- syslog(LOG_DEBUG, "Performing replication checks in <%s>\n",
- CC->room.QRname);
+ syslog(LOG_DEBUG, "msgbase: performing replication checks in <%s>", CC->room.QRname);
/* No exclusive id? Don't do anything. */
if (msg == NULL) return;
if (CM_IsEmpty(msg, eExclusiveID)) return;
- /*syslog(LOG_DEBUG, "Exclusive ID: <%s> for room <%s>\n",
+ /*syslog(LOG_DEBUG, "msgbase: exclusive ID: <%s> for room <%s>",
msg->cm_fields[eExclusiveID], CC->room.QRname);*/
old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields[eExclusiveID], &CC->room);
if (old_msgnum > 0L) {
- syslog(LOG_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum);
+ syslog(LOG_DEBUG, "msgbase: ReplicationChecks() replacing message %ld", old_msgnum);
CtdlDeleteMessages(CC->room.QRname, &old_msgnum, 1, "");
}
}
StrBuf *saved_rfc822_version = NULL;
int qualified_for_journaling = 0;
- syslog(LOG_DEBUG, "CtdlSubmitMsg() called\n");
+ syslog(LOG_DEBUG, "msgbase: CtdlSubmitMsg() called");
if (CM_IsValidMsg(msg) == 0) return(-1); /* self check */
/* If this message has no timestamp, we take the liberty of
/* Learn about what's inside, because it's what's inside that counts */
if (CM_IsEmpty(msg, eMesageText)) {
- syslog(LOG_ERR, "ERROR: attempt to save message with NULL body\n");
+ syslog(LOG_ERR, "msgbase: ERROR; attempt to save message with NULL body");
return(-2);
}
/* Goto the correct room */
room = (recps) ? CC->room.QRname : SENTITEMS;
- syslog(LOG_DEBUG, "Selected room %s\n", room);
+ syslog(LOG_DEBUG, "msgbase: selected room %s", room);
strcpy(hold_rm, CC->room.QRname);
strcpy(actual_rm, CC->room.QRname);
if (recps != NULL) {
if (CC->user.axlevel == AxProbU) {
strcpy(hold_rm, actual_rm);
strcpy(actual_rm, CtdlGetConfigStr("c_twitroom"));
- syslog(LOG_DEBUG, "Diverting to twit room\n");
+ syslog(LOG_DEBUG, "msgbase: diverting to twit room");
}
}
strcpy(actual_rm, force_room);
}
- syslog(LOG_DEBUG, "Final selection: %s (%s)\n", actual_rm, room);
+ syslog(LOG_DEBUG, "msgbase: final selection: %s (%s)", actual_rm, room);
if (strcasecmp(actual_rm, CC->room.QRname)) {
/* CtdlGetRoom(&CC->room, actual_rm); */
CtdlUserGoto(actual_rm, 0, 1, NULL, NULL, NULL, NULL);
}
/* Perform "before save" hooks (aborting if any return nonzero) */
- syslog(LOG_DEBUG, "Performing before-save hooks\n");
+ syslog(LOG_DEBUG, "msgbase: performing before-save hooks");
if (PerformMessageHooks(msg, recps, EVT_BEFORESAVE) > 0) return(-3);
/*
}
/* Save it to disk */
- syslog(LOG_DEBUG, "Saving to disk\n");
+ syslog(LOG_DEBUG, "msgbase: saving to disk");
newmsgid = send_message(msg);
if (newmsgid <= 0L) return(-5);
* be a critical section because nobody else knows about this message
* yet.
*/
- syslog(LOG_DEBUG, "Creating MetaData record\n");
+ syslog(LOG_DEBUG, "msgbase: creating metadata record");
memset(&smi, 0, sizeof(struct MetaData));
smi.meta_msgnum = newmsgid;
smi.meta_refcount = 0;
* message to attach to the journalized copy.
*/
if (CC->redirect_buffer != NULL) {
- syslog(LOG_ALERT, "CC->redirect_buffer is not NULL during message submission!\n");
+ syslog(LOG_ALERT, "msgbase: CC->redirect_buffer is not NULL during message submission!");
abort();
}
CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
PutMetaData(&smi);
/* Now figure out where to store the pointers */
- syslog(LOG_DEBUG, "Storing pointers\n");
+ syslog(LOG_DEBUG, "msgbase: storing pointers");
/* If this is being done by the networker delivering a private
* message, we want to BYPASS saving the sender's copy (because there
*/
if ((!CC->internal_pgm) || (recps == NULL)) {
if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 1, msg) != 0) {
- syslog(LOG_ERR, "ERROR saving message pointer!\n");
+ syslog(LOG_ERR, "msgbase: ERROR saving message pointer!");
CtdlSaveMsgPointerInRoom(CtdlGetConfigStr("c_aideroom"), newmsgid, 0, msg);
}
}
for (i=0; i<num_tokens(recps->recp_room, '|'); ++i) {
extract_token(recipient, recps->recp_room, i,
'|', sizeof recipient);
- syslog(LOG_DEBUG, "Delivering to room <%s>\n", recipient);///// xxxx
+ syslog(LOG_DEBUG, "msgbase: delivering to room <%s>", recipient);
CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0, msg);
}
/* Bump this user's messages posted counter. */
- syslog(LOG_DEBUG, "Updating user\n");
+ syslog(LOG_DEBUG, "msgbase: updating user");
CtdlLockGetCurrentUser();
CC->user.posted = CC->user.posted + 1;
CtdlPutCurrentUserLock();
/* Decide where bounces need to be delivered */
if ((recps != NULL) && (recps->bounce_to == NULL))
{
- if (CC->logged_in)
- snprintf(bounce_to, sizeof bounce_to, "%s@%s",
- CC->user.fullname, CtdlGetConfigStr("c_nodename"));
- else
- snprintf(bounce_to, sizeof bounce_to, "%s@%s",
- msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]);
+ if (CC->logged_in) {
+ snprintf(bounce_to, sizeof bounce_to, "%s@%s", CC->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;
}
for (i=0; i<ntokens; ++i)
{
extract_token(recipient, pch, i, '|', sizeof recipient);
- syslog(LOG_DEBUG, "Delivering private local mail to <%s>\n", recipient);
+ syslog(LOG_DEBUG, "msgbase: delivering private local mail to <%s>", recipient);
if (CtdlGetUser(&userbuf, recipient) == 0) {
CtdlMailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM);
CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg);
PerformMessageHooks(msg, recps, EVT_AFTERUSRMBOXSAVE);
}
else {
- syslog(LOG_DEBUG, "No user <%s>\n", recipient);
+ syslog(LOG_DEBUG, "msgbase: no user <%s>", recipient);
CtdlSaveMsgPointerInRoom(CtdlGetConfigStr("c_aideroom"), newmsgid, 0, msg);
}
}
}
/* Perform "after save" hooks */
- syslog(LOG_DEBUG, "Performing after-save hooks\n");
+ syslog(LOG_DEBUG, "msgbase: performing after-save hooks");
PerformMessageHooks(msg, recps, EVT_AFTERSAVE);
CM_FlushField(msg, eVltMsgNum);
/* Go back to the room we started from */
- syslog(LOG_DEBUG, "Returning to original room %s\n", hold_rm);
+ syslog(LOG_DEBUG, "msgbase: returning to original room %s", hold_rm);
if (strcasecmp(hold_rm, CC->room.QRname))
CtdlUserGoto(hold_rm, 0, 1, NULL, NULL, NULL, NULL);
size_t maxlen, /* maximum message length */
StrBuf *exist, /* if non-null, append to it;
exist is ALWAYS freed */
- int crlf, /* CRLF newlines instead of LF */
- int *sock /* socket handle or 0 for this session's client socket */
+ int crlf /* CRLF newlines instead of LF */
)
{
StrBuf *Message;
/* read in the lines of message text one by one */
do {
- if (sock != NULL) {
- if ((CtdlSockGetLine(sock, LineBuf, 5) < 0) ||
- (*sock == -1))
- finished = 1;
- }
- else {
- if (CtdlClientGetLine(LineBuf) < 0) finished = 1;
+ if (CtdlClientGetLine(LineBuf) < 0) {
+ finished = 1;
}
- if ((StrLength(LineBuf) == tlen) &&
- (!strcmp(ChrPtr(LineBuf), terminator)))
+ if ((StrLength(LineBuf) == tlen) && (!strcmp(ChrPtr(LineBuf), terminator))) {
finished = 1;
-
+ }
if ( (!flushing) && (!finished) ) {
if (crlf) {
StrBufAppendBufPlain(LineBuf, HKEY("\r\n"), 0);
return Message;
}
-void DeleteAsyncMsg(ReadAsyncMsg **Msg)
-{
- if (*Msg == NULL)
- return;
- FreeStrBuf(&(*Msg)->MsgBuf);
-
- free(*Msg);
- *Msg = NULL;
-}
-
-ReadAsyncMsg *NewAsyncMsg(const char *terminator, /* token signalling EOT */
- long tlen,
- size_t maxlen, /* maximum message length */
- size_t expectlen, /* if we expect a message, how long should it be? */
- StrBuf *exist, /* if non-null, append to it;
- exist is ALWAYS freed */
- long eLen, /* length of exist */
- int crlf /* CRLF newlines instead of LF */
- )
-{
- ReadAsyncMsg *NewMsg;
-
- NewMsg = (ReadAsyncMsg *)malloc(sizeof(ReadAsyncMsg));
- memset(NewMsg, 0, sizeof(ReadAsyncMsg));
-
- if (exist == NULL) {
- long len;
-
- if (expectlen == 0) {
- len = 4 * SIZ;
- }
- else {
- len = expectlen + 10;
- }
- NewMsg->MsgBuf = NewStrBufPlain(NULL, len);
- }
- else {
- NewMsg->MsgBuf = NewStrBufDup(exist);
- }
- /* Do we need to change leading ".." to "." for SMTP escaping? */
- if ((tlen == 1) && (*terminator == '.')) {
- NewMsg->dodot = 1;
- }
-
- NewMsg->terminator = terminator;
- NewMsg->tlen = tlen;
-
- NewMsg->maxlen = maxlen;
-
- NewMsg->crlf = crlf;
-
- return NewMsg;
-}
-
-/*
- * Back end function used by CtdlMakeMessage() and similar functions
- */
-eReadState CtdlReadMessageBodyAsync(AsyncIO *IO)
-{
- ReadAsyncMsg *ReadMsg;
- int MsgFinished = 0;
- eReadState Finished = eMustReadMore;
-
-#ifdef BIGBAD_IODBG
- char fn [SIZ];
- FILE *fd;
- const char *pch = ChrPtr(IO->SendBuf.Buf);
- const char *pchh = IO->SendBuf.ReadWritePointer;
- long nbytes;
-
- if (pchh == NULL)
- pchh = pch;
-
- nbytes = StrLength(IO->SendBuf.Buf) - (pchh - pch);
- snprintf(fn, SIZ, "/tmp/foolog_ev_%s.%d",
- ((CitContext*)(IO->CitContext))->ServiceName,
- 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;
-
- /* read in the lines of message text one by one */
- do {
- Finished = StrBufChunkSipLine(IO->IOBuf, &IO->RecvBuf);
-
- switch (Finished) {
- case eMustReadMore: /// read new from socket...
-#ifdef BIGBAD_IODBG
- if (IO->RecvBuf.ReadWritePointer != NULL) {
- nbytes = StrLength(IO->RecvBuf.Buf) - (IO->RecvBuf.ReadWritePointer - ChrPtr(IO->RecvBuf.Buf));
- fprintf(fd, "Read; Line unfinished: %ld Bytes still in buffer [", nbytes);
-
- fwrite(IO->RecvBuf.ReadWritePointer, nbytes, 1, fd);
-
- fprintf(fd, "]\n");
- } else {
- fprintf(fd, "BufferEmpty! \n");
- }
- fclose(fd);
-#endif
- return Finished;
- break;
- case eBufferNotEmpty: /* shouldn't happen... */
- case eReadSuccess: /// done for now...
- break;
- case eReadFail: /// WHUT?
- ///todo: shut down!
- break;
- }
-
-
- if ((StrLength(IO->IOBuf) == ReadMsg->tlen) &&
- (!strcmp(ChrPtr(IO->IOBuf), ReadMsg->terminator))) {
- MsgFinished = 1;
-#ifdef BIGBAD_IODBG
- fprintf(fd, "found Terminator; Message Size: %d\n", StrLength(ReadMsg->MsgBuf));
-#endif
- }
- else if (!ReadMsg->flushing) {
-
-#ifdef BIGBAD_IODBG
- fprintf(fd, "Read Line: [%d][%s]\n", StrLength(IO->IOBuf), ChrPtr(IO->IOBuf));
-#endif
-
- /* Unescape SMTP-style input of two dots at the beginning of the line */
- if ((ReadMsg->dodot) &&
- (StrLength(IO->IOBuf) == 2) && /* TODO: do we just unescape lines with two dots or any line? */
- (!strcmp(ChrPtr(IO->IOBuf), "..")))
- {
-#ifdef BIGBAD_IODBG
- fprintf(fd, "UnEscaped!\n");
-#endif
- StrBufCutLeft(IO->IOBuf, 1);
- }
-
- if (ReadMsg->crlf) {
- StrBufAppendBufPlain(IO->IOBuf, HKEY("\r\n"), 0);
- }
- else {
- StrBufAppendBufPlain(IO->IOBuf, HKEY("\n"), 0);
- }
-
- StrBufAppendBuf(ReadMsg->MsgBuf, IO->IOBuf, 0);
- }
-
- /* if we've hit the max msg length, flush the rest */
- if (StrLength(ReadMsg->MsgBuf) >= ReadMsg->maxlen) ReadMsg->flushing = 1;
-
- } while (!MsgFinished);
-
-#ifdef BIGBAD_IODBG
- fprintf(fd, "Done with reading; %s.\n, ",
- (MsgFinished)?"Message Finished": "FAILED");
- fclose(fd);
-#endif
- if (MsgFinished)
- return eReadSuccess;
- else
- return eReadFail;
-}
-
/*
* Back end function used by CtdlMakeMessage() and similar functions
size_t maxlen, /* maximum message length */
StrBuf *exist, /* if non-null, append to it;
exist is ALWAYS freed */
- int crlf, /* CRLF newlines instead of LF */
- int *sock /* socket handle or 0 for this session's client socket */
+ int crlf /* CRLF newlines instead of LF */
)
{
StrBuf *Message;
tlen,
maxlen,
exist,
- crlf,
- sock);
+ crlf
+ );
if (Message == NULL)
return NULL;
else
}
else {
StrBuf *MsgBody;
- MsgBody = CtdlReadMessageBodyBuf(HKEY("000"), CtdlGetConfigLong("c_maxmsglen"), NULL, 0, 0);
+ MsgBody = CtdlReadMessageBodyBuf(HKEY("000"), CtdlGetConfigLong("c_maxmsglen"), NULL, 0);
if (MsgBody != NULL) {
CM_SetAsFieldSB(msg, eMesageText, &MsgBody);
}
regcomp(&re, content_type, 0);
need_to_free_re = 1;
}
- syslog(LOG_DEBUG, " CtdlDeleteMessages(%s, %d msgs, %s)\n",
- room_name, num_dmsgnums, content_type);
+ syslog(LOG_DEBUG, "msgbase: CtdlDeleteMessages(%s, %d msgs, %s)", room_name, num_dmsgnums, content_type);
/* get room record, obtaining a lock... */
if (CtdlGetRoomLock(&qrbuf, room_name) != 0) {
- syslog(LOG_ERR, " CtdlDeleteMessages(): Room <%s> not found\n",
- room_name);
+ syslog(LOG_ERR, "msgbase: CtdlDeleteMessages(): Room <%s> not found", room_name);
if (need_to_free_re) regfree(&re);
- return (0); /* room not found */
+ return(0); /* room not found */
}
cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long));
StrBuf *dbg = NewStrBuf();
for (i = 0; i < num_dmsgnums; i++)
StrBufAppendPrintf(dbg, ", %ld", dmsgnums[i]);
- syslog(LOG_DEBUG, " Deleting before: %s", ChrPtr(dbg));
+ syslog(LOG_DEBUG, "msgbase: Deleting before: %s", ChrPtr(dbg));
FreeStrBuf(&dbg);
}
*/
StrBuf *dbg = NewStrBuf();
for (i = 0; i < num_deleted; i++)
StrBufAppendPrintf(dbg, ", %ld", dellist[i]);
- syslog(LOG_DEBUG, " Deleting: %s", ChrPtr(dbg));
+ syslog(LOG_DEBUG, "msgbase: Deleting: %s", ChrPtr(dbg));
FreeStrBuf(&dbg);
}
*/
/* Now free the memory we used, and go away. */
if (msglist != NULL) free(msglist);
if (dellist != NULL) free(dellist);
- syslog(LOG_DEBUG, " %d message(s) deleted.\n", num_deleted);
+ syslog(LOG_DEBUG, "msgbase: %d message(s) deleted", num_deleted);
if (need_to_free_re) regfree(&re);
return (num_deleted);
}
struct arcq new_arcq;
int rv = 0;
- syslog(LOG_DEBUG, "AdjRefCount() msg %ld ref count delta %+d\n", msgnum, incr);
+ syslog(LOG_DEBUG, "msgbase: AdjRefCount() msg %ld ref count delta %+d", msgnum, incr);
begin_critical_section(S_SUPPMSGMAIN);
if (arcfp == NULL) {
/* msgnum < 0 means that we're trying to close the file */
if (msgnum < 0) {
- syslog(LOG_DEBUG, "Closing the AdjRefCount queue file\n");
+ syslog(LOG_DEBUG, "msgbase: closing the AdjRefCount queue file");
begin_critical_section(S_SUPPMSGMAIN);
if (arcfp != NULL) {
fclose(arcfp);
new_arcq.arcq_delta = incr;
rv = fwrite(&new_arcq, sizeof(struct arcq), 1, arcfp);
if (rv == -1) {
- syslog(LOG_EMERG, "Couldn't write Refcount Queue File %s: %s\n",
- file_arcq,
- strerror(errno));
+ syslog(LOG_EMERG, "%s: %m", file_arcq);
}
fflush(arcfp);
struct arcq *new_arcq;
int rv = 0;
- syslog(LOG_DEBUG, "AdjRefCountList() msg %ld ref count delta %+d\n", nmsg, incr);
-
begin_critical_section(S_SUPPMSGMAIN);
if (arcfp == NULL) {
arcfp = fopen(file_arcq, "ab+");
the_size = sizeof(struct arcq) * nmsg;
new_arcq = malloc(the_size);
for (i = 0; i < nmsg; i++) {
+ syslog(LOG_DEBUG, "msgbase: AdjRefCountList() msg %ld ref count delta %+d", msgnum[i], incr);
new_arcq[i].arcq_msgnum = msgnum[i];
new_arcq[i].arcq_delta = incr;
}
{
rv = fwrite(new_arcq + offset, 1, the_size - offset, arcfp);
if (rv == -1) {
- syslog(LOG_EMERG, "Couldn't write Refcount Queue File %s: %s\n",
- file_arcq,
- strerror(errno));
+ syslog(LOG_ERR, "%s: %m", file_arcq);
}
else {
offset += rv;
r = link(file_arcq, file_arcq_temp);
if (r != 0) {
- syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno));
+ syslog(LOG_ERR, "%s: %m", file_arcq_temp);
end_critical_section(S_SUPPMSGMAIN);
return(num_records_processed);
}
fp = fopen(file_arcq_temp, "rb");
if (fp == NULL) {
- syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno));
+ syslog(LOG_ERR, "%s: %m", file_arcq_temp);
return(num_records_processed);
}
fclose(fp);
r = unlink(file_arcq_temp);
if (r != 0) {
- syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno));
+ syslog(LOG_ERR, "%s: %m", file_arcq_temp);
}
return(num_records_processed);
smi.meta_refcount += incr;
PutMetaData(&smi);
end_critical_section(S_SUPPMSGMAIN);
- syslog(LOG_DEBUG, "TDAP_AdjRefCount() msg %ld ref count delta %+d, is now %d\n",
+ syslog(LOG_DEBUG, "msgbase: TDAP_AdjRefCount() msg %ld ref count delta %+d, is now %d",
msgnum, incr, smi.meta_refcount
);
* (and its supplementary record as well).
*/
if (smi.meta_refcount == 0) {
- syslog(LOG_DEBUG, "Deleting message <%ld>\n", msgnum);
+ syslog(LOG_DEBUG, "msgbase: deleting message <%ld>", msgnum);
/* Call delete hooks with NULL room to show it has gone altogether */
PerformDeleteHooks(NULL, msgnum);
safestrncpy(roomname, req_room, sizeof(roomname));
}
- syslog(LOG_DEBUG, "Raw length is %ld\n", (long)raw_length);
+ syslog(LOG_DEBUG, "msfbase: raw length is %ld", (long)raw_length);
if (is_binary) {
encoded_message = NewStrBufPlain(NULL, (size_t) (((raw_length * 134) / 100) + 4096 ) );
StrBufAppendBufPlain(encoded_message, raw_message, raw_length, 0);
}
- syslog(LOG_DEBUG, "Allocating\n");
+ syslog(LOG_DEBUG, "msgbase: allocating");
msg = malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_magic = CTDLMESSAGE_MAGIC;
* other objects of this type that are currently in the room.
*/
if (is_unique) {
- syslog(LOG_DEBUG, "Deleted %d other msgs of this type\n",
+ syslog(LOG_DEBUG, "msgbase: deleted %d other msgs of this type",
CtdlDeleteMessages(roomname, NULL, 0, content_type)
);
}
projects / citadel.git / blobdiff