void ParseRoomAlias(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg)
{
-/*
- if (rncfg->RNCfg->sender != NULL)
- continue; / * just one alowed... * /
- extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
- rncfg->RNCfg->sender = nptr;
-*/
+ if (rncfg->Sender != NULL)
+ return;
+
+ ParseGeneric(ThisOne, Line, LinePos, rncfg);
+ rncfg->Sender = NewStrBufDup(rncfg->NetConfigs[roommailalias]->Value[0]);
}
void ParseSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
*data = NULL;
}
+static const RoomNetCfg SpoolCfgs [4] = {
+ listrecp,
+ digestrecp,
+ participate,
+ ignet_push_share
+};
+static const long SpoolCfgsCopyN [4] = {
+ 1, 1, 1, 2
+};
-
-/*
- * 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,
+ SpoolCfgsCopyN[i]);
+ }
+ if (StrLength(sc->RNCfg->Sender) > 0)
+ sc->Users[roommailalias] = NewStrBufDup(sc->RNCfg->Sender);
+
+ sc->next = *pSC;
+ *pSC = sc;
+
+}
+
+void CalcListID(SpoolControl *sc)
+{
+ const char *err;
+ int fd;
+ struct CitContext *CCC = CC;
+ char filename[PATH_MAX];
+#define MAX_LISTIDLENGTH 150
+
+ assoc_file_name(filename, sizeof filename, &sc->room, ctdl_info_dir);
+ fd = open(filename, 0);
+
+ if (fd != 0) {
+ struct stat stbuf;
+
+ if ((fstat(fd, &stbuf) == 0) &&
+ (stbuf.st_size > 0))
+ {
+ sc->RoomInfo = NewStrBufPlain(NULL, stbuf.st_size + 1);
+ StrBufReadBLOB(sc->RoomInfo, &fd, 0, stbuf.st_size, &err);
+ }
+ close(fd);
+ }
+
+ sc->ListID = NewStrBufPlain(NULL, 1024);
+ if (StrLength(sc->RoomInfo) > 0)
+ {
+ const char *Pos = NULL;
+ StrBufSipLine(sc->ListID, sc->RoomInfo, &Pos);
+
+ if (StrLength(sc->ListID) > MAX_LISTIDLENGTH)
+ {
+ StrBufCutAt(sc->ListID, MAX_LISTIDLENGTH, NULL);
+ StrBufAppendBufPlain(sc->ListID, HKEY("..."), 0);
+ }
+ StrBufAsciify(sc->ListID, ' ');
+ }
+ else
+ {
+ StrBufAppendBufPlain(sc->ListID, CCC->room.QRname, -1, 0);
+ }
+
+ StrBufAppendBufPlain(sc->ListID, HKEY("<"), 0);
+
+ if (StrLength(sc->Users[roommailalias]) > 0)
+ {
+ long Pos;
+ const char *AtPos;
+
+ Pos = StrLength(sc->ListID);
+ StrBufAppendBuf(sc->ListID, sc->Users[roommailalias], 0);
+ AtPos = strchr(ChrPtr(sc->ListID) + Pos, '@');
+
+ if (AtPos != NULL)
+ {
+ StrBufPeek(sc->ListID, AtPos, 0, '.');
+ }
+ }
+ else
+ {
+ StrBufAppendBufPlain(sc->ListID, HKEY("room_"), 0);
+ StrBufAppendBufPlain(sc->ListID, sc->room.QRname, -1, 0);
+ StrBufAppendBufPlain(sc->ListID, HKEY("."), 0);
+ StrBufAppendBufPlain(sc->ListID, config.c_fqdn, -1, 0);
+ /*
+ * this used to be:
+ * roomname <Room-Number.list-id.fqdn>
+ * according to rfc2919.txt it only has to be a uniq identifier
+ * under the domain of the system;
+ * in general MUAs use it to calculate the reply address nowadays.
+ */
+ }
+ StrBufAppendBufPlain(sc->ListID, HKEY(">"), 0);
+
+ if (StrLength(sc->Users[roommailalias]) == 0)
+ {
+ sc->Users[roommailalias] = NewStrBuf();
+
+ StrBufPrintf(sc->Users[roommailalias],
+ "room_%s@%s",
+ CCC->room.QRname,
+ config.c_fqdn);
+
+ StrBufAsciify(sc->Users[roommailalias], '_');
+ StrBufLowerCase(sc->Users[roommailalias]);
+ }
+
+}
+
+
+/*
+ * 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");
}
+ CalcListID(sc);
+
+ /* 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);
}
do {} while ((FileMoveChunked(&FDIO, &err) > 0) && (err == NULL));
if (err == NULL) {
unlink(filename);
+ QN_syslog(LOG_DEBUG,
+ "Spoolfile %s now %ld k\n",
+ spooloutfilename,
+ (dsize + fsize)/1024
+ );
}
else {
nFailed++;
closedir(dp);
}
+void free_spoolcontrol_struct(SpoolControl **sc)
+{
+ free_spoolcontrol_struct_members(*sc);
+ free(*sc);
+ *sc = NULL;
+}
+
+void free_spoolcontrol_struct_members(SpoolControl *sc)
+{
+ int i;
+ FreeStrBuf(&sc->RoomInfo);
+ FreeStrBuf(&sc->ListID);
+ for (i = 0; i < maxRoomNetCfg; i++)
+ FreeStrBuf(&sc->Users[i]);
+}
projects / citadel.git / blobdiff