* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
- * Copyright (c) 2000-2011 by the citadel.org team
+ * Copyright (c) 2000-2012 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 as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
* two threads work on the netconfigs files at the same time. Since we do
#endif
#ifdef HAVE_SYSCALL_H
# include <syscall.h>
-#else
+#else
# if HAVE_SYS_SYSCALL_H
# include <sys/syscall.h>
# endif
#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "context.h"
-#include "netconfig.h"
#include "ctdl_module.h"
+#include "netconfig.h"
+#include "netspool.h"
+#include "netmail.h"
/*
* Deliver digest messages
*/
void network_deliver_digest(SpoolControl *sc) {
+ struct CitContext *CCC = CC;
char buf[SIZ];
int i;
struct CtdlMessage *msg = NULL;
long msglen;
- char *recps = NULL;
+ StrBuf *recps = NULL;
+ char *precps;
size_t recps_len = SIZ;
struct recptypes *valid;
- namelist *nptr;
+ RoomNetCfgLine *nptr;
char bounce_to[256];
if (sc->num_msgs_spooled < 1) {
/* Now generate the delivery instructions */
- /*
+ /*
* Figure out how big a buffer we need to allocate
*/
- for (nptr = sc->digestrecps; nptr != NULL; nptr = nptr->next) {
- recps_len = recps_len + strlen(nptr->name) + 2;
+ for (nptr = sc->RNCfg->NetConfigs[digestrecp]; nptr != NULL; nptr = nptr->next) {
+ recps_len = recps_len + StrLength(nptr->Value) + 2;
}
-
- recps = malloc(recps_len);
+
+ recps = NewStrBufPlain(NULL, recps_len);
if (recps == NULL) {
- syslog(LOG_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
+ QN_syslog(LOG_EMERG,
+ "Cannot allocate %ld bytes for recps...\n",
+ (long)recps_len);
abort();
}
- strcpy(recps, "");
-
/* Each recipient */
- for (nptr = sc->digestrecps; nptr != NULL; nptr = nptr->next) {
- if (nptr != sc->digestrecps) {
- strcat(recps, ",");
+ for (nptr = sc->RNCfg->NetConfigs[digestrecp]; nptr != NULL; nptr = nptr->next) {
+ if (nptr != sc->RNCfg->NetConfigs[digestrecp]) {
+ StrBufAppendBufPlain(recps, HKEY(","), 0);
}
- strcat(recps, nptr->name);
+ StrBufAppendBuf(recps, nptr->Value, 0);
}
- /* Where do we want bounces and other noise to be heard? Surely not the list members! */
+ /* 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);
/* Now submit the message */
- valid = validate_recipients(recps, NULL, 0);
- free(recps);
+ precps = SmashStrBuf(&recps);
+ valid = validate_recipients(precps, NULL, 0);
+ free(precps);
if (valid != NULL) {
valid->bounce_to = strdup(bounce_to);
valid->envelope_from = strdup(bounce_to);
/*
* Deliver list messages to everyone on the list ... efficiently
*/
-void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc) {
- char *recps = NULL;
+void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char *RoomName)
+{
+ struct CitContext *CCC = CC;
+ StrBuf *recps = NULL;
+ char *precps = NULL;
size_t recps_len = SIZ;
struct recptypes *valid;
- namelist *nptr;
+ RoomNetCfgLine *nptr;
char bounce_to[256];
/* Don't do this if there were no recipients! */
- if (sc->listrecps == NULL) return;
+ if (sc->RNCfg->NetConfigs[listrecp] == NULL) return;
/* Now generate the delivery instructions */
- /*
+ /*
* Figure out how big a buffer we need to allocate
*/
- for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
- recps_len = recps_len + strlen(nptr->name) + 2;
+ for (nptr = sc->RNCfg->NetConfigs[listrecp]; nptr != NULL; nptr = nptr->next) {
+ recps_len = recps_len + StrLength(nptr->Value) + 2;
}
-
- recps = malloc(recps_len);
+
+ recps = NewStrBufPlain(NULL, recps_len);
if (recps == NULL) {
- syslog(LOG_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
+ QN_syslog(LOG_EMERG,
+ "Cannot allocate %ld bytes for recps...\n",
+ (long)recps_len);
abort();
}
- strcpy(recps, "");
-
/* Each recipient */
- for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
- if (nptr != sc->listrecps) {
- strcat(recps, ",");
+ for (nptr = sc->RNCfg->NetConfigs[listrecp]; nptr != NULL; nptr = nptr->next) {
+ if (nptr != sc->RNCfg->NetConfigs[listrecp]) {
+ StrBufAppendBufPlain(recps, HKEY(","), 0);
}
- strcat(recps, nptr->name);
+ StrBufAppendBuf(recps, nptr->Value, 0);
}
- /* Where do we want bounces and other noise to be heard? Surely not the list members! */
+ /* 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);
/* Now submit the message */
- valid = validate_recipients(recps, NULL, 0);
- free(recps);
+ precps = SmashStrBuf(&recps);
+ valid = validate_recipients(precps, NULL, 0);
+ free(precps);
if (valid != NULL) {
valid->bounce_to = strdup(bounce_to);
valid->envelope_from = strdup(bounce_to);
+ valid->sending_room = strdup(RoomName);
CtdlSubmitMsg(msg, valid, NULL, 0);
free_recipients(valid);
}
}
-
-
/*
* 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;
+ StrBuf *Buf = NULL;
SpoolControl *sc;
int i;
char *newpath = NULL;
struct CtdlMessage *msg = NULL;
- namelist *nptr;
- maplist *mptr;
+ RoomNetCfgLine *nptr;
+ MapList *mptr;
struct ser_ret sermsg;
FILE *fp;
char filename[PATH_MAX];
/*
* Process mailing list recipients
*/
- if (sc->listrecps != NULL) {
+ if (sc->RNCfg->NetConfigs[listrecp] != NULL) {
/* Fetch the message. We're going to need to modify it
* in order to insert the [list name] in it, etc.
*/
char *pCh;
StrBuf *Subject, *FlatSubject;
+ if (msg->cm_fields['K'] != NULL)
+ free(msg->cm_fields['K']);
if (msg->cm_fields['V'] == NULL){
/* local message, no enVelope */
StrBuf *Buf;
Buf = NewStrBuf();
- StrBufAppendBufPlain(Buf, msg->cm_fields['O'], -1, 0);
+ StrBufAppendBufPlain(Buf,
+ msg->cm_fields['O']
+ , -1, 0);
StrBufAppendBufPlain(Buf, HKEY("@"), 0);
StrBufAppendBufPlain(Buf, config.c_fqdn, -1, 0);
-
+
msg->cm_fields['K'] = SmashStrBuf(&Buf);
}
else {
- msg->cm_fields['K'] = strdup (msg->cm_fields['V']);
+ msg->cm_fields['K'] =
+ strdup (msg->cm_fields['V']);
}
/* Set the 'List-ID' header */
if (msg->cm_fields['L'] != NULL) {
Subject = NewStrBufPlain(HKEY("(no subject)"));
}
else {
- Subject = NewStrBufPlain(msg->cm_fields['U'], -1);
+ Subject = NewStrBufPlain(
+ msg->cm_fields['U'], -1);
}
FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
{
StrBuf *tmp;
StrBufPlain(Subject, HKEY("["));
- StrBufAppendBufPlain(Subject, CC->room.QRname, rlen, 0);
+ StrBufAppendBufPlain(Subject,
+ CC->room.QRname,
+ rlen, 0);
StrBufAppendBufPlain(Subject, HKEY("] "), 0);
StrBufAppendBuf(Subject, FlatSubject, 0);
- tmp = Subject; Subject = FlatSubject; FlatSubject = tmp; /* so we can free the right one... */
+ /* so we can free the right one swap them */
+ tmp = Subject;
+ Subject = FlatSubject;
+ FlatSubject = tmp;
StrBufRFC2047encode(&Subject, FlatSubject);
}
-
+
if (msg->cm_fields['U'] != NULL)
free (msg->cm_fields['U']);
msg->cm_fields['U'] = SmashStrBuf(&Subject);
FreeStrBuf(&FlatSubject);
- /* else we won't modify the buffer, since the roomname is already here. */
+ /* else we won't modify the buffer, since the
+ * roomname is already here.
+ */
- /* Set the recipient of the list message to the
- * email address of the room itself.
- * FIXME ... I want to be able to pick any address
+ /* if there is no other recipient, Set the recipient
+ * of the list message to the email address of the
+ * room itself.
*/
- if (msg->cm_fields['R'] != NULL) {
- free(msg->cm_fields['R']);
- }
- msg->cm_fields['R'] = malloc(256);
- snprintf(msg->cm_fields['R'], 256,
- "room_%s@%s", CC->room.QRname,
- config.c_fqdn);
- for (i=0; msg->cm_fields['R'][i]; ++i) {
- if (isspace(msg->cm_fields['R'][i])) {
- msg->cm_fields['R'][i] = '_';
+ if ((msg->cm_fields['R'] == NULL) ||
+ IsEmptyStr(msg->cm_fields['R']))
+ {
+ if (msg->cm_fields['R'] != NULL)
+ free(msg->cm_fields['R']);
+
+ msg->cm_fields['R'] = malloc(256);
+ snprintf(msg->cm_fields['R'], 256,
+ "room_%s@%s", CC->room.QRname,
+ config.c_fqdn);
+ for (i=0; msg->cm_fields['R'][i]; ++i) {
+ if (isspace(msg->cm_fields['R'][i])) {
+ msg->cm_fields['R'][i] = '_';
+ }
}
}
/* Handle delivery */
- network_deliver_list(msg, sc);
+ network_deliver_list(msg, sc, CC->room.QRname);
CtdlFreeMessage(msg);
}
}
/*
* Process digest recipients
*/
- if ((sc->digestrecps != NULL) && (sc->digestfp != NULL)) {
+ if ((sc->RNCfg->NetConfigs[digestrecp] != NULL) && (sc->digestfp != NULL)) {
msg = CtdlFetchMessage(msgnum, 1);
if (msg != NULL) {
- fprintf(sc->digestfp, " -----------------------------------"
- "------------------------------------"
- "-------\n");
+ fprintf(sc->digestfp,
+ " -----------------------------------"
+ "------------------------------------"
+ "-------\n");
fprintf(sc->digestfp, "From: ");
if (msg->cm_fields['A'] != NULL) {
- fprintf(sc->digestfp, "%s ", msg->cm_fields['A']);
+ fprintf(sc->digestfp,
+ "%s ",
+ msg->cm_fields['A']);
}
if (msg->cm_fields['F'] != NULL) {
- fprintf(sc->digestfp, "<%s> ", msg->cm_fields['F']);
+ fprintf(sc->digestfp,
+ "<%s> ",
+ msg->cm_fields['F']);
}
else if (msg->cm_fields['N'] != NULL) {
- fprintf(sc->digestfp, "@%s ", msg->cm_fields['N']);
+ fprintf(sc->digestfp,
+ "@%s ",
+ msg->cm_fields['N']);
}
fprintf(sc->digestfp, "\n");
if (msg->cm_fields['U'] != NULL) {
- fprintf(sc->digestfp, "Subject: %s\n", msg->cm_fields['U']);
+ fprintf(sc->digestfp,
+ "Subject: %s\n",
+ msg->cm_fields['U']);
}
CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
-
- safestrncpy(CC->preferred_formats, "text/plain", sizeof CC->preferred_formats);
- CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_NONE, 0, 0, 0);
+
+ safestrncpy(CC->preferred_formats,
+ "text/plain",
+ sizeof CC->preferred_formats);
+
+ CtdlOutputPreLoadedMsg(msg,
+ MT_CITADEL,
+ HEADERS_NONE,
+ 0, 0, 0);
StrBufTrim(CC->redirect_buffer);
fwrite(HKEY("\n"), 1, sc->digestfp);
FreeStrBuf(&CC->redirect_buffer);
sc->num_msgs_spooled += 1;
- free(msg);
+ CtdlFreeMessage(msg);
}
}
/*
* Process client-side list participations for this room
*/
- if (sc->participates != NULL) {
+ if (sc->RNCfg->NetConfigs[participate] != NULL) {
msg = CtdlFetchMessage(msgnum, 1);
if (msg != NULL) {
- /* Only send messages which originated on our own Citadel
- * network, otherwise we'll end up sending the remote
- * mailing list's messages back to it, which is rude...
+ /* Only send messages which originated on our own
+ * Citadel network, otherwise we'll end up sending the
+ * remote mailing list's messages back to it, which
+ * is rude...
*/
ok_to_participate = 0;
if (msg->cm_fields['N'] != NULL) {
- if (!strcasecmp(msg->cm_fields['N'], config.c_nodename)) {
+ if (!strcasecmp(msg->cm_fields['N'],
+ config.c_nodename)) {
ok_to_participate = 1;
}
- if (is_valid_node(NULL, NULL, msg->cm_fields['N']) == 0) {
+
+ Buf = NewStrBufPlain(msg->cm_fields['N'], -1);
+ if (CtdlIsValidNode(NULL,
+ NULL,
+ Buf,
+ sc->working_ignetcfg,
+ sc->the_netmap) == 0)
+ {
ok_to_participate = 1;
}
}
free(msg->cm_fields['F']);
}
msg->cm_fields['F'] = malloc(SIZ);
- /* Replace the Internet email address of the actual
- * author with the email address of the room itself,
- * so the remote listserv doesn't reject us.
- * FIXME ... I want to be able to pick any address
- */
+ /* Replace the Internet email address of the
+ * actual author with the email address of the
+ * room itself, so the remote listserv doesn't
+ * reject us.
+ * FIXME I want to be able to pick any address
+ */
snprintf(msg->cm_fields['F'], SIZ,
"room_%s@%s", CC->room.QRname,
config.c_fqdn);
}
}
- /*
- * Figure out how big a buffer we need to allocate
- */
- for (nptr = sc->participates; nptr != NULL; nptr = nptr->next) {
-
- if (msg->cm_fields['R'] == NULL) {
+ /*
+ * Figure out how big a buffer we need to alloc
+ */
+ for (nptr = sc->RNCfg->NetConfigs[participate];
+ nptr != NULL;
+ nptr = nptr->next)
+ {
+ if (msg->cm_fields['R'] != NULL) {
free(msg->cm_fields['R']);
}
- msg->cm_fields['R'] = strdup(nptr->name);
-
- valid = validate_recipients(nptr->name, NULL, 0);
+ msg->cm_fields['R'] =
+ strdup(ChrPtr(nptr->Value));
+
+ valid = validate_recipients(msg->cm_fields['R'],
+ NULL, 0);
+
CtdlSubmitMsg(msg, valid, "", 0);
free_recipients(valid);
}
-
}
CtdlFreeMessage(msg);
}
}
-
+
/*
* Process IGnet push shares
*/
}
/* Now send it to every node */
- if (sc->ignet_push_shares != NULL)
- for (mptr = sc->ignet_push_shares; mptr != NULL;
+ if (sc->RNCfg->NetConfigs[ignet_push_share] != NULL)
+ for (mptr = (MapList*)sc->RNCfg->NetConfigs[ignet_push_share]; mptr != NULL;
mptr = mptr->next) {
send = 1;
+ NewStrBufDupAppendFlush(&Buf, mptr->remote_nodename, NULL, 1);
/* Check for valid node name */
- if (is_valid_node(NULL, NULL, mptr->remote_nodename) != 0) {
- syslog(LOG_ERR, "Invalid node <%s>\n", mptr->remote_nodename);
+ if (CtdlIsValidNode(NULL,
+ NULL,
+ Buf,
+ sc->working_ignetcfg,
+ sc->the_netmap) != 0)
+ {
+ QN_syslog(LOG_ERR,
+ "Invalid node <%s>\n",
+ ChrPtr(mptr->remote_nodename));
+
send = 0;
}
/* Check for split horizon */
- syslog(LOG_DEBUG, "Path is %s\n", msg->cm_fields['P']);
+ QN_syslog(LOG_DEBUG, "Path is %s\n", msg->cm_fields['P']);
bang = num_tokens(msg->cm_fields['P'], '!');
- if (bang > 1) for (i=0; i<(bang-1); ++i) {
- extract_token(buf, msg->cm_fields['P'], i, '!', sizeof buf);
- syslog(LOG_DEBUG, "Compare <%s> to <%s>\n",
- buf, mptr->remote_nodename) ;
- if (!strcasecmp(buf, mptr->remote_nodename)) {
- send = 0;
- syslog(LOG_DEBUG, "Not sending to %s\n",
- mptr->remote_nodename);
- }
- else {
- syslog(LOG_DEBUG, "Sending to %s\n", mptr->remote_nodename);
+ if (bang > 1) {
+ for (i=0; i<(bang-1); ++i) {
+ extract_token(buf,
+ msg->cm_fields['P'],
+ i, '!',
+ sizeof buf);
+
+ QN_syslog(LOG_DEBUG, "Compare <%s> to <%s>\n",
+ buf, ChrPtr(mptr->remote_nodename)) ;
+ if (!strcasecmp(buf, ChrPtr(mptr->remote_nodename))) {
+ send = 0;
+ break;
+ }
}
+
+ QN_syslog(LOG_INFO,
+ "%sSending to %s\n",
+ (send)?"":"Not ",
+ ChrPtr(mptr->remote_nodename));
}
/* Send the message */
- if (send == 1) {
-
+ if (send == 1)
+ {
/*
- * Force the message to appear in the correct room
- * on the far end by setting the C field correctly
+ * Force the message to appear in the correct
+ * room on the far end by setting the C field
+ * correctly
*/
if (msg->cm_fields['C'] != NULL) {
free(msg->cm_fields['C']);
}
- if (!IsEmptyStr(mptr->remote_roomname)) {
- msg->cm_fields['C'] = strdup(mptr->remote_roomname);
+ if (StrLength(mptr->remote_roomname) > 0) {
+ msg->cm_fields['C'] =
+ strdup(ChrPtr(mptr->remote_roomname));
}
else {
- msg->cm_fields['C'] = strdup(CC->room.QRname);
+ msg->cm_fields['C'] =
+ strdup(CC->room.QRname);
}
/* serialize it for transmission */
if (sermsg.len > 0) {
/* write it to a spool file */
- snprintf(filename, sizeof filename,"%s/%s@%lx%x",
- ctdl_netout_dir,
- mptr->remote_nodename,
- time(NULL),
- rand()
+ snprintf(filename,
+ sizeof(filename),
+ "%s/%s@%lx%x",
+ ctdl_netout_dir,
+ ChrPtr(mptr->remote_nodename),
+ time(NULL),
+ rand()
);
- syslog(LOG_DEBUG, "Appending to %s\n", filename);
+
+ QN_syslog(LOG_DEBUG,
+ "Appending to %s\n",
+ filename);
+
fp = fopen(filename, "ab");
if (fp != NULL) {
fwrite(sermsg.ser,
fclose(fp);
}
else {
- syslog(LOG_ERR, "%s: %s\n", filename, strerror(errno));
+ QN_syslog(LOG_ERR,
+ "%s: %s\n",
+ filename,
+ strerror(errno));
}
-
+
/* free the serialized version */
free(sermsg.ser);
}
}
/* update lastsent */
- sc->lastsent = msgnum;
+ sc->RNCfg->lastsent = msgnum;
/* Delete this message if delete-after-send is set */
if (delete_after_send) {
CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "");
}
-
+ FreeStrBuf(&Buf);
}
projects / citadel.git / blobdiff