* 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-2015 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
if (CM_IsEmpty(msg, eMessagePath)) {
CM_SetField(msg, eMessagePath, defl, defllen);
}
- node_len = strlen(config.c_nodename);
+ node_len = strlen(CtdlGetConfigStr("c_nodename"));
if (node_len >= SIZ)
node_len = SIZ - 1;
- memcpy(buf, config.c_nodename, node_len);
+ memcpy(buf, CtdlGetConfigStr("c_nodename"), node_len);
buf[node_len] = '!';
buf[node_len + 1] = '\0';
CM_PrependToField(msg, eMessagePath, buf, node_len + 1);
HashList *working_ignetcfg,
HashList *the_netmap)
{
+ struct CitContext *CCC = CC;
SpoolControl *sc;
int i = 0;
}
if (sc->room.QRhighest <= sc->lastsent)
{
- syslog(LOG_DEBUG, "nothing to do for <%s>\n", room_to_spool->name);
+ QN_syslog(LOG_DEBUG, "nothing to do for <%s>\n", room_to_spool->name);
free(sc);
return;
}
+ begin_critical_section(S_NETCONFIGS);
if (sc->RNCfg == NULL)
sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
if (!HaveSpoolConfig(sc->RNCfg))
{
+ end_critical_section(S_NETCONFIGS);
free(sc);
/* nothing to do for this room... */
return;
if (StrLength(sc->RNCfg->Sender) > 0)
sc->Users[roommailalias] = NewStrBufDup(sc->RNCfg->Sender);
+ end_critical_section(S_NETCONFIGS);
sc->next = *pSC;
*pSC = sc;
StrBufAppendBufPlain(sc->ListID, HKEY("room_"), 0);
StrBufAppendBuf(sc->ListID, RoomName, 0);
StrBufAppendBufPlain(sc->ListID, HKEY("."), 0);
- StrBufAppendBufPlain(sc->ListID, config.c_fqdn, -1, 0);
+ StrBufAppendBufPlain(sc->ListID, CtdlGetConfigStr("c_fqdn"), -1, 0);
/*
* this used to be:
* roomname <Room-Number.list-id.fqdn>
StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("room_"), 0);
StrBufAppendBuf(sc->Users[roommailalias], RoomName, 0);
StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("@"), 0);
- StrBufAppendBufPlain(sc->Users[roommailalias], config.c_fqdn, -1, 0);
+ StrBufAppendBufPlain(sc->Users[roommailalias], CtdlGetConfigStr("c_fqdn"), -1, 0);
StrBufLowerCase(sc->Users[roommailalias]);
}
FreeStrBuf(&RoomName);
}
+static time_t last_digest_delivery = 0;
/*
* Batch up and send all outbound traffic from the current room
syslog(LOG_INFO, "Networking started for <%s>\n", CCC->room.QRname);
- /* If there are digest recipients, we have to build a digest */
- if (sc->Users[digestrecp] != NULL) {
- sc->digestfp = tmpfile();
- fprintf(sc->digestfp, "Content-type: text/plain\n\n");
- }
-
CalcListID(sc);
/* remember where we started... */
lastsent = sc->lastsent;
- /* Do something useful */
+ /* Fetch the messages we ought to send & prepare them. */
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->Users[roommailalias]) > 0)
{
long len;
}
else
{
- snprintf(buf, sizeof buf, "room_%s@%s",
- CCC->room.QRname, config.c_fqdn);
+ snprintf(buf, sizeof buf, "room_%s@%s", CCC->room.QRname, CtdlGetConfigStr("c_fqdn"));
}
for (i=0; buf[i]; ++i) {
buf[i] = tolower(buf[i]);
if (isspace(buf[i])) buf[i] = '_';
}
+
+
+ /* If we wrote a digest, deliver it and then close it */
+ if (sc->Users[digestrecp] != NULL) {
+ time_t now = time(NULL);
+ time_t secs_today = now % (24 * 60 * 60);
+ long delta = 0;
+
+ if (last_digest_delivery != 0) {
+ delta = now - last_digest_delivery;
+ delta = (24 * 60 * 60) - delta;
+ }
+
+ if ((secs_today < 300) &&
+ (delta < 300))
+ {
+ if (sc->digestfp == NULL) {
+ sc->digestfp = create_digest_file(&sc->room, 0);
+ }
+ if (sc->digestfp != NULL) {
+ last_digest_delivery = now;
+ fprintf(sc->digestfp,
+ " -----------------------------------"
+ "------------------------------------"
+ "-------\n"
+ "You are subscribed to the '%s' "
+ "list.\n"
+ "To post to the list: %s\n",
+ CCC->room.QRname, buf
+ );
+ network_deliver_digest(sc); /* deliver */
+ remove_digest_file(&sc->room);
+ }
+ }
+ }
if (sc->digestfp != NULL) {
- fprintf(sc->digestfp,
- " -----------------------------------"
- "------------------------------------"
- "-------\n"
- "You are subscribed to the '%s' "
- "list.\n"
- "To post to the list: %s\n",
- CCC->room.QRname, buf
- );
- network_deliver_digest(sc); /* deliver and close */
+ fclose(sc->digestfp);
+ sc->digestfp = NULL;
}
/* Now rewrite the config file */
if (sc->lastsent != lastsent)
{
+ begin_critical_section(S_NETCONFIGS);
sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
sc->RNCfg->lastsent = sc->lastsent;
sc->RNCfg->changed = 1;
+ end_critical_section(S_NETCONFIGS);
}
- end_critical_section(S_NETCONFIGS);
}
/*
/* Check for message routing */
if (!CM_IsEmpty(msg, eDestination)) {
- if (strcasecmp(msg->cm_fields[eDestination], config.c_nodename)) {
+ if (strcasecmp(msg->cm_fields[eDestination], CtdlGetConfigStr("c_nodename"))) {
/* route the message */
Buf = NewStrBufPlain(CM_KEY(msg,eDestination));
(filedir_entry != NULL))
{
#ifdef _DIRENT_HAVE_D_NAMLEN
- d_namelen = filedir_entry->d_namelen;
+ d_namelen = filedir_entry->d_namlen;
#else
d_namelen = strlen(filedir_entry->d_name);
(filedir_entry != NULL))
{
#ifdef _DIRENT_HAVE_D_NAMLEN
- d_namelen = filedir_entry->d_namelen;
+ d_namelen = filedir_entry->d_namlen;
#else
d_namelen = strlen(filedir_entry->d_name);
(filedir_entry != NULL))
{
#ifdef _DIRENT_HAVE_D_NAMLEN
- d_namelen = filedir_entry->d_namelen;
+ d_namelen = filedir_entry->d_namlen;
#else
d_namelen = strlen(filedir_entry->d_name);