#include "threads.h"
#include "context.h"
#include "ctdl_module.h"
-#include "netconfig.h"
#include "netspool.h"
#include "netmail.h"
+void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char *RoomName);
+
+void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRNCfg, long nSegments)
+{
+ int i;
+ size_t recps_len = 0;
+ RoomNetCfgLine *nptr;
+ struct CitContext *CCC = CC;
+
+ *recps = NULL;
+ /*
+ * Figure out how big a buffer we need to allocate
+ */
+ for (nptr = OneRNCfg->NetConfigs[Which]; nptr != NULL; nptr = nptr->next) {
+ recps_len = recps_len + StrLength(nptr->Value[0]) + 2;
+ }
+
+ /* Nothing todo... */
+ if (recps_len == 0)
+ return;
+
+ *recps = NewStrBufPlain(NULL, recps_len);
+
+ if (*recps == NULL) {
+ QN_syslog(LOG_EMERG,
+ "Cannot allocate %ld bytes for recps...\n",
+ (long)recps_len);
+ abort();
+ }
+
+ /* Each recipient */
+ for (nptr = OneRNCfg->NetConfigs[Which]; nptr != NULL; nptr = nptr->next) {
+ if (nptr != OneRNCfg->NetConfigs[Which]) {
+ for (i = 0; i < nSegments; i++)
+ StrBufAppendBufPlain(*recps, HKEY(","), i);
+ }
+ StrBufAppendBuf(*recps, nptr->Value[0], 0);
+ }
+}
+
+static void ListCalculateSubject(struct CtdlMessage *msg)
+{
+ struct CitContext *CCC = CC;
+ StrBuf *Subject, *FlatSubject;
+ int rlen;
+ char *pCh;
+
+ if (msg->cm_fields['U'] == NULL) {
+ Subject = NewStrBufPlain(HKEY("(no subject)"));
+ }
+ else {
+ Subject = NewStrBufPlain(
+ msg->cm_fields['U'], -1);
+ }
+ FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
+ StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
+
+ rlen = strlen(CCC->room.QRname);
+ pCh = strstr(ChrPtr(FlatSubject), CCC->room.QRname);
+ if ((pCh == NULL) ||
+ (*(pCh + rlen) != ']') ||
+ (pCh == ChrPtr(FlatSubject)) ||
+ (*(pCh - 1) != '[')
+ )
+ {
+ StrBuf *tmp;
+ StrBufPlain(Subject, HKEY("["));
+ StrBufAppendBufPlain(Subject,
+ CCC->room.QRname,
+ rlen, 0);
+ StrBufAppendBufPlain(Subject, HKEY("] "), 0);
+ StrBufAppendBuf(Subject, FlatSubject, 0);
+ /* 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);
+}
/*
* Deliver digest messages
*/
-void network_deliver_digest(SpoolControl *sc) {
- struct CitContext *CCC = CC;
+void network_deliver_digest(SpoolControl *sc)
+{
char buf[SIZ];
- int i;
struct CtdlMessage *msg = NULL;
long msglen;
- StrBuf *recps = NULL;
- char *precps;
- size_t recps_len = SIZ;
struct recptypes *valid;
- RoomNetCfgLine *nptr;
char bounce_to[256];
+ if (sc->Users[listrecp] == NULL)
+ return;
+
if (sc->num_msgs_spooled < 1) {
fclose(sc->digestfp);
sc->digestfp = NULL;
msg->cm_fields['A'] = strdup(CC->room.QRname);
snprintf(buf, sizeof buf, "[%s]", CC->room.QRname);
msg->cm_fields['U'] = strdup(buf);
- sprintf(buf, "room_%s@%s", CC->room.QRname, config.c_fqdn);
- for (i=0; buf[i]; ++i) {
- if (isspace(buf[i])) buf[i]='_';
- buf[i] = tolower(buf[i]);
- }
- msg->cm_fields['F'] = strdup(buf);
- msg->cm_fields['R'] = strdup(buf);
+
+ CtdlMsgSetCM_Fields(msg, 'F', SKEY(sc->Users[roommailalias]));
+ CtdlMsgSetCM_Fields(msg, 'R', SKEY(sc->Users[roommailalias]));
/* Set the 'List-ID' header */
- msg->cm_fields['L'] = malloc(1024);
- snprintf(msg->cm_fields['L'], 1024,
- "%s <%ld.list-id.%s>",
- CC->room.QRname,
- CC->room.QRnumber,
- config.c_fqdn
- );
+ CtdlMsgSetCM_Fields(msg, 'L', SKEY(sc->ListID));
/*
* Go fetch the contents of the digest
sc->digestfp = NULL;
/* Now generate the delivery instructions */
-
- /*
- * Figure out how big a buffer we need to allocate
- */
- for (nptr = sc->RNCfg->NetConfigs[digestrecp]; nptr != NULL; nptr = nptr->next) {
- recps_len = recps_len + StrLength(nptr->Value) + 2;
- }
-
- recps = NewStrBufPlain(NULL, recps_len);
-
- if (recps == NULL) {
- QN_syslog(LOG_EMERG,
- "Cannot allocate %ld bytes for recps...\n",
- (long)recps_len);
- abort();
- }
-
- /* Each recipient */
- for (nptr = sc->RNCfg->NetConfigs[digestrecp]; nptr != NULL; nptr = nptr->next) {
- if (nptr != sc->RNCfg->NetConfigs[digestrecp]) {
- StrBufAppendBufPlain(recps, HKEY(","), 0);
- }
- StrBufAppendBuf(recps, nptr->Value, 0);
- }
+ 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);
/* Now submit the message */
- precps = SmashStrBuf(&recps);
- valid = validate_recipients(precps, NULL, 0);
- free(precps);
+ valid = validate_recipients(ChrPtr(sc->Users[listrecp]), NULL, 0);
if (valid != NULL) {
valid->bounce_to = strdup(bounce_to);
valid->envelope_from = strdup(bounce_to);
}
+void network_process_digest(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
+{
+
+ struct CtdlMessage *msg = NULL;
+
+ /*
+ * Process digest recipients
+ */
+ if ((sc->Users[digestrecp] == NULL)||
+ (sc->digestfp == NULL))
+ return;
+
+ msg = CtdlDuplicateMessage(omsg);
+ if (msg != NULL) {
+ fprintf(sc->digestfp,
+ " -----------------------------------"
+ "------------------------------------"
+ "-------\n");
+ fprintf(sc->digestfp, "From: ");
+ if (msg->cm_fields['A'] != NULL) {
+ fprintf(sc->digestfp,
+ "%s ",
+ msg->cm_fields['A']);
+ }
+ if (msg->cm_fields['F'] != NULL) {
+ 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, "\n");
+ if (msg->cm_fields['U'] != NULL) {
+ 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);
+
+ StrBufTrim(CC->redirect_buffer);
+ fwrite(HKEY("\n"), 1, sc->digestfp);
+ fwrite(SKEY(CC->redirect_buffer), 1, sc->digestfp);
+ fwrite(HKEY("\n"), 1, sc->digestfp);
+
+ FreeStrBuf(&CC->redirect_buffer);
+
+ sc->num_msgs_spooled += 1;
+ CtdlFreeMessage(msg);
+ }
+}
+
+
+void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
+{
+ struct CtdlMessage *msg = NULL;
+
+ /*
+ * Process mailing list recipients
+ */
+ if (sc->Users[listrecp] == NULL)
+ return;
+
+ /* create our own copy of the message.
+ * We're going to need to modify it
+ * in order to insert the [list name] in it, etc.
+ */
+
+ msg = CtdlDuplicateMessage(omsg);
+
+
+ CtdlMsgSetCM_Fields(msg, 'K', SKEY(sc->Users[roommailalias]));
+
+ /* 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) ||
+ IsEmptyStr(msg->cm_fields['R']))
+ {
+ CtdlMsgSetCM_Fields(msg, 'R', SKEY(sc->Users[roommailalias]));
+ }
+
+ /* Set the 'List-ID' header */
+ CtdlMsgSetCM_Fields(msg, 'L', SKEY(sc->ListID));
+
+
+ /* Prepend "[List name]" to the subject */
+ ListCalculateSubject(msg);
+
+ /* Handle delivery */
+ network_deliver_list(msg, sc, CC->room.QRname);
+ CtdlFreeMessage(msg);
+}
+
/*
* Deliver list messages to everyone on the list ... efficiently
*/
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;
- RoomNetCfgLine *nptr;
char bounce_to[256];
/* Don't do this if there were no recipients! */
- if (sc->RNCfg->NetConfigs[listrecp] == NULL) return;
+ if (sc->Users[listrecp] == NULL)
+ return;
/* Now generate the delivery instructions */
- /*
- * Figure out how big a buffer we need to allocate
- */
- for (nptr = sc->RNCfg->NetConfigs[listrecp]; nptr != NULL; nptr = nptr->next) {
- recps_len = recps_len + StrLength(nptr->Value) + 2;
- }
-
- recps = NewStrBufPlain(NULL, recps_len);
-
- if (recps == NULL) {
- QN_syslog(LOG_EMERG,
- "Cannot allocate %ld bytes for recps...\n",
- (long)recps_len);
- abort();
- }
-
- /* Each recipient */
- for (nptr = sc->RNCfg->NetConfigs[listrecp]; nptr != NULL; nptr = nptr->next) {
- if (nptr != sc->RNCfg->NetConfigs[listrecp]) {
- StrBufAppendBufPlain(recps, HKEY(","), 0);
- }
- StrBufAppendBuf(recps, nptr->Value, 0);
- }
-
/* 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 */
- precps = SmashStrBuf(&recps);
- valid = validate_recipients(precps, NULL, 0);
- free(precps);
+ valid = validate_recipients(ChrPtr(sc->Users[listrecp]), NULL, 0);
if (valid != NULL) {
valid->bounce_to = strdup(bounce_to);
valid->envelope_from = strdup(bounce_to);
}
-/*
- * Spools out one message from the list.
- */
-void network_spool_msg(long msgnum,
- void *userdata)
+void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
{
- struct CitContext *CCC = CC;
- StrBuf *Buf = NULL;
- SpoolControl *sc;
- int i;
- char *newpath = NULL;
struct CtdlMessage *msg = NULL;
- RoomNetCfgLine *nptr;
- maplist *mptr;
- struct ser_ret sermsg;
- FILE *fp;
- char filename[PATH_MAX];
- char buf[SIZ];
- int bang = 0;
- int send = 1;
- int delete_after_send = 0; /* Set to 1 to delete after spooling */
int ok_to_participate = 0;
+ StrBuf *Buf = NULL;
struct recptypes *valid;
- sc = (SpoolControl *)userdata;
-
/*
- * Process mailing list recipients
+ * Process client-side list participations for this room
*/
- 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.
- */
- msg = CtdlFetchMessage(msgnum, 1);
- if (msg != NULL) {
- int rlen;
- 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, 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']);
- }
- /* Set the 'List-ID' header */
- if (msg->cm_fields['L'] != NULL) {
- free(msg->cm_fields['L']);
- }
- msg->cm_fields['L'] = malloc(1024);
- snprintf(msg->cm_fields['L'], 1024,
- "%s <%ld.list-id.%s>",
- CC->room.QRname,
- CC->room.QRnumber,
- config.c_fqdn
- );
-
- /* Prepend "[List name]" to the subject */
- if (msg->cm_fields['U'] == NULL) {
- Subject = NewStrBufPlain(HKEY("(no subject)"));
- }
- else {
- Subject = NewStrBufPlain(
- msg->cm_fields['U'], -1);
- }
- FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
- StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
-
- rlen = strlen(CC->room.QRname);
- pCh = strstr(ChrPtr(FlatSubject), CC->room.QRname);
- if ((pCh == NULL) ||
- (*(pCh + rlen) != ']') ||
- (pCh == ChrPtr(FlatSubject)) ||
- (*(pCh - 1) != '[')
- )
- {
- StrBuf *tmp;
- StrBufPlain(Subject, HKEY("["));
- StrBufAppendBufPlain(Subject,
- CC->room.QRname,
- rlen, 0);
- StrBufAppendBufPlain(Subject, HKEY("] "), 0);
- StrBufAppendBuf(Subject, FlatSubject, 0);
- /* 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.
- */
+ if (sc->Users[participate] == NULL)
+ return;
- /* 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) ||
- 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] = '_';
- }
- }
- }
+ msg = CtdlDuplicateMessage(omsg);
- /* Handle delivery */
- network_deliver_list(msg, sc, CC->room.QRname);
- CtdlFreeMessage(msg);
+ /* 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)) {
+ ok_to_participate = 1;
+ }
+
+ Buf = NewStrBufPlain(msg->cm_fields['N'], -1);
+ if (CtdlIsValidNode(NULL,
+ NULL,
+ Buf,
+ sc->working_ignetcfg,
+ sc->the_netmap) == 0)
+ {
+ ok_to_participate = 1;
}
}
+ if (ok_to_participate)
+ {
+ /* 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.
+ */
+ CtdlMsgSetCM_Fields(msg, 'F', SKEY(sc->Users[roommailalias]));
- /*
- * Process digest recipients
- */
- if ((sc->RNCfg->NetConfigs[digestrecp] != NULL) && (sc->digestfp != NULL)) {
- msg = CtdlFetchMessage(msgnum, 1);
- if (msg != NULL) {
- fprintf(sc->digestfp,
- " -----------------------------------"
- "------------------------------------"
- "-------\n");
- fprintf(sc->digestfp, "From: ");
- if (msg->cm_fields['A'] != NULL) {
- fprintf(sc->digestfp,
- "%s ",
- msg->cm_fields['A']);
- }
- if (msg->cm_fields['F'] != NULL) {
- 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, "\n");
- if (msg->cm_fields['U'] != NULL) {
- 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);
+ valid = validate_recipients(ChrPtr(sc->Users[participate]) , NULL, 0);
- StrBufTrim(CC->redirect_buffer);
- fwrite(HKEY("\n"), 1, sc->digestfp);
- fwrite(SKEY(CC->redirect_buffer), 1, sc->digestfp);
- fwrite(HKEY("\n"), 1, sc->digestfp);
+ CtdlMsgSetCM_Fields(msg, 'R', SKEY(sc->Users[roommailalias]));
+ CtdlSubmitMsg(msg, valid, "", 0);
+ free_recipients(valid);
+ }
+ FreeStrBuf(&Buf);
+ CtdlFreeMessage(msg);
+}
- FreeStrBuf(&CC->redirect_buffer);
+void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
+{
+ StrBuf *Recipient;
+ StrBuf *RemoteRoom;
+ const char *Pos = NULL;
+ struct CtdlMessage *msg = NULL;
+ struct CitContext *CCC = CC;
+ struct ser_ret sermsg;
+ char buf[SIZ];
+ char filename[PATH_MAX];
+ FILE *fp;
+ size_t newpath_len;
+ char *newpath = NULL;
+ StrBuf *Buf = NULL;
+ int i;
+ int bang = 0;
+ int send = 1;
- sc->num_msgs_spooled += 1;
- CtdlFreeMessage(msg);
- }
- }
+ if (sc->Users[ignet_push_share] == NULL)
+ return;
/*
- * Process client-side list participations for this room
+ * Process IGnet push shares
*/
- 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...
- */
- ok_to_participate = 0;
- if (msg->cm_fields['N'] != NULL) {
- if (!strcasecmp(msg->cm_fields['N'],
- config.c_nodename)) {
- ok_to_participate = 1;
- }
-
- Buf = NewStrBufPlain(msg->cm_fields['N'], -1);
- if (is_valid_node(NULL,
- NULL,
- Buf,
- sc->working_ignetcfg,
- sc->the_netmap) == 0)
- {
- ok_to_participate = 1;
- }
- }
- if (ok_to_participate) {
- if (msg->cm_fields['F'] != NULL) {
- 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
- */
- snprintf(msg->cm_fields['F'], SIZ,
- "room_%s@%s", CC->room.QRname,
- config.c_fqdn);
- for (i=0; msg->cm_fields['F'][i]; ++i) {
- if (isspace(msg->cm_fields['F'][i])) {
- msg->cm_fields['F'][i] = '_';
- }
- }
+ msg = CtdlDuplicateMessage(omsg);
- /*
- * 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(ChrPtr(nptr->Value));
-
- valid = validate_recipients(msg->cm_fields['R'],
- NULL, 0);
-
- CtdlSubmitMsg(msg, valid, "", 0);
- free_recipients(valid);
- }
- }
- CtdlFreeMessage(msg);
- }
+ /* Prepend our node name to the Path field whenever
+ * sending a message to another IGnet node
+ */
+ if (msg->cm_fields['P'] == NULL)
+ {
+ msg->cm_fields['P'] = strdup("username");
}
-
+ newpath_len = strlen(msg->cm_fields['P']) +
+ strlen(config.c_nodename) + 2;
+ newpath = malloc(newpath_len);
+ snprintf(newpath, newpath_len, "%s!%s",
+ config.c_nodename, msg->cm_fields['P']);
+ free(msg->cm_fields['P']);
+ msg->cm_fields['P'] = newpath;
+
/*
- * Process IGnet push shares
+ * Determine if this message is set to be deleted
+ * after sending out on the network
*/
- msg = CtdlFetchMessage(msgnum, 1);
- if (msg != NULL) {
- size_t newpath_len;
+ if (msg->cm_fields['S'] != NULL) {
+ if (!strcasecmp(msg->cm_fields['S'], "CANCEL")) {
+ *delete_after_send = 1;
+ }
+ }
- /* Prepend our node name to the Path field whenever
- * sending a message to another IGnet node
- */
- if (msg->cm_fields['P'] == NULL) {
- msg->cm_fields['P'] = strdup("username");
+ /* Now send it to every node */
+ Recipient = NewStrBufPlain(NULL, StrLength(sc->Users[ignet_push_share]));
+ RemoteRoom = NewStrBufPlain(NULL, StrLength(sc->Users[ignet_push_share]));
+ while ((Pos != StrBufNOTNULL) &&
+ StrBufExtract_NextToken(Recipient, sc->Users[ignet_push_share], &Pos, ','))
+ {
+ StrBufExtract_NextToken(RemoteRoom, sc->Users[ignet_push_share], &Pos, ',');
+ send = 1;
+ NewStrBufDupAppendFlush(&Buf, Recipient, NULL, 1);
+
+ /* Check for valid node name */
+ if (CtdlIsValidNode(NULL,
+ NULL,
+ Buf,
+ sc->working_ignetcfg,
+ sc->the_netmap) != 0)
+ {
+ QN_syslog(LOG_ERR,
+ "Invalid node <%s>\n",
+ ChrPtr(Recipient));
+
+ send = 0;
}
- newpath_len = strlen(msg->cm_fields['P']) +
- strlen(config.c_nodename) + 2;
- newpath = malloc(newpath_len);
- snprintf(newpath, newpath_len, "%s!%s",
- config.c_nodename, msg->cm_fields['P']);
- free(msg->cm_fields['P']);
- msg->cm_fields['P'] = newpath;
-
- /*
- * Determine if this message is set to be deleted
- * after sending out on the network
- */
- if (msg->cm_fields['S'] != NULL) {
- if (!strcasecmp(msg->cm_fields['S'], "CANCEL")) {
- delete_after_send = 1;
+
+ /* Check for split horizon */
+ 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);
+
+ QN_syslog(LOG_DEBUG, "Compare <%s> to <%s>\n",
+ buf, ChrPtr(Recipient)) ;
+ if (!strcasecmp(buf, ChrPtr(Recipient))) {
+ send = 0;
+ break;
+ }
}
+
+ QN_syslog(LOG_INFO,
+ "%sSending to %s\n",
+ (send)?"":"Not ",
+ ChrPtr(Recipient));
}
-
- /* Now send it to every node */
- 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,
- Buf,
- sc->working_ignetcfg,
- sc->the_netmap) != 0)
- {
- QN_syslog(LOG_ERR,
- "Invalid node <%s>\n",
- ChrPtr(mptr->remote_nodename));
-
- send = 0;
+
+ /* Send the message */
+ if (send == 1)
+ {
+ /*
+ * 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']);
}
-
- /* Check for split horizon */
- 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);
-
- 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));
+ if (StrLength(RemoteRoom) > 0) {
+ msg->cm_fields['C'] =
+ strdup(ChrPtr(RemoteRoom));
}
-
- /* Send the message */
- if (send == 1)
- {
- /*
- * 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 (StrLength(mptr->remote_roomname) > 0) {
- msg->cm_fields['C'] =
- strdup(ChrPtr(mptr->remote_roomname));
+ else {
+ msg->cm_fields['C'] =
+ strdup(CC->room.QRname);
+ }
+
+ /* serialize it for transmission */
+ serialize_message(&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()
+ );
+
+ QN_syslog(LOG_DEBUG,
+ "Appending to %s\n",
+ filename);
+
+ fp = fopen(filename, "ab");
+ if (fp != NULL) {
+ fwrite(sermsg.ser,
+ sermsg.len, 1, fp);
+ fclose(fp);
}
else {
- msg->cm_fields['C'] =
- strdup(CC->room.QRname);
- }
-
- /* serialize it for transmission */
- serialize_message(&sermsg, msg);
- if (sermsg.len > 0) {
-
- /* write it to a spool file */
- snprintf(filename,
- sizeof(filename),
- "%s/%s@%lx%x",
- ctdl_netout_dir,
- ChrPtr(mptr->remote_nodename),
- time(NULL),
- rand()
- );
-
- QN_syslog(LOG_DEBUG,
- "Appending to %s\n",
- filename);
-
- fp = fopen(filename, "ab");
- if (fp != NULL) {
- fwrite(sermsg.ser,
- sermsg.len, 1, fp);
- fclose(fp);
- }
- else {
- QN_syslog(LOG_ERR,
- "%s: %s\n",
- filename,
- strerror(errno));
- }
-
- /* free the serialized version */
- free(sermsg.ser);
+ QN_syslog(LOG_ERR,
+ "%s: %s\n",
+ filename,
+ strerror(errno));
}
+ /* free the serialized version */
+ free(sermsg.ser);
}
}
- CtdlFreeMessage(msg);
}
+ FreeStrBuf(&Buf);
+ FreeStrBuf(&Recipient);
+ FreeStrBuf(&RemoteRoom);
+ CtdlFreeMessage(msg);
+}
+
+
+/*
+ * Spools out one message from the list.
+ */
+void network_spool_msg(long msgnum,
+ void *userdata)
+{
+ 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);
+
+ network_process_list(sc, msg, &delete_after_send);
+ network_process_digest(sc, msg, &delete_after_send);
+ network_process_participate(sc, msg, &delete_after_send);
+ network_process_ignetpush(sc, msg, &delete_after_send);
+
+ CtdlFreeMessage(msg);
/* update lastsent */
- sc->RNCfg->lastsent = msgnum;
+ sc->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