/*
- * $Id$
- *
* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
- * Copyright (C) 2000-2005 by Art Cancro and others.
- * This code is released under the terms of the GNU General Public License.
+ * Copyright (c) 2000-2011 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 as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
# include <time.h>
# endif
#endif
+#ifdef HAVE_SYSCALL_H
+# include <syscall.h>
+#else
+# if HAVE_SYS_SYSCALL_H
+# include <sys/syscall.h>
+# endif
+#endif
#include <sys/wait.h>
#include <string.h>
#include <limits.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
-#include "room_ops.h"
#include "user_ops.h"
-#include "policy.h"
#include "database.h"
#include "msgbase.h"
-#include "tools.h"
#include "internet_addressing.h"
#include "serv_network.h"
#include "clientsocket.h"
#include "file_ops.h"
#include "citadel_dirs.h"
+#include "threads.h"
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
+#include "context.h"
#include "ctdl_module.h"
-/* Nonzero while we are doing network processing */
-static int doing_queue = 0;
-
/*
* When we do network processing, it's accomplished in two passes; one to
* gather a list of rooms and one to actually do them. It's ok that rplist
/*
* We build a map of network nodes during processing.
*/
-struct NetMap *the_netmap = NULL;
+NetMap *the_netmap = NULL;
int netmap_changed = 0;
char *working_ignetcfg = NULL;
/*
* Keep track of what messages to reject
*/
-struct FilterList *load_filter_list(void) {
+FilterList *load_filter_list(void) {
char *serialized_list = NULL;
int i;
char buf[SIZ];
- struct FilterList *newlist = NULL;
- struct FilterList *nptr;
+ FilterList *newlist = NULL;
+ FilterList *nptr;
serialized_list = CtdlGetSysConfig(FILTERLIST);
if (serialized_list == NULL) return(NULL); /* if null, no entries */
/* Use the string tokenizer to grab one line at a time */
for (i=0; i<num_tokens(serialized_list, '\n'); ++i) {
extract_token(buf, serialized_list, i, '\n', sizeof buf);
- nptr = (struct FilterList *) malloc(sizeof(struct FilterList));
+ nptr = (FilterList *) malloc(sizeof(FilterList));
extract_token(nptr->fl_user, buf, 0, '|', sizeof nptr->fl_user);
striplt(nptr->fl_user);
extract_token(nptr->fl_room, buf, 1, '|', sizeof nptr->fl_room);
}
-void free_filter_list(struct FilterList *fl) {
+void free_filter_list(FilterList *fl) {
if (fl == NULL) return;
free_filter_list(fl->next);
free(fl);
cdbut = cdb_fetch(CDB_USETABLE, msgid, strlen(msgid));
if (cdbut != NULL) {
cdb_free(cdbut);
+ syslog(LOG_DEBUG, "network_usetable() : we already have %s\n", msgid);
return(1);
}
/* If we got to this point, it's unique: add it. */
strcpy(ut.ut_msgid, msgid);
ut.ut_timestamp = time(NULL);
- cdb_store(CDB_USETABLE, msgid, strlen(msgid),
- &ut, sizeof(struct UseTable) );
+ cdb_store(CDB_USETABLE, msgid, strlen(msgid), &ut, sizeof(struct UseTable) );
return(0);
}
char *serialized_map = NULL;
int i;
char buf[SIZ];
- struct NetMap *nmptr;
+ NetMap *nmptr;
serialized_map = CtdlGetSysConfig(IGNETMAP);
if (serialized_map == NULL) return; /* if null, no entries */
/* Use the string tokenizer to grab one line at a time */
for (i=0; i<num_tokens(serialized_map, '\n'); ++i) {
extract_token(buf, serialized_map, i, '\n', sizeof buf);
- nmptr = (struct NetMap *) malloc(sizeof(struct NetMap));
+ nmptr = (NetMap *) malloc(sizeof(NetMap));
extract_token(nmptr->nodename, buf, 0, '|', sizeof nmptr->nodename);
nmptr->lastcontact = extract_long(buf, 1);
extract_token(nmptr->nexthop, buf, 2, '|', sizeof nmptr->nexthop);
*/
void write_network_map(void) {
char *serialized_map = NULL;
- struct NetMap *nmptr;
+ NetMap *nmptr;
if (netmap_changed) {
char linebuf[SIZ];
char buf[SIZ];
int retval;
- struct NetMap *nmptr;
+ NetMap *nmptr;
if (node == NULL) {
return(-1);
* First try the neighbor nodes
*/
if (working_ignetcfg == NULL) {
- lprintf(CTDL_ERR, "working_ignetcfg is NULL!\n");
+ syslog(LOG_ERR, "working_ignetcfg is NULL!\n");
if (nexthop != NULL) {
strcpy(nexthop, "");
}
/*
* If we get to this point, the supplied node name is bogus.
*/
- lprintf(CTDL_ERR, "Invalid node name <%s>\n", node);
+ syslog(LOG_ERR, "Invalid node name <%s>\n", node);
return(-1);
}
void cmd_gnet(char *argbuf) {
- char filename[SIZ];
+ char filename[PATH_MAX];
char buf[SIZ];
FILE *fp;
- if (CtdlAccessCheck(ac_room_aide)) return;
+ if ( (CC->room.QRflags & QR_MAILBOX) && (CC->user.usernum == atol(CC->room.QRname)) ) {
+ /* users can edit the netconfigs for their own mailbox rooms */
+ }
+ else if (CtdlAccessCheck(ac_room_aide)) return;
+
assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
cprintf("%d Network settings for room #%ld <%s>\n",
LISTING_FOLLOWS,
void cmd_snet(char *argbuf) {
- char tempfilename[SIZ];
- char filename[SIZ];
- char buf[SIZ];
- FILE *fp;
+ char tempfilename[PATH_MAX];
+ char filename[PATH_MAX];
+ int TmpFD;
+ StrBuf *Line;
+ struct stat StatBuf;
+ long len;
+ int rc;
unbuffer_output();
- if (CtdlAccessCheck(ac_room_aide)) return;
- CtdlMakeTempFileName(tempfilename, sizeof tempfilename);
- assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
+ if ( (CC->room.QRflags & QR_MAILBOX) && (CC->user.usernum == atol(CC->room.QRname)) ) {
+ /* users can edit the netconfigs for their own mailbox rooms */
+ }
+ else if (CtdlAccessCheck(ac_room_aide)) return;
- fp = fopen(tempfilename, "w");
- if (fp == NULL) {
- cprintf("%d Cannot open %s: %s\n",
+ len = assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
+ memcpy(tempfilename, filename, len + 1);
+
+ memset(&StatBuf, 0, sizeof(struct stat));
+ if ((stat(filename, &StatBuf) == -1) || (StatBuf.st_size == 0))
+ StatBuf.st_size = 80; /* Not there or empty? guess 80 chars line. */
+
+ sprintf(tempfilename + len, ".%d", CC->cs_pid);
+ errno = 0;
+ TmpFD = open(tempfilename, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR);
+
+ if ((TmpFD > 0) && (errno == 0))
+ {
+ char *tmp = malloc(StatBuf.st_size * 2);
+ memset(tmp, ' ', StatBuf.st_size * 2);
+ rc = write(TmpFD, tmp, StatBuf.st_size * 2);
+ free(tmp);
+ if ((rc <= 0) || (rc != StatBuf.st_size * 2))
+ {
+ close(TmpFD);
+ cprintf("%d Unable to allocate the space required for %s: %s\n",
+ ERROR + INTERNAL_ERROR,
+ tempfilename,
+ strerror(errno));
+ unlink(tempfilename);
+ return;
+ }
+ lseek(TmpFD, SEEK_SET, 0);
+ }
+ else {
+ cprintf("%d Unable to allocate the space required for %s: %s\n",
ERROR + INTERNAL_ERROR,
tempfilename,
strerror(errno));
+ unlink(tempfilename);
+ return;
}
+ Line = NewStrBuf();
cprintf("%d %s\n", SEND_LISTING, tempfilename);
- while (client_getln(buf, sizeof buf), strcmp(buf, "000")) {
- fprintf(fp, "%s\n", buf);
- }
- fclose(fp);
- /* Now copy the temp file to its permanent location
- * (We use /bin/mv instead of link() because they may be on
- * different filesystems)
+ len = 0;
+ while (rc = CtdlClientGetLine(Line),
+ (rc >= 0))
+ {
+ if ((rc == 3) && (strcmp(ChrPtr(Line), "000") == 0))
+ break;
+ StrBufAppendBufPlain(Line, HKEY("\n"), 0);
+ write(TmpFD, ChrPtr(Line), StrLength(Line));
+ len += StrLength(Line);
+ }
+ FreeStrBuf(&Line);
+ ftruncate(TmpFD, len);
+ close(TmpFD);
+
+ /* Now copy the temp file to its permanent location.
+ * (We copy instead of link because they may be on different filesystems)
*/
- unlink(filename);
- snprintf(buf, sizeof buf, "/bin/mv %s %s", tempfilename, filename);
begin_critical_section(S_NETCONFIGS);
- system(buf);
+ rename(tempfilename, filename);
end_critical_section(S_NETCONFIGS);
}
/*
* Deliver digest messages
*/
-void network_deliver_digest(struct SpoolControl *sc) {
+void network_deliver_digest(SpoolControl *sc) {
char buf[SIZ];
int i;
struct CtdlMessage *msg = NULL;
char *recps = NULL;
size_t recps_len = SIZ;
struct recptypes *valid;
- struct namelist *nptr;
+ namelist *nptr;
+ char bounce_to[256];
if (sc->num_msgs_spooled < 1) {
fclose(sc->digestfp);
snprintf(buf, sizeof buf, "[%s]", CC->room.QRname);
msg->cm_fields['U'] = strdup(buf);
sprintf(buf, "room_%s@%s", CC->room.QRname, config.c_fqdn);
- for (i=0; i<strlen(buf); ++i) {
+ for (i=0; buf[i]; ++i) {
if (isspace(buf[i])) buf[i]='_';
buf[i] = tolower(buf[i]);
}
msg->cm_fields['F'] = strdup(buf);
msg->cm_fields['R'] = strdup(buf);
+ /* Set the 'List-ID' header */
+ msg->cm_fields['L'] = malloc(1024);
+ snprintf(msg->cm_fields['L'], 1024,
+ "%s <%ld.list-id.%s>",
+ CC->room.QRname,
+ CC->room.QRnumber,
+ config.c_fqdn
+ );
+
/*
* Go fetch the contents of the digest
*/
msg->cm_fields['M'] = malloc(msglen + 1);
fseek(sc->digestfp, 0L, SEEK_SET);
fread(msg->cm_fields['M'], (size_t)msglen, 1, sc->digestfp);
- msg->cm_fields['M'][msglen] = 0;
+ msg->cm_fields['M'][msglen] = '\0';
fclose(sc->digestfp);
sc->digestfp = NULL;
recps = malloc(recps_len);
if (recps == NULL) {
- lprintf(CTDL_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
+ syslog(LOG_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
abort();
}
strcat(recps, nptr->name);
}
+ /* Where do we want bounces and other noise to be heard? Surely not the list members! */
+ snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
+
/* Now submit the message */
- valid = validate_recipients(recps);
+ valid = validate_recipients(recps, NULL, 0);
free(recps);
- CtdlSubmitMsg(msg, valid, NULL);
+ if (valid != NULL) {
+ valid->bounce_to = strdup(bounce_to);
+ valid->envelope_from = strdup(bounce_to);
+ CtdlSubmitMsg(msg, valid, NULL, 0);
+ }
CtdlFreeMessage(msg);
free_recipients(valid);
}
/*
* Deliver list messages to everyone on the list ... efficiently
*/
-void network_deliver_list(struct CtdlMessage *msg, struct SpoolControl *sc) {
+void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc) {
char *recps = NULL;
size_t recps_len = SIZ;
struct recptypes *valid;
- struct namelist *nptr;
+ namelist *nptr;
+ char bounce_to[256];
/* Don't do this if there were no recipients! */
if (sc->listrecps == NULL) return;
recps = malloc(recps_len);
if (recps == NULL) {
- lprintf(CTDL_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
+ syslog(LOG_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
abort();
}
strcat(recps, nptr->name);
}
+ /* Where do we want bounces and other noise to be heard? Surely not the list members! */
+ snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
+
/* Now submit the message */
- valid = validate_recipients(recps);
+ valid = validate_recipients(recps, NULL, 0);
free(recps);
- CtdlSubmitMsg(msg, valid, NULL);
- free_recipients(valid);
+ if (valid != NULL) {
+ valid->bounce_to = strdup(bounce_to);
+ valid->envelope_from = strdup(bounce_to);
+ CtdlSubmitMsg(msg, valid, NULL, 0);
+ free_recipients(valid);
+ }
/* Do not call CtdlFreeMessage(msg) here; the caller will free it. */
}
* Spools out one message from the list.
*/
void network_spool_msg(long msgnum, void *userdata) {
- struct SpoolControl *sc;
+ SpoolControl *sc;
int i;
char *newpath = NULL;
- size_t instr_len = SIZ;
struct CtdlMessage *msg = NULL;
- struct namelist *nptr;
- struct maplist *mptr;
+ namelist *nptr;
+ maplist *mptr;
struct ser_ret sermsg;
FILE *fp;
- char filename[SIZ];
+ char filename[PATH_MAX];
char buf[SIZ];
int bang = 0;
int send = 1;
int ok_to_participate = 0;
struct recptypes *valid;
- sc = (struct SpoolControl *)userdata;
+ sc = (SpoolControl *)userdata;
/*
* Process mailing list recipients
*/
- instr_len = SIZ;
if (sc->listrecps != NULL) {
/* Fetch the message. We're going to need to modify it
* in order to insert the [list name] in it, etc.
*/
msg = CtdlFetchMessage(msgnum, 1);
if (msg != NULL) {
+ int rlen;
+ char *pCh;
+ StrBuf *Subject, *FlatSubject;
+
+ if (msg->cm_fields['V'] == NULL){
+ /* local message, no enVelope */
+ StrBuf *Buf;
+ Buf = NewStrBuf();
+ StrBufAppendBufPlain(Buf, msg->cm_fields['O'], -1, 0);
+ StrBufAppendBufPlain(Buf, HKEY("@"), 0);
+ StrBufAppendBufPlain(Buf, config.c_fqdn, -1, 0);
+
+ msg->cm_fields['K'] = SmashStrBuf(&Buf);
+ }
+ else {
+ msg->cm_fields['K'] = strdup (msg->cm_fields['V']);
+ }
+ /* Set the 'List-ID' header */
+ if (msg->cm_fields['L'] != NULL) {
+ free(msg->cm_fields['L']);
+ }
+ msg->cm_fields['L'] = malloc(1024);
+ snprintf(msg->cm_fields['L'], 1024,
+ "%s <%ld.list-id.%s>",
+ CC->room.QRname,
+ CC->room.QRnumber,
+ config.c_fqdn
+ );
/* Prepend "[List name]" to the subject */
if (msg->cm_fields['U'] == NULL) {
- msg->cm_fields['U'] = strdup("(no subject)");
+ Subject = NewStrBufPlain(HKEY("(no subject)"));
+ }
+ else {
+ Subject = NewStrBufPlain(msg->cm_fields['U'], -1);
+ }
+ FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
+ StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
+
+ rlen = strlen(CC->room.QRname);
+ pCh = strstr(ChrPtr(FlatSubject), CC->room.QRname);
+ if ((pCh == NULL) ||
+ (*(pCh + rlen) != ']') ||
+ (pCh == ChrPtr(FlatSubject)) ||
+ (*(pCh - 1) != '[')
+ )
+ {
+ StrBuf *tmp;
+ StrBufPlain(Subject, HKEY("["));
+ StrBufAppendBufPlain(Subject, CC->room.QRname, rlen, 0);
+ StrBufAppendBufPlain(Subject, HKEY("] "), 0);
+ StrBufAppendBuf(Subject, FlatSubject, 0);
+ tmp = Subject; Subject = FlatSubject; FlatSubject = tmp; /* so we can free the right one... */
+ StrBufRFC2047encode(&Subject, FlatSubject);
}
- snprintf(buf, sizeof buf, "[%s] %s", CC->room.QRname, msg->cm_fields['U']);
- free(msg->cm_fields['U']);
- msg->cm_fields['U'] = strdup(buf);
+
+ if (msg->cm_fields['U'] != NULL)
+ free (msg->cm_fields['U']);
+ msg->cm_fields['U'] = SmashStrBuf(&Subject);
+
+ FreeStrBuf(&FlatSubject);
+
+ /* else we won't modify the buffer, since the roomname is already here. */
/* Set the recipient of the list message to the
* email address of the room itself.
snprintf(msg->cm_fields['R'], 256,
"room_%s@%s", CC->room.QRname,
config.c_fqdn);
- for (i=0; i<strlen(msg->cm_fields['R']); ++i) {
+ for (i=0; msg->cm_fields['R'][i]; ++i) {
if (isspace(msg->cm_fields['R'][i])) {
msg->cm_fields['R'][i] = '_';
}
fprintf(sc->digestfp, "Subject: %s\n", msg->cm_fields['U']);
}
- CC->redirect_buffer = malloc(SIZ);
- CC->redirect_len = 0;
- CC->redirect_alloc = SIZ;
-
+ CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+
safestrncpy(CC->preferred_formats, "text/plain", sizeof CC->preferred_formats);
- CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_NONE, 0, 0);
+ CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_NONE, 0, 0, 0);
- striplt(CC->redirect_buffer);
- fprintf(sc->digestfp, "\n%s\n", CC->redirect_buffer);
+ StrBufTrim(CC->redirect_buffer);
+ fwrite(HKEY("\n"), 1, sc->digestfp);
+ fwrite(SKEY(CC->redirect_buffer), 1, sc->digestfp);
+ fwrite(HKEY("\n"), 1, sc->digestfp);
- free(CC->redirect_buffer);
- CC->redirect_buffer = NULL;
- CC->redirect_len = 0;
- CC->redirect_alloc = 0;
+ FreeStrBuf(&CC->redirect_buffer);
sc->num_msgs_spooled += 1;
free(msg);
/*
* Process client-side list participations for this room
*/
- instr_len = SIZ;
if (sc->participates != NULL) {
msg = CtdlFetchMessage(msgnum, 1);
if (msg != NULL) {
snprintf(msg->cm_fields['F'], SIZ,
"room_%s@%s", CC->room.QRname,
config.c_fqdn);
- for (i=0; i<strlen(msg->cm_fields['F']); ++i) {
+ for (i=0; msg->cm_fields['F'][i]; ++i) {
if (isspace(msg->cm_fields['F'][i])) {
msg->cm_fields['F'][i] = '_';
}
}
msg->cm_fields['R'] = strdup(nptr->name);
- valid = validate_recipients(nptr->name);
- CtdlSubmitMsg(msg, valid, "");
+ valid = validate_recipients(nptr->name, NULL, 0);
+ CtdlSubmitMsg(msg, valid, "", 0);
free_recipients(valid);
}
/* Check for valid node name */
if (is_valid_node(NULL, NULL, mptr->remote_nodename) != 0) {
- lprintf(CTDL_ERR, "Invalid node <%s>\n",
- mptr->remote_nodename);
+ syslog(LOG_ERR, "Invalid node <%s>\n", mptr->remote_nodename);
send = 0;
}
/* Check for split horizon */
- lprintf(CTDL_DEBUG, "Path is %s\n", msg->cm_fields['P']);
+ syslog(LOG_DEBUG, "Path is %s\n", msg->cm_fields['P']);
bang = num_tokens(msg->cm_fields['P'], '!');
if (bang > 1) for (i=0; i<(bang-1); ++i) {
- extract_token(buf, msg->cm_fields['P'],
- i, '!', sizeof buf);
+ extract_token(buf, msg->cm_fields['P'], i, '!', sizeof buf);
+ syslog(LOG_DEBUG, "Compare <%s> to <%s>\n",
+ buf, mptr->remote_nodename) ;
if (!strcasecmp(buf, mptr->remote_nodename)) {
send = 0;
+ syslog(LOG_DEBUG, "Not sending to %s\n",
+ mptr->remote_nodename);
+ }
+ else {
+ syslog(LOG_DEBUG, "Sending to %s\n", mptr->remote_nodename);
}
}
serialize_message(&sermsg, msg);
if (sermsg.len > 0) {
- /* write it to the spool file */
- snprintf(filename, sizeof filename,"%s/%s",
- ctdl_netout_dir,
- mptr->remote_nodename);
- lprintf(CTDL_DEBUG, "Appending to %s\n", filename);
+ /* write it to a spool file */
+ snprintf(filename, sizeof filename,"%s/%s@%lx%x",
+ ctdl_netout_dir,
+ mptr->remote_nodename,
+ time(NULL),
+ rand()
+ );
+ syslog(LOG_DEBUG, "Appending to %s\n", filename);
fp = fopen(filename, "ab");
if (fp != NULL) {
fwrite(sermsg.ser,
fclose(fp);
}
else {
- lprintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno));
+ syslog(LOG_ERR, "%s: %s\n", filename, strerror(errno));
}
/* free the serialized version */
}
-/*
- * Batch up and send all outbound traffic from the current room
- */
-void network_spoolout_room(char *room_to_spool) {
- char filename[SIZ];
- char buf[SIZ];
+int read_spoolcontrol_file(SpoolControl **scc, char *filename)
+{
+ FILE *fp;
char instr[SIZ];
+ char buf[SIZ];
char nodename[256];
char roomname[ROOMNAMELEN];
- char nexthop[256];
- FILE *fp;
- struct SpoolControl sc;
- struct namelist *nptr = NULL;
- struct maplist *mptr = NULL;
size_t miscsize = 0;
size_t linesize = 0;
int skipthisline = 0;
- int i;
-
- /*
- * 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 (getroom(&CC->room, room_to_spool) != 0) {
- lprintf(CTDL_CRIT, "ERROR: cannot load <%s>\n", room_to_spool);
- return;
- }
-
- memset(&sc, 0, sizeof(struct SpoolControl));
- assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
-
- begin_critical_section(S_NETCONFIGS);
+ namelist *nptr = NULL;
+ maplist *mptr = NULL;
+ SpoolControl *sc;
- /* Only do net processing for rooms that have netconfigs */
fp = fopen(filename, "r");
if (fp == NULL) {
- end_critical_section(S_NETCONFIGS);
- return;
+ return 0;
}
-
- lprintf(CTDL_INFO, "Networking started for <%s>\n", CC->room.QRname);
+ sc = malloc(sizeof(SpoolControl));
+ memset(sc, 0, sizeof(SpoolControl));
+ *scc = sc;
while (fgets(buf, sizeof buf, fp) != NULL) {
buf[strlen(buf)-1] = 0;
extract_token(instr, buf, 0, '|', sizeof instr);
- if (!strcasecmp(instr, "lastsent")) {
- sc.lastsent = extract_long(buf, 1);
+ if (!strcasecmp(instr, strof(lastsent))) {
+ sc->lastsent = extract_long(buf, 1);
}
- else if (!strcasecmp(instr, "listrecp")) {
- nptr = (struct namelist *)
- malloc(sizeof(struct namelist));
- nptr->next = sc.listrecps;
+ else if (!strcasecmp(instr, strof(listrecp))) {
+ nptr = (namelist *)
+ malloc(sizeof(namelist));
+ nptr->next = sc->listrecps;
extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
- sc.listrecps = nptr;
+ sc->listrecps = nptr;
}
- else if (!strcasecmp(instr, "participate")) {
- nptr = (struct namelist *)
- malloc(sizeof(struct namelist));
- nptr->next = sc.participates;
+ else if (!strcasecmp(instr, strof(participate))) {
+ nptr = (namelist *)
+ malloc(sizeof(namelist));
+ nptr->next = sc->participates;
extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
- sc.participates = nptr;
+ sc->participates = nptr;
}
- else if (!strcasecmp(instr, "digestrecp")) {
- nptr = (struct namelist *)
- malloc(sizeof(struct namelist));
- nptr->next = sc.digestrecps;
+ else if (!strcasecmp(instr, strof(digestrecp))) {
+ nptr = (namelist *)
+ malloc(sizeof(namelist));
+ nptr->next = sc->digestrecps;
extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
- sc.digestrecps = nptr;
+ sc->digestrecps = nptr;
}
- else if (!strcasecmp(instr, "ignet_push_share")) {
- /* by checking each node's validity, we automatically
- * purge nodes which do not exist from room network
- * configurations at this time.
- */
+ else if (!strcasecmp(instr, strof(ignet_push_share))) {
extract_token(nodename, buf, 1, '|', sizeof nodename);
extract_token(roomname, buf, 2, '|', sizeof roomname);
- strcpy(nexthop, "xxx");
- if (is_valid_node(nexthop, NULL, nodename) == 0) {
- if (IsEmptyStr(nexthop)) {
- mptr = (struct maplist *)
- malloc(sizeof(struct maplist));
- mptr->next = sc.ignet_push_shares;
- strcpy(mptr->remote_nodename, nodename);
- strcpy(mptr->remote_roomname, roomname);
- sc.ignet_push_shares = mptr;
- }
- }
+ mptr = (maplist *) malloc(sizeof(maplist));
+ mptr->next = sc->ignet_push_shares;
+ strcpy(mptr->remote_nodename, nodename);
+ strcpy(mptr->remote_roomname, roomname);
+ sc->ignet_push_shares = mptr;
}
else {
/* Preserve 'other' lines ... *unless* they happen to
* timestamps.
*/
skipthisline = 0;
- if (!strncasecmp(buf, "subpending|", 11)) {
+ if (!strncasecmp(buf, strof(subpending)"|", 11)) {
if (time(NULL) - extract_long(buf, 4) > EXP) {
skipthisline = 1;
}
}
- if (!strncasecmp(buf, "unsubpending|", 13)) {
+ if (!strncasecmp(buf, strof(unsubpending)"|", 13)) {
if (time(NULL) - extract_long(buf, 3) > EXP) {
skipthisline = 1;
}
if (skipthisline == 0) {
linesize = strlen(buf);
- sc.misc = realloc(sc.misc,
+ sc->misc = realloc(sc->misc,
(miscsize + linesize + 2) );
- sprintf(&sc.misc[miscsize], "%s\n", buf);
+ sprintf(&sc->misc[miscsize], "%s\n", buf);
miscsize = miscsize + linesize + 1;
}
}
}
fclose(fp);
+ return 1;
+}
+
+void free_spoolcontrol_struct(SpoolControl **scc)
+{
+ SpoolControl *sc;
+ namelist *nptr = NULL;
+ maplist *mptr = NULL;
+
+ sc = *scc;
+ while (sc->listrecps != NULL) {
+ nptr = sc->listrecps->next;
+ free(sc->listrecps);
+ sc->listrecps = nptr;
+ }
+ /* Do the same for digestrecps */
+ while (sc->digestrecps != NULL) {
+ nptr = sc->digestrecps->next;
+ free(sc->digestrecps);
+ sc->digestrecps = nptr;
+ }
+ /* Do the same for participates */
+ while (sc->participates != NULL) {
+ nptr = sc->participates->next;
+ free(sc->participates);
+ sc->participates = nptr;
+ }
+ while (sc->ignet_push_shares != NULL) {
+ mptr = sc->ignet_push_shares->next;
+ free(sc->ignet_push_shares);
+ sc->ignet_push_shares = mptr;
+ }
+ free(sc->misc);
+ free(sc);
+ *scc=NULL;
+}
+
+int writenfree_spoolcontrol_file(SpoolControl **scc, char *filename)
+{
+ char tempfilename[PATH_MAX];
+ int TmpFD;
+ SpoolControl *sc;
+ namelist *nptr = NULL;
+ maplist *mptr = NULL;
+ long len;
+ time_t unixtime;
+ struct timeval tv;
+ long reltid; /* if we don't have SYS_gettid, use "random" value */
+ StrBuf *Cfg;
+ int rc;
+
+ len = strlen(filename);
+ memcpy(tempfilename, filename, len + 1);
+
+
+#if defined(HAVE_SYSCALL_H) && defined (SYS_gettid)
+ reltid = syscall(SYS_gettid);
+#endif
+ gettimeofday(&tv, NULL);
+ /* Promote to time_t; types differ on some OSes (like darwin) */
+ unixtime = tv.tv_sec;
+
+ sprintf(tempfilename + len, ".%ld-%ld", reltid, unixtime);
+ sc = *scc;
+ errno = 0;
+ TmpFD = open(tempfilename, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR);
+ Cfg = NewStrBuf();
+ if ((TmpFD < 0) || (errno != 0)) {
+ syslog(LOG_CRIT, "ERROR: cannot open %s: %s\n",
+ filename, strerror(errno));
+ free_spoolcontrol_struct(scc);
+ unlink(tempfilename);
+ }
+ else {
+ fchown(TmpFD, config.c_ctdluid, 0);
+ StrBufAppendPrintf(Cfg, "lastsent|%ld\n", sc->lastsent);
+
+ /* Write out the listrecps while freeing from memory at the
+ * same time. Am I clever or what? :)
+ */
+ while (sc->listrecps != NULL) {
+ StrBufAppendPrintf(Cfg, "listrecp|%s\n", sc->listrecps->name);
+ nptr = sc->listrecps->next;
+ free(sc->listrecps);
+ sc->listrecps = nptr;
+ }
+ /* Do the same for digestrecps */
+ while (sc->digestrecps != NULL) {
+ StrBufAppendPrintf(Cfg, "digestrecp|%s\n", sc->digestrecps->name);
+ nptr = sc->digestrecps->next;
+ free(sc->digestrecps);
+ sc->digestrecps = nptr;
+ }
+ /* Do the same for participates */
+ while (sc->participates != NULL) {
+ StrBufAppendPrintf(Cfg, "participate|%s\n", sc->participates->name);
+ nptr = sc->participates->next;
+ free(sc->participates);
+ sc->participates = nptr;
+ }
+ while (sc->ignet_push_shares != NULL) {
+ StrBufAppendPrintf(Cfg, "ignet_push_share|%s", sc->ignet_push_shares->remote_nodename);
+ if (!IsEmptyStr(sc->ignet_push_shares->remote_roomname)) {
+ StrBufAppendPrintf(Cfg, "|%s", sc->ignet_push_shares->remote_roomname);
+ }
+ StrBufAppendPrintf(Cfg, "\n");
+ mptr = sc->ignet_push_shares->next;
+ free(sc->ignet_push_shares);
+ sc->ignet_push_shares = mptr;
+ }
+ if (sc->misc != NULL) {
+ StrBufAppendBufPlain(Cfg, sc->misc, -1, 0);
+ }
+ free(sc->misc);
+
+ rc = write(TmpFD, ChrPtr(Cfg), StrLength(Cfg));
+ if ((rc >=0 ) && (rc == StrLength(Cfg)))
+ {
+ close(TmpFD);
+ rename(tempfilename, filename);
+ }
+ else {
+ syslog(LOG_EMERG,
+ "unable to write %s; [%s]; not enough space on the disk?\n",
+ tempfilename,
+ strerror(errno));
+ close(TmpFD);
+ unlink(tempfilename);
+ }
+ FreeStrBuf(&Cfg);
+ free(sc);
+ *scc=NULL;
+ }
+ return 1;
+}
+int is_recipient(SpoolControl *sc, const char *Name)
+{
+ namelist *nptr;
+ size_t len;
+
+ len = strlen(Name);
+ nptr = sc->listrecps;
+ while (nptr != NULL) {
+ if (strncmp(Name, nptr->name, len)==0)
+ return 1;
+ nptr = nptr->next;
+ }
+ /* Do the same for digestrecps */
+ nptr = sc->digestrecps;
+ while (nptr != NULL) {
+ if (strncmp(Name, nptr->name, len)==0)
+ return 1;
+ nptr = nptr->next;
+ }
+ /* Do the same for participates */
+ nptr = sc->participates;
+ while (nptr != NULL) {
+ if (strncmp(Name, nptr->name, len)==0)
+ return 1;
+ nptr = nptr->next;
+ }
+ return 0;
+}
+
+
+/*
+ * Batch up and send all outbound traffic from the current room
+ */
+void network_spoolout_room(char *room_to_spool) {
+ char buf[SIZ];
+ char filename[PATH_MAX];
+ SpoolControl *sc;
+ int i;
+
+ /*
+ * 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(&CC->room, room_to_spool) != 0) {
+ syslog(LOG_CRIT, "ERROR: cannot load <%s>\n", room_to_spool);
+ return;
+ }
+
+ assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
+ begin_critical_section(S_NETCONFIGS);
+
+ /* Only do net processing for rooms that have netconfigs */
+ if (!read_spoolcontrol_file(&sc, filename))
+ {
+ end_critical_section(S_NETCONFIGS);
+ return;
+ }
+ syslog(LOG_INFO, "Networking started for <%s>\n", CC->room.QRname);
/* If there are digest recipients, we have to build a digest */
- if (sc.digestrecps != NULL) {
- sc.digestfp = tmpfile();
- fprintf(sc.digestfp, "Content-type: text/plain\n\n");
+ if (sc->digestrecps != NULL) {
+ sc->digestfp = tmpfile();
+ fprintf(sc->digestfp, "Content-type: text/plain\n\n");
}
/* 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 */
snprintf(buf, sizeof buf, "room_%s@%s",
CC->room.QRname, config.c_fqdn);
- for (i=0; i<strlen(buf); ++i) {
+ for (i=0; buf[i]; ++i) {
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"
"You are subscribed to the '%s' "
"To post to the list: %s\n",
CC->room.QRname, buf
);
- network_deliver_digest(&sc); /* deliver and close */
+ network_deliver_digest(sc); /* deliver and close */
}
/* Now rewrite the config file */
- fp = fopen(filename, "w");
- if (fp == NULL) {
- lprintf(CTDL_CRIT, "ERROR: cannot open %s: %s\n",
- filename, strerror(errno));
- }
- else {
- fprintf(fp, "lastsent|%ld\n", sc.lastsent);
-
- /* Write out the listrecps while freeing from memory at the
- * same time. Am I clever or what? :)
- */
- while (sc.listrecps != NULL) {
- fprintf(fp, "listrecp|%s\n", sc.listrecps->name);
- nptr = sc.listrecps->next;
- free(sc.listrecps);
- sc.listrecps = nptr;
- }
- /* Do the same for digestrecps */
- while (sc.digestrecps != NULL) {
- fprintf(fp, "digestrecp|%s\n", sc.digestrecps->name);
- nptr = sc.digestrecps->next;
- free(sc.digestrecps);
- sc.digestrecps = nptr;
- }
- /* Do the same for participates */
- while (sc.participates != NULL) {
- fprintf(fp, "participate|%s\n", sc.participates->name);
- nptr = sc.participates->next;
- free(sc.participates);
- sc.participates = nptr;
- }
- while (sc.ignet_push_shares != NULL) {
- /* by checking each node's validity, we automatically
- * purge nodes which do not exist from room network
- * configurations at this time.
- */
- if (is_valid_node(NULL, NULL, sc.ignet_push_shares->remote_nodename) == 0) {
- }
- fprintf(fp, "ignet_push_share|%s",
- sc.ignet_push_shares->remote_nodename);
- if (!IsEmptyStr(sc.ignet_push_shares->remote_roomname)) {
- fprintf(fp, "|%s", sc.ignet_push_shares->remote_roomname);
- }
- fprintf(fp, "\n");
- mptr = sc.ignet_push_shares->next;
- free(sc.ignet_push_shares);
- sc.ignet_push_shares = mptr;
- }
- if (sc.misc != NULL) {
- fwrite(sc.misc, strlen(sc.misc), 1, fp);
- }
- free(sc.misc);
-
- fclose(fp);
- }
+ writenfree_spoolcontrol_file(&sc, filename);
end_critical_section(S_NETCONFIGS);
}
* network processing. This can be used to bring a new node into sync.
*/
int network_sync_to(char *target_node) {
- struct SpoolControl sc;
+ SpoolControl sc;
int num_spooled = 0;
int found_node = 0;
char buf[256];
char sc_type[256];
char sc_node[256];
char sc_room[256];
- char filename[256];
+ char filename[PATH_MAX];
FILE *fp;
/* Grab the configuration line we're looking for */
found_node = 1;
/* Concise syntax because we don't need a full linked-list */
- memset(&sc, 0, sizeof(struct SpoolControl));
- sc.ignet_push_shares = (struct maplist *)
- malloc(sizeof(struct maplist));
+ memset(&sc, 0, sizeof(SpoolControl));
+ sc.ignet_push_shares = (maplist *)
+ malloc(sizeof(maplist));
sc.ignet_push_shares->next = NULL;
safestrncpy(sc.ignet_push_shares->remote_nodename,
sc_node,
/* Concise cleanup because we know there's only one node in the sc */
free(sc.ignet_push_shares);
- lprintf(CTDL_NOTICE, "Synchronized %d messages to <%s>\n",
+ syslog(LOG_NOTICE, "Synchronized %d messages to <%s>\n",
num_spooled, target_node);
return(num_spooled);
}
void destroy_network_queue_room(void)
{
struct RoomProcList *cur, *p;
- struct NetMap *nmcur, *nmp;
+ NetMap *nmcur, *nmp;
cur = rplist;
begin_critical_section(S_RPLIST);
*/
void network_learn_topology(char *node, char *path) {
char nexthop[256];
- struct NetMap *nmptr;
+ NetMap *nmptr;
strcpy(nexthop, "");
}
/* If we got here then it's not in the map, so add it. */
- nmptr = (struct NetMap *) malloc(sizeof (struct NetMap));
+ nmptr = (NetMap *) malloc(sizeof (NetMap));
strcpy(nmptr->nodename, node);
nmptr->lastcontact = time(NULL);
extract_token(nmptr->nexthop, path, 0, '!', sizeof nmptr->nexthop);
static int serialnum = 0;
size_t size;
- lprintf(CTDL_DEBUG, "entering network_bounce()\n");
+ syslog(LOG_DEBUG, "entering network_bounce()\n");
if (msg == NULL) return;
free(oldpath);
/* Now submit the message */
- valid = validate_recipients(recipient);
+ valid = validate_recipients(recipient, NULL, 0);
if (valid != NULL) if (valid->num_error != 0) {
free_recipients(valid);
valid = NULL;
if ( (valid == NULL) && IsEmptyStr(force_room) ) {
strcpy(force_room, config.c_aideroom);
}
- CtdlSubmitMsg(msg, valid, force_room);
+ CtdlSubmitMsg(msg, valid, force_room, 0);
/* Clean up */
if (valid != NULL) free_recipients(valid);
CtdlFreeMessage(msg);
- lprintf(CTDL_DEBUG, "leaving network_bounce()\n");
+ syslog(LOG_DEBUG, "leaving network_bounce()\n");
}
char target_room[ROOMNAMELEN];
struct ser_ret sermsg;
char *oldpath = NULL;
- char filename[SIZ];
+ char filename[PATH_MAX];
FILE *fp;
char nexthop[SIZ];
unsigned char firstbyte;
unsigned char lastbyte;
- /* Validate just a little bit. First byte should be FF and
- * last byte should be 00.
- */
- memcpy(&firstbyte, &buffer[0], 1);
- memcpy(&lastbyte, &buffer[size-1], 1);
+ syslog(LOG_DEBUG, "network_process_buffer() processing %ld bytes\n", 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) ) {
- lprintf(CTDL_ERR, "Corrupt message! Ignoring.\n");
+ syslog(LOG_ERR, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d\n",
+ size, firstbyte, lastbyte);
return;
}
/* route the message */
strcpy(nexthop, "");
- if (is_valid_node(nexthop, NULL,
- msg->cm_fields['D']) == 0) {
-
+ if (is_valid_node(nexthop, NULL, msg->cm_fields['D']) == 0) {
/* prepend our node to the path */
if (msg->cm_fields['P'] != NULL) {
oldpath = msg->cm_fields['P'];
strcpy(nexthop, msg->cm_fields['D']);
}
snprintf(filename,
- sizeof filename,
- "%s/%s",
- ctdl_netout_dir,
- nexthop);
- lprintf(CTDL_DEBUG, "Appending to %s\n", filename);
+ sizeof filename,
+ "%s/%s@%lx%x",
+ ctdl_netout_dir,
+ nexthop,
+ time(NULL),
+ rand()
+ );
+ syslog(LOG_DEBUG, "Appending to %s\n", filename);
fp = fopen(filename, "ab");
if (fp != NULL) {
- fwrite(sermsg.ser,
- sermsg.len, 1, fp);
+ fwrite(sermsg.ser, sermsg.len, 1, fp);
fclose(fp);
}
else {
- lprintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno));
+ syslog(LOG_ERR, "%s: %s\n", filename, strerror(errno));
}
free(sermsg.ser);
CtdlFreeMessage(msg);
* connected that it's inevitable.)
*/
if (network_usetable(msg) != 0) {
+ CtdlFreeMessage(msg);
return;
}
/* Learn network topology from the path */
if ((msg->cm_fields['N'] != NULL) && (msg->cm_fields['P'] != NULL)) {
- network_learn_topology(msg->cm_fields['N'],
- msg->cm_fields['P']);
+ network_learn_topology(msg->cm_fields['N'], msg->cm_fields['P']);
}
/* Is the sending node giving us a very persuasive suggestion about
* which room this message should be saved in? If so, go with that.
*/
if (msg->cm_fields['C'] != NULL) {
- safestrncpy(target_room,
- msg->cm_fields['C'],
- sizeof target_room);
+ safestrncpy(target_room, msg->cm_fields['C'], sizeof target_room);
}
/* Otherwise, does it have a recipient? If so, validate it... */
else if (msg->cm_fields['R'] != NULL) {
- recp = validate_recipients(msg->cm_fields['R']);
+ recp = validate_recipients(msg->cm_fields['R'], NULL, 0);
if (recp != NULL) if (recp->num_error != 0) {
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);
+ syslog(LOG_DEBUG, "Bouncing message due to invalid recipient address.\n");
return;
}
strcpy(target_room, ""); /* no target room if mail */
* it has the O field (Originating room) set.
*/
else if (msg->cm_fields['O'] != NULL) {
- safestrncpy(target_room,
- msg->cm_fields['O'],
- sizeof target_room);
+ safestrncpy(target_room, msg->cm_fields['O'], sizeof target_room);
}
/* Strip out fields that are only relevant during transit */
/* save the message into a room */
if (PerformNetprocHooks(msg, target_room) == 0) {
msg->cm_flags = CM_SKIP_HOOKS;
- CtdlSubmitMsg(msg, recp, target_room);
+ CtdlSubmitMsg(msg, recp, target_room, 0);
}
CtdlFreeMessage(msg);
free_recipients(recp);
buffer = malloc(size);
if (buffer != NULL) {
fseek(fp, msgstart, SEEK_SET);
- fread(buffer, size, 1, fp);
- network_process_buffer(buffer, size);
+ if (fread(buffer, size, 1, fp) > 0) {
+ network_process_buffer(buffer, size);
+ }
free(buffer);
}
fp = fopen(filename, "rb");
if (fp == NULL) {
- lprintf(CTDL_CRIT, "Error opening %s: %s\n",
- filename, strerror(errno));
+ syslog(LOG_CRIT, "Error opening %s: %s\n", filename, strerror(errno));
return;
}
- lprintf(CTDL_INFO, "network: processing <%s>\n", filename);
+ fseek(fp, 0L, SEEK_END);
+ syslog(LOG_INFO, "network: processing %ld bytes from %s\n", ftell(fp), filename);
+ rewind(fp);
/* Look for messages in the data stream and break them out */
while (ch = getc(fp), ch >= 0) {
DIR *dp;
struct dirent *d;
struct stat statbuf;
- char filename[256];
+ char filename[PATH_MAX];
static time_t last_spoolin_mtime = 0L;
/*
*/
if (stat(ctdl_netin_dir, &statbuf)) return;
if (statbuf.st_mtime == last_spoolin_mtime) {
- lprintf(CTDL_DEBUG, "network: nothing in inbound queue\n");
+ syslog(LOG_DEBUG, "network: nothing in inbound queue\n");
return;
}
last_spoolin_mtime = statbuf.st_mtime;
- lprintf(CTDL_DEBUG, "network: processing inbound queue\n");
+ syslog(LOG_DEBUG, "network: processing inbound queue\n");
/*
* Ok, there's something interesting in there, so scan it.
while (d = readdir(dp), d != NULL) {
if ((strcmp(d->d_name, ".")) && (strcmp(d->d_name, ".."))) {
snprintf(filename,
- sizeof filename,
- "%s/%s",
- ctdl_netin_dir,
- d->d_name);
+ sizeof filename,
+ "%s/%s",
+ ctdl_netin_dir,
+ d->d_name
+ );
network_process_file(filename);
}
}
}
/*
- * Delete any files in the outbound queue that were intended
- * to be sent to nodes which no longer exist.
+ * 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.
*/
-void network_purge_spoolout(void) {
+void network_consolidate_spoolout(void) {
DIR *dp;
struct dirent *d;
- char filename[256];
+ char filename[PATH_MAX];
+ char cmd[PATH_MAX];
char nexthop[256];
int i;
+ char *ptr;
+
+ /* Step 1: consolidate files in the outbound queue into one file per neighbor node */
+ dp = opendir(ctdl_netout_dir);
+ if (dp == NULL) return;
+ while (d = readdir(dp), d != NULL) {
+ if (
+ (strcmp(d->d_name, "."))
+ && (strcmp(d->d_name, ".."))
+ && (strchr(d->d_name, '@') != NULL)
+ ) {
+ safestrncpy(nexthop, d->d_name, sizeof nexthop);
+ ptr = strchr(nexthop, '@');
+ if (ptr) *ptr = 0;
+
+ snprintf(filename,
+ sizeof filename,
+ "%s/%s",
+ ctdl_netout_dir,
+ d->d_name
+ );
+
+ syslog(LOG_DEBUG, "Consolidate %s to %s\n", filename, nexthop);
+ if (network_talking_to(nexthop, NTT_CHECK)) {
+ syslog(LOG_DEBUG,
+ "Currently online with %s - skipping for now\n",
+ nexthop
+ );
+ }
+ else {
+ network_talking_to(nexthop, NTT_ADD);
+ snprintf(cmd, sizeof cmd, "/bin/cat %s >>%s/%s && /bin/rm -f %s",
+ filename,
+ ctdl_netout_dir, nexthop,
+ filename
+ );
+ system(cmd);
+ network_talking_to(nexthop, NTT_REMOVE);
+ }
+ }
+ }
+ closedir(dp);
+
+ /* 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) return;
while (d = readdir(dp), d != NULL) {
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
continue;
+ ptr = strchr(d->d_name, '@');
+ if (d != NULL)
+ continue;
snprintf(filename,
- sizeof filename,
- "%s/%s",
- ctdl_netout_dir,
- d->d_name);
+ sizeof filename,
+ "%s/%s",
+ ctdl_netout_dir,
+ d->d_name
+ );
strcpy(nexthop, "");
i = is_valid_node(nexthop, NULL, d->d_name);
/*
* receive network spool from the remote system
*/
-void receive_spool(int sock, char *remote_nodename) {
- long download_len;
- long bytes_received;
+void receive_spool(int *sock, char *remote_nodename) {
+ int download_len = 0L;
+ int bytes_received = 0L;
char buf[SIZ];
- static char pbuf[IGNET_PACKET_SIZE];
char tempfilename[PATH_MAX];
- long plen;
+ char permfilename[PATH_MAX];
+ int plen;
FILE *fp;
- CtdlMakeTempFileName(tempfilename, sizeof tempfilename);
+ snprintf(tempfilename,
+ sizeof tempfilename,
+ "%s/%s.%lx%x",
+ ctdl_nettmp_dir,
+ remote_nodename,
+ time(NULL),
+ rand()
+ );
+
+ snprintf(permfilename,
+ sizeof permfilename,
+ "%s/%s.%lx%x",
+ ctdl_netin_dir,
+ remote_nodename,
+ time(NULL),
+ rand()
+ );
+
if (sock_puts(sock, "NDOP") < 0) return;
- if (sock_gets(sock, buf) < 0) return;
- lprintf(CTDL_DEBUG, "<%s\n", buf);
+ if (sock_getln(sock, buf, sizeof buf) < 0) return;
+ syslog(LOG_DEBUG, "<%s\n", buf);
if (buf[0] != '2') {
return;
}
+
download_len = extract_long(&buf[4], 0);
+ if (download_len <= 0) {
+ return;
+ }
bytes_received = 0L;
fp = fopen(tempfilename, "w");
if (fp == NULL) {
- lprintf(CTDL_CRIT, "cannot open download file locally: %s\n",
- strerror(errno));
+ syslog(LOG_CRIT, "Cannot create %s: %s\n", tempfilename, strerror(errno));
return;
}
+ syslog(LOG_DEBUG, "Expecting to transfer %d bytes\n", download_len);
while (bytes_received < download_len) {
- snprintf(buf, sizeof buf, "READ %ld|%ld",
- bytes_received,
- ((download_len - bytes_received > IGNET_PACKET_SIZE)
- ? IGNET_PACKET_SIZE : (download_len - bytes_received)));
+ /*
+ * If shutting down we can exit here and unlink the temp file.
+ * this shouldn't loose us any messages.
+ */
+ if (server_shutting_down)
+ {
+ fclose(fp);
+ unlink(tempfilename);
+ return;
+ }
+ snprintf(buf, sizeof buf, "READ %d|%d",
+ bytes_received,
+ ((download_len - bytes_received > IGNET_PACKET_SIZE)
+ ? IGNET_PACKET_SIZE : (download_len - bytes_received))
+ );
+
if (sock_puts(sock, buf) < 0) {
fclose(fp);
unlink(tempfilename);
return;
}
- if (sock_gets(sock, buf) < 0) {
+ if (sock_getln(sock, buf, sizeof buf) < 0) {
fclose(fp);
unlink(tempfilename);
return;
}
+
if (buf[0] == '6') {
- plen = extract_long(&buf[4], 0);
- if (sock_read(sock, pbuf, plen) < 0) {
+ plen = extract_int(&buf[4], 0);
+ StrBuf *pbuf = NewStrBuf();
+ if (socket_read_blob(sock, pbuf, plen, CLIENT_TIMEOUT) != plen) {
+ syslog(LOG_INFO, "Short read from peer; aborting.\n");
fclose(fp);
unlink(tempfilename);
+ FreeStrBuf(&pbuf);
return;
}
- fwrite((char *) pbuf, plen, 1, fp);
- bytes_received = bytes_received + plen;
+ fwrite(ChrPtr(pbuf), plen, 1, fp);
+ bytes_received += plen;
+ FreeStrBuf(&pbuf);
}
}
fclose(fp);
+
+ /* Last chance for shutdown exit */
+ if (server_shutting_down)
+ {
+ unlink(tempfilename);
+ return;
+ }
+
if (sock_puts(sock, "CLOS") < 0) {
unlink(tempfilename);
return;
}
- if (sock_gets(sock, buf) < 0) {
+
+ /*
+ * From here on we must complete or messages will get lost
+ */
+ if (sock_getln(sock, buf, sizeof buf) < 0) {
unlink(tempfilename);
return;
}
- if (download_len > 0)
- lprintf(CTDL_NOTICE, "Received %ld octets from <%s>",
- download_len, remote_nodename);
- lprintf(CTDL_DEBUG, "%s", buf);
- /* TODO: make move inline. forking is verry expensive. */
- snprintf(buf,
- sizeof buf,
- "mv %s %s/%s.%ld",
- tempfilename,
- ctdl_netin_dir,
- remote_nodename,
- (long) getpid());
- system(buf);
+
+ syslog(LOG_DEBUG, "%s\n", buf);
+
+ /*
+ * Now move the temp file to its permanent location.
+ */
+ if (link(tempfilename, permfilename) != 0) {
+ syslog(LOG_ALERT, "Could not link %s to %s: %s\n",
+ tempfilename, permfilename, strerror(errno)
+ );
+ }
+
+ unlink(tempfilename);
}
/*
* transmit network spool to the remote system
*/
-void transmit_spool(int sock, char *remote_nodename)
+void transmit_spool(int *sock, char *remote_nodename)
{
char buf[SIZ];
char pbuf[4096];
char sfname[128];
if (sock_puts(sock, "NUOP") < 0) return;
- if (sock_gets(sock, buf) < 0) return;
- lprintf(CTDL_DEBUG, "<%s\n", buf);
+ if (sock_getln(sock, buf, sizeof buf) < 0) return;
+ syslog(LOG_DEBUG, "<%s\n", buf);
if (buf[0] != '2') {
return;
}
snprintf(sfname, sizeof sfname,
- "%s/%s",
- ctdl_netout_dir,
- remote_nodename);
+ "%s/%s",
+ ctdl_netout_dir,
+ remote_nodename
+ );
fd = open(sfname, O_RDONLY);
if (fd < 0) {
if (errno != ENOENT) {
- lprintf(CTDL_CRIT, "cannot open upload file locally: %s\n",
- strerror(errno));
+ syslog(LOG_CRIT, "cannot open %s: %s\n", sfname, strerror(errno));
}
return;
}
while (plen = (long) read(fd, pbuf, IGNET_PACKET_SIZE), plen > 0L) {
bytes_to_write = plen;
while (bytes_to_write > 0L) {
+ /* Exit if shutting down */
+ if (server_shutting_down)
+ {
+ close(fd);
+ return;
+ }
+
snprintf(buf, sizeof buf, "WRIT %ld", bytes_to_write);
if (sock_puts(sock, buf) < 0) {
close(fd);
return;
}
- if (sock_gets(sock, buf) < 0) {
+ if (sock_getln(sock, buf, sizeof buf) < 0) {
close(fd);
return;
}
thisblock = atol(&buf[4]);
if (buf[0] == '7') {
- if (sock_write(sock, pbuf,
- (int) thisblock) < 0) {
+ if (sock_write(sock, pbuf, (int) thisblock) < 0) {
close(fd);
return;
}
ABORTUPL:
close(fd);
+
+ /* Last chance for shutdown exit */
+ if(server_shutting_down)
+ return;
+
if (sock_puts(sock, "UCLS 1") < 0) return;
- if (sock_gets(sock, buf) < 0) return;
- lprintf(CTDL_NOTICE, "Sent %ld octets to <%s>\n",
- bytes_written, remote_nodename);
- lprintf(CTDL_DEBUG, "<%s\n", buf);
+
+ /*
+ * From here on we must complete or messages will get lost
+ */
+ if (sock_getln(sock, buf, sizeof buf) < 0) return;
+ syslog(LOG_NOTICE, "Sent %ld octets to <%s>\n", bytes_written, remote_nodename);
+ syslog(LOG_DEBUG, "<%s\n", buf);
if (buf[0] == '2') {
- lprintf(CTDL_DEBUG, "Removing <%s>\n", sfname);
+ syslog(LOG_DEBUG, "Removing <%s>\n", sfname);
unlink(sfname);
}
}
void network_poll_node(char *node, char *secret, char *host, char *port) {
int sock;
char buf[SIZ];
+ char err_buf[SIZ];
+ char connected_to[SIZ];
+ CitContext *CCC=CC;
if (network_talking_to(node, NTT_CHECK)) return;
network_talking_to(node, NTT_ADD);
- lprintf(CTDL_NOTICE, "Connecting to <%s> at %s:%s\n", node, host, port);
+ syslog(LOG_DEBUG, "network: polling <%s>\n", node);
+ syslog(LOG_NOTICE, "Connecting to <%s> at %s:%s\n", node, host, port);
- sock = sock_connect(host, port, "tcp");
+ sock = sock_connect(host, port);
if (sock < 0) {
- lprintf(CTDL_ERR, "Could not connect: %s\n", strerror(errno));
+ syslog(LOG_ERR, "Could not connect: %s\n", strerror(errno));
network_talking_to(node, NTT_REMOVE);
return;
}
- lprintf(CTDL_DEBUG, "Connected!\n");
+ syslog(LOG_DEBUG, "Connected!\n");
+ CCC->SBuf.Buf = NewStrBuf();
+ CCC->sMigrateBuf = NewStrBuf();
+ CCC->SBuf.ReadWritePointer = NULL;
/* Read the server greeting */
- if (sock_gets(sock, buf) < 0) goto bail;
- lprintf(CTDL_DEBUG, ">%s\n", buf);
-
- /* Identify ourselves */
- snprintf(buf, sizeof buf, "NETP %s|%s", config.c_nodename, secret);
- lprintf(CTDL_DEBUG, "<%s\n", buf);
- if (sock_puts(sock, buf) <0) goto bail;
- if (sock_gets(sock, buf) < 0) goto bail;
- lprintf(CTDL_DEBUG, ">%s\n", buf);
- if (buf[0] != '2') goto bail;
-
- /* At this point we are authenticated. */
- receive_spool(sock, node);
- transmit_spool(sock, node);
-
- sock_puts(sock, "QUIT");
-bail: sock_close(sock);
+ if (sock_getln(&sock, buf, sizeof buf) < 0) goto bail;
+ syslog(LOG_DEBUG, ">%s\n", buf);
+
+ /* Check that the remote is who we think it is and warn the Aide if not */
+ extract_token (connected_to, buf, 1, ' ', sizeof connected_to);
+ if (strcmp(connected_to, node))
+ {
+ snprintf(err_buf, sizeof(err_buf),
+ "Connected to node \"%s\" but I was expecting to connect to node \"%s\".",
+ connected_to, node
+ );
+ syslog(LOG_ERR, "%s\n", err_buf);
+ CtdlAideMessage(err_buf, "Network error");
+ }
+ else {
+ /* We're talking to the correct node. Now identify ourselves. */
+ snprintf(buf, sizeof buf, "NETP %s|%s", config.c_nodename, secret);
+ syslog(LOG_DEBUG, "<%s\n", buf);
+ if (sock_puts(&sock, buf) <0) goto bail;
+ if (sock_getln(&sock, buf, sizeof buf) < 0) goto bail;
+ syslog(LOG_DEBUG, ">%s\n", buf);
+ if (buf[0] != '2') {
+ goto bail;
+ }
+
+ /* At this point we are authenticated. */
+ if (!server_shutting_down)
+ receive_spool(&sock, node);
+ if (!server_shutting_down)
+ transmit_spool(&sock, node);
+ }
+
+ sock_puts(&sock, "QUIT");
+bail:
+ FreeStrBuf(&CCC->SBuf.Buf);
+ FreeStrBuf(&CCC->sMigrateBuf);
+ if (sock != -1)
+ sock_close(sock);
network_talking_to(node, NTT_REMOVE);
}
char spoolfile[256];
if (working_ignetcfg == NULL) {
- lprintf(CTDL_DEBUG, "No nodes defined - not polling\n");
+ syslog(LOG_DEBUG, "network: no neighbor nodes are configured - not polling.\n");
return;
}
/* Use the string tokenizer to grab one line at a time */
for (i=0; i<num_tokens(working_ignetcfg, '\n'); ++i) {
+ if(server_shutting_down)
+ return;
extract_token(linebuf, working_ignetcfg, i, '\n', sizeof linebuf);
extract_token(node, linebuf, 0, '|', sizeof node);
extract_token(secret, linebuf, 1, '|', sizeof secret);
poll = full_poll;
if (poll == 0) {
snprintf(spoolfile,
- sizeof spoolfile,
- "%s/%s",
- ctdl_netout_dir,
- node);
+ sizeof spoolfile,
+ "%s/%s",
+ ctdl_netout_dir,
+ node
+ );
if (access(spoolfile, R_OK) == 0) {
poll = 1;
}
* It's ok if these directories already exist. Just fail silently.
*/
void create_spool_dirs(void) {
- mkdir(ctdl_spool_dir, 0700);
- chown(ctdl_spool_dir, CTDLUID, (-1));
- mkdir(ctdl_netin_dir, 0700);
- chown(ctdl_netin_dir, CTDLUID, (-1));
- mkdir(ctdl_netout_dir, 0700);
- chown(ctdl_netout_dir, CTDLUID, (-1));
+ if ((mkdir(ctdl_spool_dir, 0700) != 0) && (errno != EEXIST))
+ syslog(LOG_EMERG, "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));
+ if ((mkdir(ctdl_netin_dir, 0700) != 0) && (errno != EEXIST))
+ syslog(LOG_EMERG, "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));
+ if ((mkdir(ctdl_nettmp_dir, 0700) != 0) && (errno != EEXIST))
+ syslog(LOG_EMERG, "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));
+ if ((mkdir(ctdl_netout_dir, 0700) != 0) && (errno != EEXIST))
+ syslog(LOG_EMERG, "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));
}
* Run through the rooms doing various types of network stuff.
*/
void network_do_queue(void) {
+ static int doing_queue = 0;
static time_t last_run = 0L;
struct RoomProcList *ptr;
int full_processing = 1;
*/
if ( (time(NULL) - last_run) < config.c_net_freq ) {
full_processing = 0;
+ syslog(LOG_DEBUG, "Network full processing in %ld seconds.\n",
+ config.c_net_freq - (time(NULL)- last_run)
+ );
}
/*
* don't really require extremely fine granularity here, we'll do it
* with a static variable instead.
*/
- if (doing_queue) return;
+ if (doing_queue) {
+ return;
+ }
doing_queue = 1;
/* Load the IGnet Configuration into memory */
/*
* Go ahead and run the queue
*/
- if (full_processing) {
- lprintf(CTDL_DEBUG, "network: loading outbound queue\n");
- ForEachRoom(network_queue_room, NULL);
+ if (full_processing && !server_shutting_down) {
+ syslog(LOG_DEBUG, "network: loading outbound queue\n");
+ CtdlForEachRoom(network_queue_room, NULL);
}
if (rplist != NULL) {
- lprintf(CTDL_DEBUG, "network: running outbound queue\n");
- while (rplist != NULL) {
+ syslog(LOG_DEBUG, "network: running outbound queue\n");
+ while (rplist != NULL && !server_shutting_down) {
char spoolroomname[ROOMNAMELEN];
safestrncpy(spoolroomname, rplist->name, sizeof spoolroomname);
begin_critical_section(S_RPLIST);
}
/* If there is anything in the inbound queue, process it */
- network_do_spoolin();
+ if (!server_shutting_down) {
+ network_do_spoolin();
+ }
/* Save the network map back to disk */
write_network_map();
free_filter_list(filterlist);
filterlist = NULL;
- network_purge_spoolout();
+ network_consolidate_spoolout();
- lprintf(CTDL_DEBUG, "network: queue run completed\n");
+ syslog(LOG_DEBUG, "network: queue run completed\n");
if (full_processing) {
last_run = time(NULL);
char secret[256];
char nexthop[256];
+ char err_buf[SIZ];
/* Authenticate */
extract_token(node, cmdbuf, 0, '|', sizeof node);
extract_token(pass, cmdbuf, 1, '|', sizeof pass);
- if (doing_queue) {
- lprintf(CTDL_WARNING, "Network node <%s> refused - spooling", node);
- cprintf("%d spooling - try again in a few minutes\n",
- ERROR + RESOURCE_BUSY);
- return;
- }
-
/* load the IGnet Configuration to check node validity */
load_working_ignetcfg();
v = is_valid_node(nexthop, secret, node);
if (v != 0) {
- lprintf(CTDL_WARNING, "Unknown node <%s>\n", node);
- cprintf("%d authentication failed\n",
- ERROR + PASSWORD_REQUIRED);
+ snprintf(err_buf, sizeof err_buf,
+ "An unknown Citadel server called \"%s\" attempted to connect from %s [%s].\n",
+ node, CC->cs_host, CC->cs_addr
+ );
+ syslog(LOG_WARNING, "%s", err_buf);
+ cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
+ CtdlAideMessage(err_buf, "IGNet Networking.");
return;
}
if (strcasecmp(pass, secret)) {
- lprintf(CTDL_WARNING, "Bad password for network node <%s>", node);
+ snprintf(err_buf, sizeof err_buf,
+ "A Citadel server at %s [%s] failed to authenticate as network node \"%s\".\n",
+ CC->cs_host, CC->cs_addr, node
+ );
+ syslog(LOG_WARNING, "%s", err_buf);
cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
+ CtdlAideMessage(err_buf, "IGNet Networking.");
return;
}
if (network_talking_to(node, NTT_CHECK)) {
- lprintf(CTDL_WARNING, "Duplicate session for network node <%s>", node);
+ syslog(LOG_WARNING, "Duplicate session for network node <%s>", node);
cprintf("%d Already talking to %s right now\n", ERROR + RESOURCE_BUSY, node);
return;
}
safestrncpy(CC->net_node, node, sizeof CC->net_node);
network_talking_to(node, NTT_ADD);
- lprintf(CTDL_NOTICE, "Network node <%s> logged in\n", CC->net_node);
- cprintf("%d authenticated as network node '%s'\n", CIT_OK,
- CC->net_node);
+ syslog(LOG_NOTICE, "Network node <%s> logged in from %s [%s]\n",
+ CC->net_node, CC->cs_host, CC->cs_addr
+ );
+ cprintf("%d authenticated as network node '%s'\n", CIT_OK, CC->net_node);
}
+
int network_room_handler (struct ctdlroom *room)
{
network_queue_room(room, NULL);
return 0;
}
+
/*
* Module entry point
*/
CTDL_MODULE_INIT(network)
{
- create_spool_dirs();
- CtdlRegisterProtoHook(cmd_gnet, "GNET", "Get network config");
- CtdlRegisterProtoHook(cmd_snet, "SNET", "Set network config");
- CtdlRegisterProtoHook(cmd_netp, "NETP", "Identify as network poller");
- CtdlRegisterProtoHook(cmd_nsyn, "NSYN", "Synchronize room to node");
- CtdlRegisterSessionHook(network_do_queue, EVT_TIMER);
- CtdlRegisterRoomHook(network_room_handler);
-
- /* return our Subversion id for the Log */
- return "$Id$";
+ if (!threading)
+ {
+ create_spool_dirs();
+ CtdlRegisterProtoHook(cmd_gnet, "GNET", "Get network config");
+ CtdlRegisterProtoHook(cmd_snet, "SNET", "Set network config");
+ CtdlRegisterProtoHook(cmd_netp, "NETP", "Identify as network poller");
+ CtdlRegisterProtoHook(cmd_nsyn, "NSYN", "Synchronize room to node");
+ CtdlRegisterRoomHook(network_room_handler);
+ CtdlRegisterCleanupHook(destroy_network_queue_room);
+ CtdlRegisterSessionHook(network_do_queue, EVT_TIMER);
+ }
+ return "network";
}
projects / citadel.git / blobdiff