X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;h=d8227a8815cb31f3530ec381fdfceef34db64731;hb=8c47559cb5ae97ec0fa35660ee16fd61a9451c72;hp=7b112abf2125b75dac912c0896bc4ed6e45ce217;hpb=3f124f95ceb9615a716f8bcd02659d884cccbb86;p=citadel.git diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index 7b112abf2..d8227a881 100644 --- a/citadel/modules/network/serv_network.c +++ b/citadel/modules/network/serv_network.c @@ -4,8 +4,21 @@ * 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-2009 by the citadel.org team + * + * This program is free 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 @@ -64,6 +77,7 @@ #include "clientsocket.h" #include "file_ops.h" #include "citadel_dirs.h" +#include "threads.h" #ifndef HAVE_SNPRINTF #include "snprintf.h" @@ -305,7 +319,7 @@ int is_valid_node(char *nexthop, char *secret, char *node) { * First try the neighbor nodes */ if (working_ignetcfg == NULL) { - lprintf(CTDL_ERR, "working_ignetcfg is NULL!\n"); + CtdlLogPrintf(CTDL_ERR, "working_ignetcfg is NULL!\n"); if (nexthop != NULL) { strcpy(nexthop, ""); } @@ -353,7 +367,7 @@ int is_valid_node(char *nexthop, char *secret, char *node) { /* * If we get to this point, the supplied node name is bogus. */ - lprintf(CTDL_ERR, "Invalid node name <%s>\n", node); + CtdlLogPrintf(CTDL_ERR, "Invalid node name <%s>\n", node); return(-1); } @@ -362,7 +376,7 @@ int is_valid_node(char *nexthop, char *secret, char *node) { void cmd_gnet(char *argbuf) { - char filename[SIZ]; + char filename[PATH_MAX]; char buf[SIZ]; FILE *fp; @@ -390,8 +404,8 @@ void cmd_gnet(char *argbuf) { void cmd_snet(char *argbuf) { - char tempfilename[SIZ]; - char filename[SIZ]; + char tempfilename[PATH_MAX]; + char filename[PATH_MAX]; char buf[SIZ]; FILE *fp, *newfp; @@ -414,7 +428,7 @@ void cmd_snet(char *argbuf) { } cprintf("%d %s\n", SEND_LISTING, tempfilename); - while (client_getln(buf, sizeof buf), strcmp(buf, "000")) { + while (client_getln(buf, sizeof buf) >= 0 && strcmp(buf, "000")) { fprintf(fp, "%s\n", buf); } fclose(fp); @@ -451,6 +465,7 @@ void network_deliver_digest(SpoolControl *sc) { size_t recps_len = SIZ; struct recptypes *valid; namelist *nptr; + char bounce_to[256]; if (sc->num_msgs_spooled < 1) { fclose(sc->digestfp); @@ -477,6 +492,15 @@ void network_deliver_digest(SpoolControl *sc) { 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 */ @@ -503,7 +527,7 @@ void network_deliver_digest(SpoolControl *sc) { recps = malloc(recps_len); if (recps == NULL) { - lprintf(CTDL_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len); + CtdlLogPrintf(CTDL_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len); abort(); } @@ -517,10 +541,17 @@ void network_deliver_digest(SpoolControl *sc) { 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); } @@ -534,6 +565,7 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc) { size_t recps_len = SIZ; struct recptypes *valid; namelist *nptr; + char bounce_to[256]; /* Don't do this if there were no recipients! */ if (sc->listrecps == NULL) return; @@ -550,7 +582,7 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc) { recps = malloc(recps_len); if (recps == NULL) { - lprintf(CTDL_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len); + CtdlLogPrintf(CTDL_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len); abort(); } @@ -564,11 +596,18 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc) { 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. */ } @@ -588,7 +627,7 @@ void network_spool_msg(long msgnum, void *userdata) { maplist *mptr; struct ser_ret sermsg; FILE *fp; - char filename[SIZ]; + char filename[PATH_MAX]; char buf[SIZ]; int bang = 0; int send = 1; @@ -609,6 +648,18 @@ void network_spool_msg(long msgnum, void *userdata) { msg = CtdlFetchMessage(msgnum, 1); if (msg != NULL) { + /* 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)"); @@ -669,7 +720,7 @@ void network_spool_msg(long msgnum, void *userdata) { CC->redirect_alloc = 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); @@ -734,8 +785,8 @@ void network_spool_msg(long msgnum, void *userdata) { } 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); } @@ -784,19 +835,24 @@ void network_spool_msg(long msgnum, void *userdata) { /* 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); + CtdlLogPrintf(CTDL_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']); + CtdlLogPrintf(CTDL_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); + CtdlLogPrintf(CTDL_DEBUG, "Compare <%s> to <%s>\n", + buf, mptr->remote_nodename) ; if (!strcasecmp(buf, mptr->remote_nodename)) { send = 0; + CtdlLogPrintf(CTDL_DEBUG, "Not sending to %s\n", + mptr->remote_nodename); + } + else { + CtdlLogPrintf(CTDL_DEBUG, "Sending to %s\n", mptr->remote_nodename); } } @@ -825,7 +881,7 @@ void network_spool_msg(long msgnum, void *userdata) { snprintf(filename, sizeof filename,"%s/%s", ctdl_netout_dir, mptr->remote_nodename); - lprintf(CTDL_DEBUG, "Appending to %s\n", filename); + CtdlLogPrintf(CTDL_DEBUG, "Appending to %s\n", filename); fp = fopen(filename, "ab"); if (fp != NULL) { fwrite(sermsg.ser, @@ -833,7 +889,7 @@ void network_spool_msg(long msgnum, void *userdata) { fclose(fp); } else { - lprintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno)); + CtdlLogPrintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno)); } /* free the serialized version */ @@ -863,7 +919,6 @@ int read_spoolcontrol_file(SpoolControl **scc, char *filename) char buf[SIZ]; char nodename[256]; char roomname[ROOMNAMELEN]; - char nexthop[256]; size_t miscsize = 0; size_t linesize = 0; int skipthisline = 0; @@ -908,23 +963,13 @@ int read_spoolcontrol_file(SpoolControl **scc, char *filename) 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. - */ 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 = (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; - } - } + 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 @@ -1002,7 +1047,7 @@ int writenfree_spoolcontrol_file(SpoolControl **scc, char *filename) sc = *scc; fp = fopen(filename, "w"); if (fp == NULL) { - lprintf(CTDL_CRIT, "ERROR: cannot open %s: %s\n", + CtdlLogPrintf(CTDL_CRIT, "ERROR: cannot open %s: %s\n", filename, strerror(errno)); free_spoolcontrol_struct(scc); } @@ -1033,14 +1078,7 @@ int writenfree_spoolcontrol_file(SpoolControl **scc, char *filename) 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); + 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); } @@ -1060,27 +1098,29 @@ int writenfree_spoolcontrol_file(SpoolControl **scc, char *filename) } return 1; } -int is_recipient(SpoolControl *sc, char *Name) +int is_recipient(SpoolControl *sc, const char *Name) { namelist *nptr; + size_t len; + len = strlen(Name); nptr = sc->listrecps; while (nptr != NULL) { - if (strcmp(Name, nptr->name)==0) + if (strncmp(Name, nptr->name, len)==0) return 1; nptr = nptr->next; } /* Do the same for digestrecps */ nptr = sc->digestrecps; while (nptr != NULL) { - if (strcmp(Name, nptr->name)==0) + if (strncmp(Name, nptr->name, len)==0) return 1; nptr = nptr->next; } /* Do the same for participates */ nptr = sc->participates; while (nptr != NULL) { - if (strcmp(Name, nptr->name)==0) + if (strncmp(Name, nptr->name, len)==0) return 1; nptr = nptr->next; } @@ -1093,7 +1133,7 @@ int is_recipient(SpoolControl *sc, char *Name) */ void network_spoolout_room(char *room_to_spool) { char buf[SIZ]; - char filename[SIZ]; + char filename[PATH_MAX]; SpoolControl *sc; int i; @@ -1103,22 +1143,20 @@ void network_spoolout_room(char *room_to_spool) { * 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); + CtdlLogPrintf(CTDL_CRIT, "ERROR: cannot load <%s>\n", room_to_spool); return; } assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir); - - lprintf(CTDL_INFO, "Networking started for <%s>\n", CC->room.QRname); 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; } + CtdlLogPrintf(CTDL_INFO, "Networking started for <%s>\n", CC->room.QRname); /* If there are digest recipients, we have to build a digest */ if (sc->digestrecps != NULL) { @@ -1169,7 +1207,7 @@ int network_sync_to(char *target_node) { 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 */ @@ -1214,7 +1252,7 @@ int network_sync_to(char *target_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", + CtdlLogPrintf(CTDL_NOTICE, "Synchronized %d messages to <%s>\n", num_spooled, target_node); return(num_spooled); } @@ -1333,7 +1371,7 @@ void network_bounce(struct CtdlMessage *msg, char *reason) { static int serialnum = 0; size_t size; - lprintf(CTDL_DEBUG, "entering network_bounce()\n"); + CtdlLogPrintf(CTDL_DEBUG, "entering network_bounce()\n"); if (msg == NULL) return; @@ -1403,7 +1441,7 @@ void network_bounce(struct CtdlMessage *msg, char *reason) { 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; @@ -1417,12 +1455,12 @@ void network_bounce(struct CtdlMessage *msg, char *reason) { 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"); + CtdlLogPrintf(CTDL_DEBUG, "leaving network_bounce()\n"); } @@ -1440,7 +1478,7 @@ void network_process_buffer(char *buffer, long size) { 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; @@ -1450,7 +1488,7 @@ void network_process_buffer(char *buffer, long size) { firstbyte = buffer[0]; lastbyte = buffer[size-1]; if ( (firstbyte != 255) || (lastbyte != 0) ) { - lprintf(CTDL_ERR, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d\n", + CtdlLogPrintf(CTDL_ERR, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d\n", size, firstbyte, lastbyte); return; } @@ -1477,9 +1515,7 @@ void network_process_buffer(char *buffer, long size) { /* 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']; @@ -1506,7 +1542,7 @@ void network_process_buffer(char *buffer, long size) { "%s/%s", ctdl_netout_dir, nexthop); - lprintf(CTDL_DEBUG, "Appending to %s\n", filename); + CtdlLogPrintf(CTDL_DEBUG, "Appending to %s\n", filename); fp = fopen(filename, "ab"); if (fp != NULL) { fwrite(sermsg.ser, @@ -1514,7 +1550,7 @@ void network_process_buffer(char *buffer, long size) { fclose(fp); } else { - lprintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno)); + CtdlLogPrintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno)); } free(sermsg.ser); CtdlFreeMessage(msg); @@ -1561,7 +1597,7 @@ void network_process_buffer(char *buffer, long size) { /* 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" @@ -1595,7 +1631,7 @@ void network_process_buffer(char *buffer, long size) { /* 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); @@ -1637,12 +1673,12 @@ void network_process_file(char *filename) { fp = fopen(filename, "rb"); if (fp == NULL) { - lprintf(CTDL_CRIT, "Error opening %s: %s\n", filename, strerror(errno)); + CtdlLogPrintf(CTDL_CRIT, "Error opening %s: %s\n", filename, strerror(errno)); return; } fseek(fp, 0L, SEEK_END); - lprintf(CTDL_INFO, "network: processing %ld bytes from %s\n", ftell(fp), filename); + CtdlLogPrintf(CTDL_INFO, "network: processing %ld bytes from %s\n", ftell(fp), filename); rewind(fp); /* Look for messages in the data stream and break them out */ @@ -1676,7 +1712,7 @@ void network_do_spoolin(void) { DIR *dp; struct dirent *d; struct stat statbuf; - char filename[256]; + char filename[PATH_MAX]; static time_t last_spoolin_mtime = 0L; /* @@ -1685,11 +1721,11 @@ void network_do_spoolin(void) { */ if (stat(ctdl_netin_dir, &statbuf)) return; if (statbuf.st_mtime == last_spoolin_mtime) { - lprintf(CTDL_DEBUG, "network: nothing in inbound queue\n"); + CtdlLogPrintf(CTDL_DEBUG, "network: nothing in inbound queue\n"); return; } last_spoolin_mtime = statbuf.st_mtime; - lprintf(CTDL_DEBUG, "network: processing inbound queue\n"); + CtdlLogPrintf(CTDL_DEBUG, "network: processing inbound queue\n"); /* * Ok, there's something interesting in there, so scan it. @@ -1718,7 +1754,7 @@ void network_do_spoolin(void) { void network_purge_spoolout(void) { DIR *dp; struct dirent *d; - char filename[256]; + char filename[PATH_MAX]; char nexthop[256]; int i; @@ -1764,7 +1800,7 @@ void receive_spool(int sock, char *remote_nodename) { CtdlMakeTempFileName(tempfilename, sizeof tempfilename); if (sock_puts(sock, "NDOP") < 0) return; if (sock_getln(sock, buf, sizeof buf) < 0) return; - lprintf(CTDL_DEBUG, "<%s\n", buf); + CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf); if (buf[0] != '2') { return; } @@ -1773,12 +1809,22 @@ void receive_spool(int sock, char *remote_nodename) { bytes_received = 0L; fp = fopen(tempfilename, "w"); if (fp == NULL) { - lprintf(CTDL_CRIT, "cannot open download file locally: %s\n", + 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); + return; + } snprintf(buf, sizeof buf, "READ %ld|%ld", bytes_received, ((download_len - bytes_received > IGNET_PACKET_SIZE) @@ -1806,18 +1852,27 @@ void receive_spool(int sock, char *remote_nodename) { } 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) { unlink(tempfilename); return; } if (download_len > 0) { - lprintf(CTDL_NOTICE, "Received %ld octets from <%s>\n", download_len, remote_nodename); + CtdlLogPrintf(CTDL_NOTICE, "Received %ld octets from <%s>\n", download_len, remote_nodename); } - lprintf(CTDL_DEBUG, "%s\n", buf); + 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) @@ -1868,7 +1923,7 @@ void transmit_spool(int sock, char *remote_nodename) if (sock_puts(sock, "NUOP") < 0) return; if (sock_getln(sock, buf, sizeof buf) < 0) return; - lprintf(CTDL_DEBUG, "<%s\n", buf); + CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf); if (buf[0] != '2') { return; } @@ -1880,7 +1935,7 @@ void transmit_spool(int sock, char *remote_nodename) fd = open(sfname, O_RDONLY); if (fd < 0) { if (errno != ENOENT) { - lprintf(CTDL_CRIT, "cannot open upload file locally: %s\n", + CtdlLogPrintf(CTDL_CRIT, "cannot open upload file locally: %s\n", strerror(errno)); } return; @@ -1889,6 +1944,13 @@ void transmit_spool(int sock, char *remote_nodename) 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 (CtdlThreadCheckStop()) + { + close(fd); + return; + } + snprintf(buf, sizeof buf, "WRIT %ld", bytes_to_write); if (sock_puts(sock, buf) < 0) { close(fd); @@ -1915,13 +1977,20 @@ void transmit_spool(int sock, char *remote_nodename) ABORTUPL: close(fd); + /** Last chance for shutdown exit */ + if(CtdlThreadCheckStop()) + return; + if (sock_puts(sock, "UCLS 1") < 0) return; + /** + * From here on we must complete or messages will get lost + */ if (sock_getln(sock, buf, sizeof buf) < 0) return; - lprintf(CTDL_NOTICE, "Sent %ld octets to <%s>\n", + CtdlLogPrintf(CTDL_NOTICE, "Sent %ld octets to <%s>\n", bytes_written, remote_nodename); - lprintf(CTDL_DEBUG, "<%s\n", buf); + CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf); if (buf[0] == '2') { - lprintf(CTDL_DEBUG, "Removing <%s>\n", sfname); + CtdlLogPrintf(CTDL_DEBUG, "Removing <%s>\n", sfname); unlink(sfname); } } @@ -1934,35 +2003,47 @@ ABORTUPL: 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]; 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); + CtdlLogPrintf(CTDL_NOTICE, "Connecting to <%s> at %s:%s\n", node, host, port); sock = sock_connect(host, port, "tcp"); if (sock < 0) { - lprintf(CTDL_ERR, "Could not connect: %s\n", strerror(errno)); + CtdlLogPrintf(CTDL_ERR, "Could not connect: %s\n", strerror(errno)); network_talking_to(node, NTT_REMOVE); return; } - lprintf(CTDL_DEBUG, "Connected!\n"); + CtdlLogPrintf(CTDL_DEBUG, "Connected!\n"); /* Read the server greeting */ if (sock_getln(sock, buf, sizeof buf) < 0) goto bail; - lprintf(CTDL_DEBUG, ">%s\n", buf); + CtdlLogPrintf(CTDL_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); + aide_message(err_buf, "IGNet Networking error."); + } /* Identify ourselves */ snprintf(buf, sizeof buf, "NETP %s|%s", config.c_nodename, secret); - lprintf(CTDL_DEBUG, "<%s\n", buf); + CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf); if (sock_puts(sock, buf) <0) goto bail; if (sock_getln(sock, buf, sizeof buf) < 0) goto bail; - lprintf(CTDL_DEBUG, ">%s\n", buf); + CtdlLogPrintf(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); + if (!CtdlThreadCheckStop()) + receive_spool(sock, node); + if (!CtdlThreadCheckStop()) + transmit_spool(sock, node); sock_puts(sock, "QUIT"); bail: sock_close(sock); @@ -1987,12 +2068,14 @@ void network_poll_other_citadel_nodes(int full_poll) { char spoolfile[256]; if (working_ignetcfg == NULL) { - lprintf(CTDL_DEBUG, "No nodes defined - not polling\n"); + CtdlLogPrintf(CTDL_DEBUG, "No nodes defined - not polling\n"); return; } /* Use the string tokenizer to grab one line at a time */ for (i=0; iname, sizeof spoolroomname); begin_critical_section(S_RPLIST); @@ -2116,7 +2205,8 @@ void network_do_queue(void) { } /* If there is anything in the inbound queue, process it */ - network_do_spoolin(); + if (!CtdlThreadCheckStop()) + network_do_spoolin(); /* Save the network map back to disk */ write_network_map(); @@ -2127,13 +2217,18 @@ void network_do_queue(void) { network_purge_spoolout(); - lprintf(CTDL_DEBUG, "network: queue run completed\n"); + CtdlLogPrintf(CTDL_DEBUG, "network: queue run completed\n"); if (full_processing) { last_run = time(NULL); } doing_queue = 0; + if (!CtdlThreadCheckStop()) // Only reschedule if system is not stopping + CtdlThreadSchedule("IGnet Network", CTDLTHREAD_BIGSTACK, network_do_queue, NULL, time(NULL) + 60); + else + CtdlLogPrintf(CTDL_DEBUG, "network: Task STOPPED.\n"); + return NULL; } @@ -2149,15 +2244,15 @@ void cmd_netp(char *cmdbuf) 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); + CtdlLogPrintf(CTDL_WARNING, "Network node <%s> refused - spooling\n", node); + cprintf("%d spooling - try again in a few minutes\n", ERROR + RESOURCE_BUSY); return; } @@ -2166,37 +2261,49 @@ void cmd_netp(char *cmdbuf) 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 + ); + CtdlLogPrintf(CTDL_WARNING, err_buf); + cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED); + aide_message(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 + ); + CtdlLogPrintf(CTDL_WARNING, err_buf); cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED); + aide_message(err_buf, "IGNet Networking."); return; } if (network_talking_to(node, NTT_CHECK)) { - lprintf(CTDL_WARNING, "Duplicate session for network node <%s>", node); + CtdlLogPrintf(CTDL_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); + CtdlLogPrintf(CTDL_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 */ @@ -2209,11 +2316,11 @@ CTDL_MODULE_INIT(network) 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); CtdlRegisterCleanupHook(destroy_network_queue_room); } - + else + CtdlThreadSchedule("IGnet Network", CTDLTHREAD_BIGSTACK, network_do_queue, NULL, 0); /* return our Subversion id for the Log */ return "$Id$"; }