* 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-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.
+ * 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
#include <sys/wait.h>
#include <string.h>
#include <limits.h>
+#include <assert.h>
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#endif
+/*
+ * Bounce a message back to the sender
+ */
+void network_bounce(struct CtdlMessage **pMsg, char *reason)
+{
+ char buf[SIZ];
+ char bouncesource[SIZ];
+ char recipient[SIZ];
+ recptypes *valid = NULL;
+ char force_room[ROOMNAMELEN];
+ static int serialnum = 0;
+ long len;
+ struct CtdlMessage *msg = *pMsg;
+ *pMsg = NULL;
+ syslog(LOG_DEBUG, "netspool: entering network_bounce()");
+
+ if (msg == NULL) return;
+
+ snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, CtdlGetConfigStr("c_nodename"));
+
+ /*
+ * Give it a fresh message ID
+ */
+ len = snprintf(buf, sizeof(buf),
+ "%ld.%04lx.%04x@%s",
+ (long)time(NULL),
+ (long)getpid(),
+ ++serialnum,
+ CtdlGetConfigStr("c_fqdn"));
+
+ CM_SetField(msg, emessageId, buf, len);
+
+ /*
+ * FIXME ... right now we're just sending a bounce; we really want to
+ * include the text of the bounced message.
+ */
+ if (!IsEmptyStr(reason)) {
+ CM_SetField(msg, eMesageText, reason, strlen(reason));
+ }
+ msg->cm_format_type = 0;
+
+ /*
+ * Turn the message around
+ */
+ CM_FlushField(msg, eRecipient);
+ CM_FlushField(msg, eDestination);
+
+ len = snprintf(recipient, sizeof(recipient), "%s@%s",
+ msg->cm_fields[eAuthor],
+ msg->cm_fields[eNodeName]);
+
+ CM_SetField(msg, eAuthor, HKEY(BOUNCESOURCE));
+ CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
+ CM_SetField(msg, eMsgSubject, HKEY("Delivery Status Notification (Failure)"));
+
+ Netmap_AddMe(msg, HKEY("unknown_user"));
+
+ /* Now submit the message */
+ valid = validate_recipients(recipient, NULL, 0);
+ if (valid != NULL) if (valid->num_error != 0) {
+ free_recipients(valid);
+ valid = NULL;
+ }
+ if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) {
+ strcpy(force_room, CtdlGetConfigStr("c_aideroom"));
+ }
+ else {
+ strcpy(force_room, "");
+ }
+ if ( (valid == NULL) && IsEmptyStr(force_room) ) {
+ strcpy(force_room, CtdlGetConfigStr("c_aideroom"));
+ }
+ CtdlSubmitMsg(msg, valid, force_room, 0);
+
+ /* Clean up */
+ if (valid != NULL) free_recipients(valid);
+ CM_Free(msg);
+ syslog(LOG_DEBUG, "netspool: leaving network_bounce()");
+}
+
+
void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
{
RoomNetCfgLine *nptr;
if (CM_IsEmpty(msg, eMessagePath)) {
CM_SetField(msg, eMessagePath, defl, defllen);
}
- node_len = configlen.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);
SpoolControl *sc;
int i = 0;
+ syslog(LOG_INFO, "netspool: InspectQueuedRoom(%s)", room_to_spool->name);
+
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;
* queued for networking and then deleted before it can happen.
*/
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);
+ syslog(LOG_INFO, "netspool: ERROR; cannot load <%s>", room_to_spool->name);
free(sc);
return;
}
- begin_critical_section(S_NETCONFIGS);
- if (sc->RNCfg == NULL)
- sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
+ assert(sc->RNCfg == NULL); // checking to make sure we cleared it from last time
+
+ sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
- if (!HaveSpoolConfig(sc->RNCfg))
+ 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) )
{
- end_critical_section(S_NETCONFIGS);
+ // There is nothing to send from this room.
+ syslog(LOG_DEBUG, "netspool: nothing to do for <%s>", room_to_spool->name);
+ FreeRoomNetworkStruct(&sc->RNCfg);
+ sc->RNCfg = NULL;
free(sc);
- /* nothing to do for this room... */
return;
}
+ sc->lastsent = sc->RNCfg->lastsent;
+ room_to_spool->lastsent = sc->lastsent;
+
/* 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]);
+ aggregate_recipients(&sc->Users[SpoolCfgs[i]], SpoolCfgs[i], sc->RNCfg, SpoolCfgsCopyN[i]);
}
- if (StrLength(sc->RNCfg->Sender) > 0)
+ if (StrLength(sc->RNCfg->Sender) > 0) {
sc->Users[roommailalias] = NewStrBufDup(sc->RNCfg->Sender);
- end_critical_section(S_NETCONFIGS);
+ }
sc->next = *pSC;
*pSC = sc;
+ FreeRoomNetworkStruct(&sc->RNCfg); // done with this for now, we'll grab it again next time
+ sc->RNCfg = NULL;
}
+
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)
{
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
*/
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->Users[digestrecp] != NULL) {
-
- sc->digestfp = create_digest_file(&sc->room);
- sc->newDigest = ftell(sc->digestfp) > 0;
- if (sc->newDigest) {
- fprintf(sc->digestfp, "Content-type: text/plain\n\n");
- }
- }
+ syslog(LOG_INFO, "netspool: network_spoolout_room(room=%s, lastsent=%ld)", CCC->room.QRname, sc->lastsent);
CalcListID(sc);
lastsent = sc->lastsent;
/* Fetch the messages we ought to send & prepare them. */
- 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 (StrLength(sc->Users[roommailalias]) > 0)
{
}
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) {
/* If we wrote a digest, deliver it and then close it */
- if (sc->digestfp != 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) )
- {
- 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 */
- }
+ 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 config file */
+ /* Now rewrite the netconfig */
+ syslog(LOG_DEBUG, "netspool: lastsent was %ld , now it is %ld", lastsent, sc->lastsent);
if (sc->lastsent != lastsent)
{
- begin_critical_section(S_NETCONFIGS);
- sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
+ OneRoomNetCfg *r;
- sc->RNCfg->lastsent = sc->lastsent;
- sc->RNCfg->changed = 1;
+ begin_critical_section(S_NETCONFIGS);
+ r = CtdlGetNetCfgForRoom(sc->room.QRnumber);
+ r->lastsent = sc->lastsent;
+ SaveRoomNetConfigFile(r, sc->room.QRnumber);
+ FreeRoomNetworkStruct(&r);
end_critical_section(S_NETCONFIGS);
}
}
+
+/*
+ * Check the use table. This is a list of messages which have recently
+ * arrived on the system. It is maintained and queried to prevent the same
+ * message from being entered into the database multiple times if it happens
+ * to arrive multiple times by accident.
+ */
+int network_usetable(struct CtdlMessage *msg)
+{
+ StrBuf *msgid;
+
+ /* Bail out if we can't generate a message ID */
+ if ((msg == NULL) || CM_IsEmpty(msg, emessageId))
+ {
+ return(0);
+ }
+
+ /* Generate the message ID */
+ msgid = NewStrBufPlain(CM_KEY(msg, emessageId));
+ if (haschar(ChrPtr(msgid), '@') == 0) {
+ StrBufAppendBufPlain(msgid, HKEY("@"), 0);
+ if (!CM_IsEmpty(msg, eNodeName)) {
+ StrBufAppendBufPlain(msgid, CM_KEY(msg, eNodeName), 0);
+ }
+ else {
+ FreeStrBuf(&msgid);
+ return(0);
+ }
+ }
+ if (CheckIfAlreadySeen(msgid)) {
+ FreeStrBuf(&msgid);
+ return(1);
+ }
+ FreeStrBuf(&msgid);
+
+ return(0);
+}
+
+
/*
* Process a buffer containing a single message from a single file
* from the inbound queue
void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, HashList *the_netmap, int *netmap_changed)
{
long len;
- struct CitContext *CCC = CC;
StrBuf *Buf = NULL;
struct CtdlMessage *msg = NULL;
long pos;
unsigned char firstbyte;
unsigned char lastbyte;
- QN_syslog(LOG_DEBUG, "network_process_buffer() processing %ld bytes\n", 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) ) {
- QN_syslog(LOG_ERR, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d\n",
- size, firstbyte, lastbyte);
+ syslog(LOG_ERR, "netspool: corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d", size, firstbyte, lastbyte);
return;
}
/* 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));
time(NULL),
rand()
);
- QN_syslog(LOG_DEBUG, "Appending to %s\n", filename);
+ syslog(LOG_DEBUG, "netspool: appending to %s", 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));
+ syslog(LOG_ERR, "%s: %s", filename, strerror(errno));
}
free(sermsg.ser);
CM_Free(msg);
else { /* invalid destination node name */
FreeStrBuf(&Buf);
- network_bounce(msg,
+ network_bounce(&msg,
"A message you sent could not be delivered due to an invalid destination node"
" name. Please check the address and try sending the message again.\n");
- msg = NULL;
return;
}
else if (!CM_IsEmpty(msg, eRecipient)) {
recp = validate_recipients(msg->cm_fields[eRecipient], NULL, 0);
if (recp != NULL) if (recp->num_error != 0) {
- network_bounce(msg,
+ network_bounce(&msg,
"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");
- msg = NULL;
free_recipients(recp);
- QNM_syslog(LOG_DEBUG, "Bouncing message due to invalid recipient address.\n");
+ syslog(LOG_DEBUG, "netspool: bouncing message due to invalid recipient address.");
return;
}
strcpy(target_room, ""); /* no target room if mail */
HashList *the_netmap,
int *netmap_changed)
{
- struct CitContext *CCC = CC;
FILE *fp;
long msgstart = (-1L);
long msgend = (-1L);
fp = fopen(filename, "rb");
if (fp == NULL) {
- QN_syslog(LOG_CRIT, "Error opening %s: %s\n", filename, strerror(errno));
+ syslog(LOG_ERR, "%s: %s", filename, strerror(errno));
return;
}
fseek(fp, 0L, SEEK_END);
- QN_syslog(LOG_INFO, "network: processing %ld bytes from %s\n", 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)
- QN_syslog(LOG_INFO,
- "network: processed %d messages in %s\n",
- nMessages,
- filename);
+ syslog(LOG_INFO, "netspool: processed %d messages in %s", nMessages, filename);
fclose(fp);
unlink(filename);
*/
void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *netmap_changed)
{
- struct CitContext *CCC = CC;
DIR *dp;
struct dirent *d;
struct dirent *filedir_entry;
*/
if (stat(ctdl_netin_dir, &statbuf)) return;
if (statbuf.st_mtime == last_spoolin_mtime) {
- QNM_syslog(LOG_DEBUG, "network: nothing in inbound queue\n");
+ syslog(LOG_DEBUG, "netspool: nothing in inbound queue");
return;
}
last_spoolin_mtime = statbuf.st_mtime;
- QNM_syslog(LOG_DEBUG, "network: processing inbound queue\n");
+ syslog(LOG_DEBUG, "netspool: processing inbound queue");
/*
* Ok, there's something interesting in there, so scan it.
}
/*
- * Step 1: consolidate files in the outbound queue into one file per neighbor node
- * Step 2: delete any files in the outbound queue that were for neighbors who no longer exist.
+ * delete any files in the outbound queue that were for neighbors who no longer exist.
*/
void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netmap)
{
- struct CitContext *CCC = CC;
- IOBuffer IOB;
- FDIOBuffer FDIO;
int d_namelen;
DIR *dp;
struct dirent *d;
struct dirent *filedir_entry;
const char *pch;
- char spooloutfilename[PATH_MAX];
char filename[PATH_MAX];
const StrBuf *nexthop;
StrBuf *NextHop;
int i;
- struct stat statbuf;
- int nFailed = 0;
int d_type = 0;
+ return; // FIXME still trying to figure this out
- /* 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;
-
- dp = opendir(ctdl_netout_dir);
- if (dp == NULL) {
- free(d);
- return;
- }
-
- NextHop = NewStrBuf();
- memset(&IOB, 0, sizeof(IOBuffer));
- memset(&FDIO, 0, sizeof(FDIOBuffer));
- FDIO.IOB = &IOB;
-
- while ((readdir_r(dp, d, &filedir_entry) == 0) &&
- (filedir_entry != NULL))
- {
-#ifdef _DIRENT_HAVE_D_NAMLEN
- d_namelen = filedir_entry->d_namlen;
-
-#else
- d_namelen = strlen(filedir_entry->d_name);
-#endif
-
-#ifdef _DIRENT_HAVE_D_TYPE
- d_type = filedir_entry->d_type;
-#else
- d_type = DT_UNKNOWN;
-#endif
- if (d_type == DT_DIR)
- continue;
-
- if ((d_namelen > 1) && filedir_entry->d_name[d_namelen - 1] == '~')
- continue; /* Ignore backup files... */
-
- if ((d_namelen == 1) &&
- (filedir_entry->d_name[0] == '.'))
- continue;
-
- if ((d_namelen == 2) &&
- (filedir_entry->d_name[0] == '.') &&
- (filedir_entry->d_name[1] == '.'))
- continue;
-
- pch = strchr(filedir_entry->d_name, '@');
- if (pch == NULL)
- continue;
-
- snprintf(filename,
- sizeof filename,
- "%s/%s",
- ctdl_netout_dir,
- filedir_entry->d_name);
-
- StrBufPlain(NextHop,
- filedir_entry->d_name,
- pch - filedir_entry->d_name);
-
- snprintf(spooloutfilename,
- sizeof spooloutfilename,
- "%s/%s",
- ctdl_netout_dir,
- ChrPtr(NextHop));
-
- QN_syslog(LOG_DEBUG, "Consolidate %s to %s\n", filename, ChrPtr(NextHop));
- if (CtdlNetworkTalkingTo(SKEY(NextHop), NTT_CHECK)) {
- nFailed++;
- QN_syslog(LOG_DEBUG,
- "Currently online with %s - skipping for now\n",
- ChrPtr(NextHop)
- );
- }
- else {
- size_t dsize;
- size_t fsize;
- int infd, outfd;
- const char *err = NULL;
- CtdlNetworkTalkingTo(SKEY(NextHop), NTT_ADD);
-
- infd = open(filename, O_RDONLY);
- if (infd == -1) {
- nFailed++;
- QN_syslog(LOG_ERR,
- "failed to open %s for reading due to %s; skipping.\n",
- filename, strerror(errno)
- );
- CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE);
- continue;
- }
-
- outfd = open(spooloutfilename,
- O_EXCL|O_CREAT|O_NONBLOCK|O_WRONLY,
- S_IRUSR|S_IWUSR);
- if (outfd == -1)
- {
- outfd = open(spooloutfilename,
- O_EXCL|O_NONBLOCK|O_WRONLY,
- S_IRUSR | S_IWUSR);
- }
- if (outfd == -1) {
- nFailed++;
- QN_syslog(LOG_ERR,
- "failed to open %s for reading due to %s; skipping.\n",
- spooloutfilename, strerror(errno)
- );
- close(infd);
- CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE);
- continue;
- }
-
- dsize = lseek(outfd, 0, SEEK_END);
- lseek(outfd, -dsize, SEEK_SET);
-
- 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;
- FDIO.TotalSentAlready = dsize;
- err = NULL;
- errno = 0;
- do {} while ((FileMoveChunked(&FDIO, &err) > 0) && (err == NULL));
- if (err == NULL) {
- unlink(filename);
- QN_syslog(LOG_DEBUG,
- "Spoolfile %s now "SIZE_T_FMT" k\n",
- spooloutfilename,
- (dsize + fsize)/1024
- );
- }
- else {
- nFailed++;
- QN_syslog(LOG_ERR,
- "failed to append to %s [%s]; rolling back..\n",
- spooloutfilename, strerror(errno)
- );
- /* whoops partial append?? truncate spooloutfilename again! */
- ftruncate(outfd, dsize);
- }
- FDIOBufferDelete(&FDIO);
- close(infd);
- close(outfd);
- CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE);
- }
- }
- closedir(dp);
-
- if (nFailed > 0) {
- FreeStrBuf(&NextHop);
- QN_syslog(LOG_INFO,
- "skipping Spoolcleanup because of %d files unprocessed.\n",
- nFailed
- );
-
- return;
- }
-
- /* Step 2: delete any files in the outbound queue that were for neighbors who no longer exist */
dp = opendir(ctdl_netout_dir);
if (dp == NULL) {
FreeStrBuf(&NextHop);
}
-
/*
* 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));
}
/*