/*
- * $Id$
- *
* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
*/
msg = CtdlFetchMessage(msgnum, 1);
if (msg != NULL) {
-
+ 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']);
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);
+ /* write it to a spool file */
+ snprintf(filename, sizeof filename,"%s/%s@%lx%x",
+ ctdl_netout_dir,
+ mptr->remote_nodename,
+ time(NULL),
+ rand()
+ );
CtdlLogPrintf(CTDL_DEBUG, "Appending to %s\n", filename);
fp = fopen(filename, "ab");
if (fp != NULL) {
strcpy(nexthop, msg->cm_fields['D']);
}
snprintf(filename,
- sizeof filename,
- "%s/%s",
- ctdl_netout_dir,
- nexthop);
+ sizeof filename,
+ "%s/%s@%lx%x",
+ ctdl_netout_dir,
+ nexthop,
+ time(NULL),
+ rand()
+ );
CtdlLogPrintf(CTDL_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 {
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[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
+ );
+
+ CtdlLogPrintf(CTDL_DEBUG, "Consolidate %s to %s\n", filename, nexthop);
+ if (network_talking_to(nexthop, NTT_CHECK)) {
+ CtdlLogPrintf(CTDL_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) {
- size_t siz;
long download_len = 0L;
long bytes_received = 0L;
- long bytes_copied = 0L;
char buf[SIZ];
static char pbuf[IGNET_PACKET_SIZE];
char tempfilename[PATH_MAX];
- char filename[PATH_MAX];
+ char permfilename[PATH_MAX];
long plen;
- FILE *fp, *newfp;
+ FILE *fp;
+
+ 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()
+ );
- CtdlMakeTempFileName(tempfilename, sizeof tempfilename);
if (sock_puts(sock, "NDOP") < 0) return;
if (sock_getln(sock, buf, sizeof buf) < 0) return;
CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
}
download_len = extract_long(&buf[4], 0);
- bytes_received = 0L;
- fp = fopen(tempfilename, "w");
- if (fp == NULL) {
- CtdlLogPrintf(CTDL_CRIT, "cannot open download file locally: %s\n",
- strerror(errno));
- return;
- }
-
- while (bytes_received < download_len) {
- /**
- * If shutting down we can exit here and unlink the temp file.
- * this shouldn't loose us any messages.
- */
- if (CtdlThreadCheckStop())
- {
- fclose(fp);
- unlink(tempfilename);
+ if (download_len>0) {
+ bytes_received = 0L;
+ fp = fopen(tempfilename, "w");
+ if (fp == NULL) {
+ CtdlLogPrintf(CTDL_CRIT, "cannot open download file locally: %s\n",
+ strerror(errno));
return;
}
- snprintf(buf, sizeof buf, "READ %ld|%ld",
- 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_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, 1) < 0) {
+
+ CtdlLogPrintf(CTDL_DEBUG, "For this download we are expecting %d bytes\n", download_len);
+ while (bytes_received < download_len) {
+ /*
+ * If shutting down we can exit here and unlink the temp file.
+ * this shouldn't loose us any messages.
+ */
+ if (CtdlThreadCheckStop())
+ {
+ fclose(fp);
+ unlink(tempfilename);
+ return;
+ }
+ snprintf(buf, sizeof buf, "READ %ld|%ld",
+ 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;
}
- fwrite((char *) pbuf, plen, 1, fp);
- bytes_received = bytes_received + plen;
+ 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, 1) < 0) {
+ fclose(fp);
+ unlink(tempfilename);
+ return;
+ }
+ fwrite((char *) pbuf, plen, 1, fp);
+ bytes_received = bytes_received + plen;
+ }
}
- }
- fclose(fp);
- /** Last chance for shutdown exit */
+ fclose(fp);
+ }
+ /* Last chance for shutdown exit */
if (CtdlThreadCheckStop())
{
unlink(tempfilename);
return;
}
+
if (sock_puts(sock, "CLOS") < 0) {
unlink(tempfilename);
return;
}
- /**
+
+ /*
* From here on we must complete or messages will get lost
*/
if (sock_getln(sock, buf, sizeof buf) < 0) {
}
CtdlLogPrintf(CTDL_DEBUG, "%s\n", buf);
- /* Now copy the temp file to its permanent location.
- * (We copy instead of link because they may be on different filesystems)
+ /* Now move the temp file to its permanent location.
*/
- begin_critical_section(S_NETSPOOL);
- snprintf(filename,
- sizeof filename,
- "%s/%s.%ld",
- ctdl_netin_dir,
- remote_nodename,
- (long) getpid()
- );
- fp = fopen(tempfilename, "r");
- if (fp != NULL) {
- newfp = fopen(filename, "w");
- if (newfp != NULL) {
- bytes_copied = 0L;
- while (bytes_copied < download_len) {
- plen = download_len - bytes_copied;
- if (plen > sizeof buf) {
- plen = sizeof buf;
- }
- siz = fread(buf, plen, 1, fp);
- fwrite(buf, plen, 1, newfp);
- bytes_copied += plen;
- }
- fclose(newfp);
- }
- fclose(fp);
+ if (link(tempfilename, permfilename) != 0) {
+ CtdlLogPrintf(CTDL_ALERT, "Could not link %s to %s: %s\n",
+ tempfilename, permfilename, strerror(errno)
+ );
}
- end_critical_section(S_NETSPOOL);
unlink(tempfilename);
}
}
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) {
- CtdlLogPrintf(CTDL_CRIT, "cannot open upload file locally: %s\n",
- strerror(errno));
+ CtdlLogPrintf(CTDL_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 */
+ /* Exit if shutting down */
if (CtdlThreadCheckStop())
{
close(fd);
}
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;
}
CtdlLogPrintf(CTDL_DEBUG, "network: polling <%s>\n", node);
CtdlLogPrintf(CTDL_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) {
CtdlLogPrintf(CTDL_ERR, "Could not connect: %s\n", strerror(errno));
network_talking_to(node, NTT_REMOVE);
* with a static variable instead.
*/
if (doing_queue) {
+ CtdlClearSystemContext();
return NULL;
}
doing_queue = 1;
free_filter_list(filterlist);
filterlist = NULL;
- network_purge_spoolout();
+ network_consolidate_spoolout();
CtdlLogPrintf(CTDL_DEBUG, "network: queue run completed\n");
else {
CtdlLogPrintf(CTDL_DEBUG, "network: Task STOPPED.\n");
}
+ CtdlClearSystemContext();
return NULL;
}
extract_token(node, cmdbuf, 0, '|', sizeof node);
extract_token(pass, cmdbuf, 1, '|', sizeof pass);
- if (doing_queue) {
- CtdlLogPrintf(CTDL_WARNING, "Network node <%s> refused - spooling\n", 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);
else
CtdlThreadSchedule("IGnet Network", CTDLTHREAD_BIGSTACK, network_do_queue, NULL, 0);
/* return our Subversion id for the Log */
- return "$Id$";
+ return "network";
}
projects / citadel.git / blobdiff