* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
- * Copyright (c) 2000-2016 by the citadel.org team
+ * Copyright (c) 2000-2017 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.
long len;
struct CtdlMessage *msg = *pMsg;
*pMsg = NULL;
- syslog(LOG_DEBUG, "entering network_bounce()");
+ syslog(LOG_DEBUG, "netspool: entering network_bounce()");
if (msg == NULL) return;
/* Clean up */
if (valid != NULL) free_recipients(valid);
CM_Free(msg);
- syslog(LOG_DEBUG, "leaving network_bounce()");
+ syslog(LOG_DEBUG, "netspool: leaving network_bounce()");
}
SpoolControl *sc;
int i = 0;
- syslog(LOG_INFO, "InspectQueuedRoom(%s)", room_to_spool->name);
+ syslog(LOG_INFO, "netspool: InspectQueuedRoom(%s)", room_to_spool->name);
sc = (SpoolControl*)malloc(sizeof(SpoolControl));
memset(sc, 0, sizeof(SpoolControl));
* queued for networking and then deleted before it can happen.
*/
if (CtdlGetRoom(&sc->room, room_to_spool->name) != 0) {
- syslog(LOG_INFO, "ERROR: cannot load <%s>", room_to_spool->name);
+ syslog(LOG_INFO, "netspool: ERROR; cannot load <%s>", room_to_spool->name);
free(sc);
return;
}
sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
- syslog(LOG_DEBUG, "Room <%s> highest=%ld lastsent=%ld", room_to_spool->name, sc->room.QRhighest, sc->RNCfg->lastsent);
+ syslog(LOG_DEBUG, "netspool: room <%s> highest=%ld lastsent=%ld", room_to_spool->name, sc->room.QRhighest, sc->RNCfg->lastsent);
if ( (!HaveSpoolConfig(sc->RNCfg)) || (sc->room.QRhighest <= sc->RNCfg->lastsent) )
{
// There is nothing to send from this room.
- MARK_syslog(LOG_DEBUG, "Nothing to do for <%s>", room_to_spool->name);
+ syslog(LOG_DEBUG, "netspool: nothing to do for <%s>", room_to_spool->name);
FreeRoomNetworkStruct(&sc->RNCfg);
sc->RNCfg = NULL;
free(sc);
void CalcListID(SpoolControl *sc)
{
StrBuf *RoomName;
- 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);
+ // Load the room banner as the list description
+ struct CtdlMessage *msg = CtdlFetchMessage(sc->room.msgnum_info, 1, 1);
+ if (msg != NULL) {
+ CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+ CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_NONE, 0, 0, 0);
+ CM_Free(msg);
+ sc->RoomInfo = CC->redirect_buffer;
+ CC->redirect_buffer = NULL;
+ }
+ else {
+ sc->RoomInfo = NewStrBufPlain(NULL, SIZ);
}
+ // Calculate the List ID
sc->ListID = NewStrBufPlain(NULL, 1024);
if (StrLength(sc->RoomInfo) > 0)
{
FreeStrBuf(&RoomName);
}
-static time_t last_digest_delivery = 0;
/*
* Batch up and send all outbound traffic from the current room
*/
memcpy (&CCC->room, &sc->room, sizeof(ctdlroom));
- syslog(LOG_INFO, "network_spoolout_room(room=%s, lastsent=%ld)", CCC->room.QRname, sc->lastsent);
+ syslog(LOG_INFO, "netspool: network_spoolout_room(room=%s, lastsent=%ld)", CCC->room.QRname, sc->lastsent);
CalcListID(sc);
}
else
{
- snprintf(buf, sizeof buf, "room_%s@%s",
- CCC->room.QRname, CtdlGetConfigStr("c_fqdn"));
+ snprintf(buf, sizeof buf, "room_%s@%s", CCC->room.QRname, CtdlGetConfigStr("c_fqdn"));
}
for (i=0; buf[i]; ++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) {
+ if ( (sc->Users[digestrecp] != NULL) && (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 */
fclose(sc->digestfp);
sc->digestfp = NULL;
+ remove_digest_file(&sc->room);
}
/* Now rewrite the netconfig */
- syslog(LOG_DEBUG, "lastsent was %ld , now it is %ld", lastsent, sc->lastsent);
+ syslog(LOG_DEBUG, "netspool: lastsent was %ld , now it is %ld", lastsent, sc->lastsent);
if (sc->lastsent != lastsent)
{
OneRoomNetCfg *r;
int network_usetable(struct CtdlMessage *msg)
{
StrBuf *msgid;
- struct CitContext *CCC = CC;
- time_t now;
/* Bail out if we can't generate a message ID */
if ((msg == NULL) || CM_IsEmpty(msg, emessageId))
return(0);
}
}
- now = time(NULL);
- if (CheckIfAlreadySeen("Networker Import",
- msgid,
- now, 0,
- eUpdate,
- CCC->cs_pid, 0) != 0)
- {
+ if (CheckIfAlreadySeen(msgid)) {
FreeStrBuf(&msgid);
return(1);
}
unsigned char firstbyte;
unsigned char lastbyte;
- syslog(LOG_DEBUG, "network_process_buffer() processing %ld bytes", size);
+ syslog(LOG_DEBUG, "netspool: network_process_buffer() processing %ld bytes", size);
/* Validate just a little bit. First byte should be FF and * last byte should be 00. */
firstbyte = buffer[0];
lastbyte = buffer[size-1];
if ( (firstbyte != 255) || (lastbyte != 0) ) {
- syslog(LOG_ERR, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d", size, firstbyte, lastbyte);
+ syslog(LOG_ERR, "netspool: corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d", size, firstbyte, lastbyte);
return;
}
time(NULL),
rand()
);
- syslog(LOG_DEBUG, "Appending to %s", filename);
+ syslog(LOG_DEBUG, "netspool: appending to %s", filename);
fp = fopen(filename, "ab");
if (fp != NULL) {
fwrite(sermsg.ser, sermsg.len, 1, fp);
"A message you sent could not be delivered due to an invalid address.\n"
"Please check the address and try sending the message again.\n");
free_recipients(recp);
- syslog(LOG_DEBUG, "Bouncing message due to invalid recipient address.");
+ syslog(LOG_DEBUG, "netspool: bouncing message due to invalid recipient address.");
return;
}
strcpy(target_room, ""); /* no target room if mail */
fp = fopen(filename, "rb");
if (fp == NULL) {
- syslog(LOG_CRIT, "Error opening %s: %s", filename, strerror(errno));
+ syslog(LOG_ERR, "%s: %s", filename, strerror(errno));
return;
}
fseek(fp, 0L, SEEK_END);
- syslog(LOG_INFO, "network: processing %ld bytes from %s", ftell(fp), filename);
+ syslog(LOG_INFO, "netspool: processing %ld bytes from %s", ftell(fp), filename);
rewind(fp);
/* Look for messages in the data stream and break them out */
}
if (nMessages > 0)
- syslog(LOG_INFO, "network: processed %d messages in %s", nMessages, filename);
+ syslog(LOG_INFO, "netspool: processed %d messages in %s", nMessages, filename);
fclose(fp);
unlink(filename);
*/
if (stat(ctdl_netin_dir, &statbuf)) return;
if (statbuf.st_mtime == last_spoolin_mtime) {
- MARKM_syslog(LOG_DEBUG, "network: nothing in inbound queue");
+ syslog(LOG_DEBUG, "netspool: nothing in inbound queue");
return;
}
last_spoolin_mtime = statbuf.st_mtime;
- MARKM_syslog(LOG_DEBUG, "network: processing inbound queue");
+ syslog(LOG_DEBUG, "netspool: processing inbound queue");
/*
* Ok, there's something interesting in there, so scan it.
int nFailed = 0;
int d_type = 0;
-
/* Step 1: consolidate files in the outbound queue into one file per neighbor node */
d = (struct dirent *)malloc(offsetof(struct dirent, d_name) + PATH_MAX + 1);
if (d == NULL) return;
ctdl_netout_dir,
ChrPtr(NextHop));
- syslog(LOG_DEBUG, "Consolidate %s to %s", filename, ChrPtr(NextHop));
+ syslog(LOG_DEBUG, "netspool: consolidate %s to %s", filename, ChrPtr(NextHop));
if (CtdlNetworkTalkingTo(SKEY(NextHop), NTT_CHECK)) {
nFailed++;
- syslog(LOG_DEBUG, "Currently online with %s - skipping for now", ChrPtr(NextHop));
+ syslog(LOG_DEBUG, "netspool: currently online with %s - skipping for now", ChrPtr(NextHop));
}
else {
size_t dsize;
infd = open(filename, O_RDONLY);
if (infd == -1) {
nFailed++;
- syslog(LOG_ERR,
- "failed to open %s for reading due to %s; skipping.",
- filename, strerror(errno)
- );
+ syslog(LOG_ERR, "%s: %s", filename, strerror(errno));
CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE);
continue;
}
}
if (outfd == -1) {
nFailed++;
- syslog(LOG_ERR,
- "failed to open %s for reading due to %s; skipping.",
- spooloutfilename, strerror(errno)
- );
+ syslog(LOG_ERR, "%s: %s", spooloutfilename, strerror(errno));
close(infd);
CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE);
continue;
fstat(infd, &statbuf);
fsize = statbuf.st_size;
-/*
- fsize = lseek(infd, 0, SEEK_END);
-*/
IOB.fd = infd;
FDIOBufferInit(&FDIO, &IOB, outfd, fsize + dsize);
FDIO.ChunkSendRemain = fsize;
do {} while ((FileMoveChunked(&FDIO, &err) > 0) && (err == NULL));
if (err == NULL) {
unlink(filename);
- syslog(LOG_DEBUG, "Spoolfile %s now "SIZE_T_FMT" KB", spooloutfilename, (dsize + fsize)/1024);
+ syslog(LOG_DEBUG, "netspool: spoolfile %s now "SIZE_T_FMT" KB", spooloutfilename, (dsize + fsize)/1024);
}
else {
nFailed++;
- syslog(LOG_ERR, "failed to append to %s [%s]; rolling back..", spooloutfilename, strerror(errno));
+ syslog(LOG_ERR, "netspool: failed to append to %s [%s]; rolling back..", spooloutfilename, strerror(errno));
/* whoops partial append?? truncate spooloutfilename again! */
ftruncate(outfd, dsize);
}
if (nFailed > 0) {
FreeStrBuf(&NextHop);
- syslog(LOG_INFO, "skipping Spoolcleanup because of %d files unprocessed.", nFailed);
+ syslog(LOG_INFO, "netspool: skipping Spoolcleanup because of %d files unprocessed.", nFailed);
return;
}
}
-
/*
* It's ok if these directories already exist. Just fail silently.
*/
void create_spool_dirs(void) {
if ((mkdir(ctdl_spool_dir, 0700) != 0) && (errno != EEXIST))
- syslog(LOG_EMERG, "unable to create directory [%s]: %s", ctdl_spool_dir, strerror(errno));
+ syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_spool_dir, strerror(errno));
if (chown(ctdl_spool_dir, CTDLUID, (-1)) != 0)
- syslog(LOG_EMERG, "unable to set the access rights for [%s]: %s", ctdl_spool_dir, strerror(errno));
+ syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_spool_dir, strerror(errno));
if ((mkdir(ctdl_netin_dir, 0700) != 0) && (errno != EEXIST))
- syslog(LOG_EMERG, "unable to create directory [%s]: %s", ctdl_netin_dir, strerror(errno));
+ syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_netin_dir, strerror(errno));
if (chown(ctdl_netin_dir, CTDLUID, (-1)) != 0)
- syslog(LOG_EMERG, "unable to set the access rights for [%s]: %s", ctdl_netin_dir, strerror(errno));
+ syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_netin_dir, strerror(errno));
if ((mkdir(ctdl_nettmp_dir, 0700) != 0) && (errno != EEXIST))
- syslog(LOG_EMERG, "unable to create directory [%s]: %s", ctdl_nettmp_dir, strerror(errno));
+ syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_nettmp_dir, strerror(errno));
if (chown(ctdl_nettmp_dir, CTDLUID, (-1)) != 0)
- syslog(LOG_EMERG, "unable to set the access rights for [%s]: %s", ctdl_nettmp_dir, strerror(errno));
+ syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_nettmp_dir, strerror(errno));
if ((mkdir(ctdl_netout_dir, 0700) != 0) && (errno != EEXIST))
- syslog(LOG_EMERG, "unable to create directory [%s]: %s", ctdl_netout_dir, strerror(errno));
+ syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_netout_dir, strerror(errno));
if (chown(ctdl_netout_dir, CTDLUID, (-1)) != 0)
- syslog(LOG_EMERG, "unable to set the access rights for [%s]: %s", ctdl_netout_dir, strerror(errno));
+ syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_netout_dir, strerror(errno));
}
/*
projects / citadel.git / blobdiff