* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
- * Copyright (c) 2000-2015 by the citadel.org team
+ * Copyright (c) 2000-2016 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.
#include <sys/wait.h>
#include <string.h>
#include <limits.h>
+#include <assert.h>
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
*/
void network_bounce(struct CtdlMessage **pMsg, char *reason)
{
- struct CitContext *CCC = CC;
char buf[SIZ];
char bouncesource[SIZ];
char recipient[SIZ];
long len;
struct CtdlMessage *msg = *pMsg;
*pMsg = NULL;
- QNM_syslog(LOG_DEBUG, "entering network_bounce()\n");
+ syslog(LOG_DEBUG, "entering network_bounce()");
if (msg == NULL) return;
/* Clean up */
if (valid != NULL) free_recipients(valid);
CM_Free(msg);
- QNM_syslog(LOG_DEBUG, "leaving network_bounce()\n");
+ syslog(LOG_DEBUG, "leaving network_bounce()");
}
HashList *working_ignetcfg,
HashList *the_netmap)
{
- struct CitContext *CCC = CC;
SpoolControl *sc;
int i = 0;
+ syslog(LOG_INFO, "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)
- {
- QN_syslog(LOG_DEBUG, "nothing to do for <%s>\n", room_to_spool->name);
+ syslog(LOG_INFO, "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
- if (!HaveSpoolConfig(sc->RNCfg))
+ 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);
+ 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, "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;
*/
memcpy (&CCC->room, &sc->room, sizeof(ctdlroom));
- syslog(LOG_INFO, "Networking started for <%s>\n", CCC->room.QRname);
+ syslog(LOG_INFO, "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)
{
sc->digestfp = NULL;
}
- /* Now rewrite the config file */
+ /* Now rewrite the netconfig */
+ syslog(LOG_DEBUG, "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);
}
}
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, "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, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d", size, firstbyte, lastbyte);
return;
}
time(NULL),
rand()
);
- QN_syslog(LOG_DEBUG, "Appending to %s\n", filename);
+ syslog(LOG_DEBUG, "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);
"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);
- QNM_syslog(LOG_DEBUG, "Bouncing message due to invalid recipient address.\n");
+ syslog(LOG_DEBUG, "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_CRIT, "Error opening %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, "network: 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, "network: 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, "network: nothing in inbound queue");
return;
}
last_spoolin_mtime = statbuf.st_mtime;
- QNM_syslog(LOG_DEBUG, "network: processing inbound queue\n");
+ syslog(LOG_DEBUG, "network: processing inbound queue");
/*
* Ok, there's something interesting in there, so scan it.
*/
void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netmap)
{
- struct CitContext *CCC = CC;
IOBuffer IOB;
FDIOBuffer FDIO;
int d_namelen;
ctdl_netout_dir,
ChrPtr(NextHop));
- QN_syslog(LOG_DEBUG, "Consolidate %s to %s\n", filename, ChrPtr(NextHop));
+ syslog(LOG_DEBUG, "Consolidate %s to %s", filename, ChrPtr(NextHop));
if (CtdlNetworkTalkingTo(SKEY(NextHop), NTT_CHECK)) {
nFailed++;
- QN_syslog(LOG_DEBUG,
- "Currently online with %s - skipping for now\n",
- ChrPtr(NextHop)
- );
+ syslog(LOG_DEBUG, "Currently online with %s - skipping for now", ChrPtr(NextHop));
}
else {
size_t dsize;
infd = open(filename, O_RDONLY);
if (infd == -1) {
nFailed++;
- QN_syslog(LOG_ERR,
- "failed to open %s for reading due to %s; skipping.\n",
+ syslog(LOG_ERR,
+ "failed to open %s for reading due to %s; skipping.",
filename, strerror(errno)
- );
+ );
CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE);
continue;
}
}
if (outfd == -1) {
nFailed++;
- QN_syslog(LOG_ERR,
- "failed to open %s for reading due to %s; skipping.\n",
+ syslog(LOG_ERR,
+ "failed to open %s for reading due to %s; skipping.",
spooloutfilename, strerror(errno)
- );
+ );
close(infd);
CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE);
continue;
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
- );
+ syslog(LOG_DEBUG, "Spoolfile %s now "SIZE_T_FMT" KB", spooloutfilename, (dsize + fsize)/1024);
}
else {
nFailed++;
- QN_syslog(LOG_ERR,
- "failed to append to %s [%s]; rolling back..\n",
- spooloutfilename, strerror(errno)
- );
+ syslog(LOG_ERR, "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);
- QN_syslog(LOG_INFO,
- "skipping Spoolcleanup because of %d files unprocessed.\n",
- nFailed
- );
+ syslog(LOG_INFO, "skipping Spoolcleanup because of %d files unprocessed.", nFailed);
return;
}
projects / citadel.git / blobdiff