struct CtdlMessage *msg = NULL;
long msglen;
StrBuf *recps = NULL;
- char *precps;
struct recptypes *valid;
char bounce_to[256];
+ if (sc->Users[listrecp] == NULL)
+ return;
+
if (sc->num_msgs_spooled < 1) {
fclose(sc->digestfp);
sc->digestfp = NULL;
sc->digestfp = NULL;
/* Now generate the delivery instructions */
+ if (sc->Users[listrecp] == NULL)
+ return;
aggregate_recipients(&recps, digestrecp, sc->RNCfg);
/* Where do we want bounces and other noise to be heard?
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);
/*
* Process digest recipients
*/
- if ((sc->RNCfg->NetConfigs[digestrecp] == NULL) ||
+ if ((sc->Users[digestrecp] == NULL)||
(sc->digestfp == NULL))
return;
void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
{
+ struct CitContext *CCC = CC;
int rlen;
char *pCh;
StrBuf *Subject, *FlatSubject;
/*
* Process mailing list recipients
*/
- if (sc->RNCfg->NetConfigs[listrecp] == NULL)
+ if (sc->Users[listrecp] == NULL)
return;
/* create our own copy of the message.
msg->cm_fields['L'] = malloc(1024);
snprintf(msg->cm_fields['L'], 1024,
"%s <%ld.list-id.%s>",
- CC->room.QRname,
- CC->room.QRnumber,
+ CCC->room.QRname,
+ CCC->room.QRnumber,
config.c_fqdn
);
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);
+ rlen = strlen(CCC->room.QRname);
+ pCh = strstr(ChrPtr(FlatSubject), CCC->room.QRname);
if ((pCh == NULL) ||
(*(pCh + rlen) != ']') ||
(pCh == ChrPtr(FlatSubject)) ||
StrBuf *tmp;
StrBufPlain(Subject, HKEY("["));
StrBufAppendBufPlain(Subject,
- CC->room.QRname,
+ CCC->room.QRname,
rlen, 0);
StrBufAppendBufPlain(Subject, HKEY("] "), 0);
StrBufAppendBuf(Subject, FlatSubject, 0);
msg->cm_fields['R'] = malloc(256);
snprintf(msg->cm_fields['R'], 256,
- "room_%s@%s", CC->room.QRname,
+ "room_%s@%s", CCC->room.QRname,
config.c_fqdn);
for (i=0; msg->cm_fields['R'][i]; ++i) {
if (isspace(msg->cm_fields['R'][i])) {
}
/* Handle delivery */
- network_deliver_list(msg, sc, CC->room.QRname);
+ network_deliver_list(msg, sc, CCC->room.QRname);
CtdlFreeMessage(msg);
}
*/
void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char *RoomName)
{
- StrBuf *recps = NULL;
- char *precps = NULL;
struct recptypes *valid;
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
- */
- aggregate_recipients(&recps, listrecp, sc->RNCfg);
-
/* 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);
/*
* Process client-side list participations for this room
*/
- if (sc->RNCfg->NetConfigs[participate] == NULL)
+ if (sc->Users[participate] == NULL)
return;
msg = CtdlDuplicateMessage(omsg);
}
if (ok_to_participate)
{
- StrBuf *recps = NULL;
- char *precps;
-
if (msg->cm_fields['F'] != NULL) {
free(msg->cm_fields['F']);
}
* 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);
+ if (sc->Users[roommailalias] != NULL)
+ snprintf(msg->cm_fields['F'], SIZ,
+ "%s", ChrPtr(sc->Users[roommailalias]));
+ else
+ 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] = '_';
}
}
- aggregate_recipients(&recps, participate, sc->RNCfg);
- precps = SmashStrBuf(&recps);
- valid = validate_recipients(precps, NULL, 0);
+ valid = validate_recipients(ChrPtr(sc->Users[participate]) , NULL, 0);
if (msg->cm_fields['R'] != NULL) {
free(msg->cm_fields['R']);
void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
{
+ StrBuf *Recipient;
+ const char *Pos = NULL;
struct CtdlMessage *msg = NULL;
struct CitContext *CCC = CC;
struct ser_ret sermsg;
FILE *fp;
size_t newpath_len;
char *newpath = NULL;
- RoomNetCfgLine* mptr;
StrBuf *Buf = NULL;
int i;
int bang = 0;
int send = 1;
- if (sc->RNCfg->NetConfigs[ignet_push_share] == NULL)
+ if (sc->Users[ignet_push_share] == NULL)
return;
+
/*
* Process IGnet push shares
*/
}
/* Now send it to every node */
- for (mptr = sc->RNCfg->NetConfigs[ignet_push_share];
- mptr != NULL;
- mptr = mptr->next)
+ Recipient = NewStrBufPlain(NULL, StrLength(sc->Users[ignet_push_share]));
+ while ((Pos != StrBufNOTNULL) &&
+ StrBufExtract_NextToken(Recipient, sc->Users[ignet_push_share], &Pos, '|'))
{
send = 1;
- NewStrBufDupAppendFlush(&Buf, mptr->Value[0], NULL, 1);
+ NewStrBufDupAppendFlush(&Buf, Recipient, NULL, 1);
/* Check for valid node name */
if (CtdlIsValidNode(NULL,
{
QN_syslog(LOG_ERR,
"Invalid node <%s>\n",
- ChrPtr(mptr->Value[0]));
+ ChrPtr(Recipient));
send = 0;
}
sizeof buf);
QN_syslog(LOG_DEBUG, "Compare <%s> to <%s>\n",
- buf, ChrPtr(mptr->Value[0])) ;
- if (!strcasecmp(buf, ChrPtr(mptr->Value[0]))) {
+ buf, ChrPtr(Recipient)) ;
+ if (!strcasecmp(buf, ChrPtr(Recipient))) {
send = 0;
break;
}
QN_syslog(LOG_INFO,
"%sSending to %s\n",
(send)?"":"Not ",
- ChrPtr(mptr->Value[0]));
+ ChrPtr(Recipient));
}
/* Send the message */
if (msg->cm_fields['C'] != NULL) {
free(msg->cm_fields['C']);
}
- if (StrLength(mptr->Value[0]) > 0) {
+ if (StrLength(Recipient) > 0) {
msg->cm_fields['C'] =
- strdup(ChrPtr(mptr->Value[0]));
+ strdup(ChrPtr(Recipient));
}
else {
msg->cm_fields['C'] =
sizeof(filename),
"%s/%s@%lx%x",
ctdl_netout_dir,
- ChrPtr(mptr->Value[0]),
+ ChrPtr(Recipient),
time(NULL),
rand()
);
}
}
FreeStrBuf(&Buf);
+ FreeStrBuf(&Recipient);
CtdlFreeMessage(msg);
}
*data = NULL;
}
+RoomNetCfg SpoolCfgs [4] = {
+ listrecp,
+ digestrecp,
+ participate,
+ ignet_push_share
+};
-
-/*
- * Batch up and send all outbound traffic from the current room
- */
-void network_spoolout_room(RoomProcList *room_to_spool,
- HashList *working_ignetcfg,
- HashList *the_netmap)
+int HaveSpoolConfig(OneRoomNetCfg* RNCfg)
{
- struct CitContext *CCC = CC;
- char buf[SIZ];
- SpoolControl sc;
int i;
+ int interested = 0;
+ for (i=0; i < 4; i++) if (RNCfg->NetConfigs[SpoolCfgs[i]] == NULL) interested = 1;
+ return interested;
+}
- memset(&sc, 0, sizeof(SpoolControl));
- sc.RNCfg = room_to_spool->OneRNCfg;
- sc.lastsent = room_to_spool->OneRNCfg->lastsent;
- sc.working_ignetcfg = working_ignetcfg;
- sc.the_netmap = the_netmap;
- if ((sc.RNCfg->NetConfigs[listrecp] == NULL) &&
- (sc.RNCfg->NetConfigs[digestrecp] == NULL) &&
- (sc.RNCfg->NetConfigs[participate] == NULL) &&
- (sc.RNCfg->NetConfigs[ignet_push_share] == NULL))
- {
- /* nothing to do for this room... */
- return;
- }
+
+void InspectQueuedRoom(SpoolControl **pSC,
+ RoomProcList *room_to_spool,
+ HashList *working_ignetcfg,
+ HashList *the_netmap)
+{
+ SpoolControl *sc;
+ int i = 0;
+
+ sc = (SpoolControl*)malloc(sizeof(SpoolControl));
+ memset(sc, 0, sizeof(SpoolControl));
+ sc->RNCfg = room_to_spool->OneRNCfg;
+ sc->lastsent = room_to_spool->lastsent;
+ sc->working_ignetcfg = working_ignetcfg;
+ sc->the_netmap = the_netmap;
/*
* If the room doesn't exist, don't try to perform its networking tasks.
* Normally this should never happen, but once in a while maybe a room gets
* queued for networking and then deleted before it can happen.
*/
- if (CtdlGetRoom(&CCC->room, room_to_spool->name) != 0) {
+ if (CtdlGetRoom(&sc->room, room_to_spool->name) != 0) {
syslog(LOG_CRIT, "ERROR: cannot load <%s>\n", room_to_spool->name);
+ free(sc);
+ return;
+ }
+ if (sc->room.QRhighest <= sc->lastsent)
+ {
+ syslog(LOG_DEBUG, "nothing to do for <%s>\n", room_to_spool->name);
+ free(sc);
+ return;
+ }
+
+ if (sc->RNCfg == NULL)
+ sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
+
+ if (!HaveSpoolConfig(sc->RNCfg))
+ {
+ free(sc);
+ /* nothing to do for this room... */
return;
}
+ /* Now lets remember whats needed for the actual work... */
+
+ for (i=0; i < 4; i++)
+ {
+ aggregate_recipients(&sc->Users[SpoolCfgs[i]], SpoolCfgs[i], sc->RNCfg);
+ }
+ if (StrLength(sc->RNCfg->Sender) > 0)
+ sc->Users[roommailalias] = NewStrBufDup(sc->RNCfg->Sender);
+
+ sc->next = *pSC;
+ *pSC = sc;
+
+}
+
+
+/*
+ * Batch up and send all outbound traffic from the current room
+ */
+void network_spoolout_room(SpoolControl *sc)
+{
+ struct CitContext *CCC = CC;
+ char buf[SIZ];
+ int i;
+ long lastsent;
+
+ /*
+ * If the room doesn't exist, don't try to perform its networking tasks.
+ * Normally this should never happen, but once in a while maybe a room gets
+ * queued for networking and then deleted before it can happen.
+ */
+ memcpy (&CCC->room, &sc->room, sizeof(ctdlroom));
+
syslog(LOG_INFO, "Networking started for <%s>\n", CCC->room.QRname);
/* If there are digest recipients, we have to build a digest */
- if (sc.RNCfg->NetConfigs[digestrecp] != NULL) {
- sc.digestfp = tmpfile();
- fprintf(sc.digestfp, "Content-type: text/plain\n\n");
+ if (sc->Users[digestrecp] != NULL) {
+ sc->digestfp = tmpfile();
+ fprintf(sc->digestfp, "Content-type: text/plain\n\n");
}
+ /* remember where we started... */
+ lastsent = sc->lastsent;
+
/* Do something useful */
- CtdlForEachMessage(MSGS_GT, sc.lastsent, NULL, NULL, NULL,
- network_spool_msg, &sc);
+ CtdlForEachMessage(MSGS_GT, sc->lastsent, NULL, NULL, NULL,
+ network_spool_msg, sc);
/* If we wrote a digest, deliver it and then close it */
- if (StrLength(sc.RNCfg->Sender) > 0)
+ if (StrLength(sc->Users[roommailalias]) > 0)
{
long len;
- len = StrLength(sc.RNCfg->Sender);
+ len = StrLength(sc->Users[roommailalias]);
if (len + 1 > sizeof(buf))
len = sizeof(buf) - 1;
- memcpy(buf, ChrPtr(sc.RNCfg->Sender), len);
+ memcpy(buf, ChrPtr(sc->Users[roommailalias]), len);
buf[len] = '\0';
}
else
buf[i] = tolower(buf[i]);
if (isspace(buf[i])) buf[i] = '_';
}
- if (sc.digestfp != NULL) {
- fprintf(sc.digestfp,
+ if (sc->digestfp != NULL) {
+ fprintf(sc->digestfp,
" -----------------------------------"
"------------------------------------"
"-------\n"
"To post to the list: %s\n",
CCC->room.QRname, buf
);
- network_deliver_digest(&sc); /* deliver and close */
+ network_deliver_digest(sc); /* deliver and close */
}
/* Now rewrite the config file */
- if (sc.lastsent != room_to_spool->OneRNCfg->lastsent)
+ if (sc->lastsent != lastsent)
{
- room_to_spool->OneRNCfg->lastsent = sc.lastsent;
- room_to_spool->OneRNCfg->changed = 1;
+ sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
+
+ sc->RNCfg->lastsent = sc->lastsent;
+ sc->RNCfg->changed = 1;
}
end_critical_section(S_NETCONFIGS);
}
projects / citadel.git / commitdiff