* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
- * Copyright (c) 2000-2012 by the citadel.org team
+ * Copyright (c) 2000-2016 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.
+ * 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.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
#include "internet_addressing.h"
#include "serv_network.h"
#include "clientsocket.h"
-#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
#include "context.h"
int i;
size_t recps_len = 0;
RoomNetCfgLine *nptr;
- struct CitContext *CCC = CC;
*recps = NULL;
/*
*recps = NewStrBufPlain(NULL, recps_len);
if (*recps == NULL) {
- QN_syslog(LOG_EMERG,
- "Cannot allocate %ld bytes for recps...\n",
- (long)recps_len);
+ syslog(LOG_ERR, "netmail: cannot allocate %ld bytes for recps", (long)recps_len);
abort();
}
Subject = NewStrBufPlain(HKEY("(no subject)"));
}
else {
- Subject = NewStrBufPlain(
- msg->cm_fields[eMsgSubject], -1);
+ Subject = NewStrBufPlain(CM_KEY(msg, eMsgSubject));
}
FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
char *pbuf;
struct CtdlMessage *msg = NULL;
long msglen;
- struct recptypes *valid;
+ recptypes *valid;
char bounce_to[256];
- if (sc->Users[listrecp] == NULL)
+ if (sc->Users[digestrecp] == NULL)
return;
- if (sc->num_msgs_spooled < 1) {
- fclose(sc->digestfp);
- sc->digestfp = NULL;
- return;
- }
-
msg = malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_magic = CTDLMESSAGE_MAGIC;
fread(pbuf, (size_t)msglen, 1, sc->digestfp);
pbuf[msglen] = '\0';
CM_SetAsField(msg, eMesageText, &pbuf, msglen);
- fclose(sc->digestfp);
- sc->digestfp = NULL;
/* Now generate the delivery instructions */
- if (sc->Users[listrecp] == NULL)
- return;
/* Where do we want bounces and other noise to be heard?
- *Surely not the list members! */
- snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
+ * Surely not the list members! */
+ snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", CtdlGetConfigStr("c_fqdn"));
/* Now submit the message */
- valid = validate_recipients(ChrPtr(sc->Users[listrecp]), NULL, 0);
+ valid = validate_recipients(ChrPtr(sc->Users[digestrecp]), NULL, 0);
if (valid != NULL) {
valid->bounce_to = strdup(bounce_to);
valid->envelope_from = strdup(bounce_to);
struct CtdlMessage *msg = NULL;
- /*
- * Process digest recipients
- */
- if ((sc->Users[digestrecp] == NULL)||
- (sc->digestfp == NULL))
+ if (sc->Users[digestrecp] == NULL)
return;
+ /* If there are digest recipients, we have to build a digest */
+ if (sc->digestfp == NULL) {
+
+ sc->digestfp = create_digest_file(&sc->room, 1);
+
+ if (sc->digestfp == NULL)
+ return;
+
+ sc->haveDigest = ftell(sc->digestfp) > 0;
+ if (!sc->haveDigest) {
+ fprintf(sc->digestfp, "Content-type: text/plain\n\n");
+ }
+ sc->haveDigest = 1;
+ }
+
msg = CM_Duplicate(omsg);
if (msg != NULL) {
+ sc->haveDigest = 1;
fprintf(sc->digestfp,
" -----------------------------------"
"------------------------------------"
msg = CM_Duplicate(omsg);
- CM_SetField(msg, eListID, SKEY(sc->Users[roommailalias]));
+ CM_SetField(msg, eReplyTo, SKEY(sc->Users[roommailalias]));
/* if there is no other recipient, Set the recipient
* of the list message to the email address of the
*/
void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char *RoomName)
{
- struct recptypes *valid;
+ recptypes *valid;
char bounce_to[256];
/* Don't do this if there were no recipients! */
/* Where do we want bounces and other noise to be heard?
* Surely not the list members! */
- snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
+ snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", CtdlGetConfigStr("c_fqdn"));
/* Now submit the message */
valid = validate_recipients(ChrPtr(sc->Users[listrecp]), NULL, 0);
struct CtdlMessage *msg = NULL;
int ok_to_participate = 0;
StrBuf *Buf = NULL;
- struct recptypes *valid;
+ recptypes *valid;
/*
* Process client-side list participations for this room
*/
ok_to_participate = 0;
if (!CM_IsEmpty(msg, eNodeName)) {
- if (!strcasecmp(msg->cm_fields[eNodeName],
- config.c_nodename)) {
+ if (!strcasecmp(msg->cm_fields[eNodeName], CtdlGetConfigStr("c_nodename")))
+ {
ok_to_participate = 1;
}
- Buf = NewStrBufPlain(msg->cm_fields[eNodeName], -1);
+ Buf = NewStrBufPlain(CM_KEY(msg, eNodeName));
if (CtdlIsValidNode(NULL,
NULL,
Buf,
sc->working_ignetcfg,
sc->the_netmap) != 0)
{
- QN_syslog(LOG_ERR,
- "Invalid node <%s>\n",
- ChrPtr(Recipient));
-
+ syslog(LOG_ERR, "netmail: invalid node <%s>", ChrPtr(Recipient));
send = 0;
}
/* Check for split horizon */
- QN_syslog(LOG_DEBUG, "Path is %s\n", msg->cm_fields[eMessagePath]);
+ syslog(LOG_DEBUG, "netmail: path is %s", msg->cm_fields[eMessagePath]);
bang = num_tokens(msg->cm_fields[eMessagePath], '!');
if (bang > 1) {
for (i=0; i<(bang-1); ++i) {
i, '!',
sizeof buf);
- QN_syslog(LOG_DEBUG, "Compare <%s> to <%s>\n",
- buf, ChrPtr(Recipient)) ;
+ syslog(LOG_DEBUG, "netmail: compare <%s> to <%s>", buf, ChrPtr(Recipient)) ;
if (!strcasecmp(buf, ChrPtr(Recipient))) {
send = 0;
break;
}
}
- QN_syslog(LOG_INFO,
- " %sSending to %s\n",
- (send)?"":"Not ",
- ChrPtr(Recipient));
+ syslog(LOG_INFO, "netmail: %ssending to %s", (send)?"":"not ", ChrPtr(Recipient));
}
/* Send the message */
}
/* serialize it for transmission */
- serialize_message(&sermsg, msg);
+ CtdlSerializeMessage(&sermsg, msg);
if (sermsg.len > 0) {
/* write it to a spool file */
snprintf(filename,
- sizeof(filename),
- "%s/%s@%lx%x",
- ctdl_netout_dir,
- ChrPtr(Recipient),
- time(NULL),
- rand()
- );
+ sizeof(filename),
+ "%s/%s@%lx%x-mail",
+ ctdl_netout_dir,
+ ChrPtr(Recipient),
+ time(NULL),
+ rand()
+ );
- QN_syslog(LOG_DEBUG,
- "Appending to %s\n",
- filename);
+ syslog(LOG_DEBUG, "netmail: appending to %s", filename);
fp = fopen(filename, "ab");
if (fp != NULL) {
- fwrite(sermsg.ser,
- sermsg.len, 1, fp);
+ fwrite(sermsg.ser, sermsg.len, 1, fp);
fclose(fp);
}
else {
- QN_syslog(LOG_ERR,
- "%s: %s\n",
- filename,
- strerror(errno));
+ syslog(LOG_ERR, "%s: %s\n", filename, strerror(errno));
}
/* free the serialized version */
/*
* Spools out one message from the list.
*/
-void network_spool_msg(long msgnum,
- void *userdata)
+void network_spool_msg(long msgnum, void *userdata)
{
- struct CitContext *CCC = CC;
struct CtdlMessage *msg = NULL;
long delete_after_send = 0; /* Set to 1 to delete after spooling */
SpoolControl *sc;
sc = (SpoolControl *)userdata;
-
- msg = CtdlFetchMessage(msgnum, 1);
+ msg = CtdlFetchMessage(msgnum, 1, 1);
if (msg == NULL)
{
- QN_syslog(LOG_ERR,
- "failed to load Message <%ld> from disk\n",
- msgnum);
+ syslog(LOG_ERR, "netmail: failed to load Message <%ld> from disk", msgnum);
return;
}
network_process_list(sc, msg, &delete_after_send);
projects / citadel.git / blobdiff