X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;h=d8227a8815cb31f3530ec381fdfceef34db64731;hb=8c47559cb5ae97ec0fa35660ee16fd61a9451c72;hp=06363b92d3d8565fadfdd40923005f1e48f179e6;hpb=1e656d277fe91b7c4f5d73eab4a0dd0b7a173145;p=citadel.git diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index 06363b92d..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" @@ -87,7 +101,7 @@ struct RoomProcList *rplist = NULL; /* * 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; @@ -117,12 +131,12 @@ void load_working_ignetcfg(void) { /* * 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 */ @@ -130,7 +144,7 @@ struct FilterList *load_filter_list(void) { /* Use the string tokenizer to grab one line at a time */ for (i=0; ifl_user, buf, 0, '|', sizeof nptr->fl_user); striplt(nptr->fl_user); extract_token(nptr->fl_room, buf, 1, '|', sizeof nptr->fl_room); @@ -157,7 +171,7 @@ struct FilterList *load_filter_list(void) { } -void free_filter_list(struct FilterList *fl) { +void free_filter_list(FilterList *fl) { if (fl == NULL) return; free_filter_list(fl->next); free(fl); @@ -222,7 +236,7 @@ void read_network_map(void) { 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 */ @@ -230,7 +244,7 @@ void read_network_map(void) { /* Use the string tokenizer to grab one line at a time */ for (i=0; inodename, buf, 0, '|', sizeof nmptr->nodename); nmptr->lastcontact = extract_long(buf, 1); extract_token(nmptr->nexthop, buf, 2, '|', sizeof nmptr->nexthop); @@ -248,7 +262,7 @@ void read_network_map(void) { */ void write_network_map(void) { char *serialized_map = NULL; - struct NetMap *nmptr; + NetMap *nmptr; if (netmap_changed) { @@ -295,7 +309,7 @@ int is_valid_node(char *nexthop, char *secret, char *node) { char linebuf[SIZ]; char buf[SIZ]; int retval; - struct NetMap *nmptr; + NetMap *nmptr; if (node == NULL) { return(-1); @@ -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); @@ -442,7 +456,7 @@ void cmd_snet(char *argbuf) { /* * 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; @@ -450,7 +464,8 @@ void network_deliver_digest(struct SpoolControl *sc) { 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); @@ -477,6 +492,15 @@ void network_deliver_digest(struct 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(struct 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(struct 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); } @@ -529,11 +560,12 @@ void network_deliver_digest(struct SpoolControl *sc) { /* * 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; @@ -550,7 +582,7 @@ void network_deliver_list(struct CtdlMessage *msg, struct 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, struct 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. */ } @@ -579,16 +618,16 @@ void network_deliver_list(struct CtdlMessage *msg, struct SpoolControl *sc) { * 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; @@ -596,7 +635,7 @@ void network_spool_msg(long msgnum, void *userdata) { int ok_to_participate = 0; struct recptypes *valid; - sc = (struct SpoolControl *)userdata; + sc = (SpoolControl *)userdata; /* * Process mailing list recipients @@ -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 */ @@ -856,95 +912,64 @@ void network_spool_msg(long msgnum, void *userdata) { } -/* - * 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); + sc->lastsent = extract_long(buf, 1); } else if (!strcasecmp(instr, "listrecp")) { - nptr = (struct namelist *) - malloc(sizeof(struct namelist)); - nptr->next = sc.listrecps; + 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; + 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; + 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. - */ 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 @@ -965,9 +990,9 @@ void network_spoolout_room(char *room_to_spool) { 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; } } @@ -975,92 +1000,195 @@ void network_spoolout_room(char *room_to_spool) { } fclose(fp); + return 1; +} - /* 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"); - } - - /* Do something useful */ - CtdlForEachMessage(MSGS_GT, sc.lastsent, NULL, NULL, NULL, - network_spool_msg, &sc); +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; +} - /* 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; buf[i]; ++i) { - buf[i] = tolower(buf[i]); - if (isspace(buf[i])) buf[i] = '_'; - } - if (sc.digestfp != NULL) { - fprintf(sc.digestfp, " -----------------------------------" - "------------------------------------" - "-------\n" - "You are subscribed to the '%s' " - "list.\n" - "To post to the list: %s\n", - CC->room.QRname, buf - ); - network_deliver_digest(&sc); /* deliver and close */ - } +int writenfree_spoolcontrol_file(SpoolControl **scc, char *filename) +{ + FILE *fp; + SpoolControl *sc; + namelist *nptr = NULL; + maplist *mptr = NULL; - /* Now rewrite the config file */ + 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); } else { - fprintf(fp, "lastsent|%ld\n", sc.lastsent); + 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; + 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; + 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->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); + while (sc->ignet_push_shares != NULL) { + 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; + 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); + if (sc->misc != NULL) { + fwrite(sc->misc, strlen(sc->misc), 1, fp); } - free(sc.misc); + free(sc->misc); fclose(fp); + 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 (getroom(&CC->room, room_to_spool) != 0) { + CtdlLogPrintf(CTDL_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; + } + 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) { + 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); + + /* 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; buf[i]; ++i) { + buf[i] = tolower(buf[i]); + if (isspace(buf[i])) buf[i] = '_'; + } + if (sc->digestfp != NULL) { + fprintf(sc->digestfp, " -----------------------------------" + "------------------------------------" + "-------\n" + "You are subscribed to the '%s' " + "list.\n" + "To post to the list: %s\n", + CC->room.QRname, buf + ); + network_deliver_digest(sc); /* deliver and close */ + } + + /* Now rewrite the config file */ + writenfree_spoolcontrol_file (&sc, filename); end_critical_section(S_NETCONFIGS); } @@ -1072,14 +1200,14 @@ void network_spoolout_room(char *room_to_spool) { * 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 */ @@ -1100,9 +1228,9 @@ int network_sync_to(char *target_node) { 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, @@ -1124,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); } @@ -1171,7 +1299,7 @@ void network_queue_room(struct ctdlroom *qrbuf, void *data) { void destroy_network_queue_room(void) { struct RoomProcList *cur, *p; - struct NetMap *nmcur, *nmp; + NetMap *nmcur, *nmp; cur = rplist; begin_critical_section(S_RPLIST); @@ -1203,7 +1331,7 @@ void destroy_network_queue_room(void) */ void network_learn_topology(char *node, char *path) { char nexthop[256]; - struct NetMap *nmptr; + NetMap *nmptr; strcpy(nexthop, ""); @@ -1218,7 +1346,7 @@ void network_learn_topology(char *node, char *path) { } /* 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); @@ -1243,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; @@ -1313,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; @@ -1327,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"); } @@ -1350,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; @@ -1360,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; } @@ -1387,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']; @@ -1416,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, @@ -1424,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); @@ -1471,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" @@ -1505,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); @@ -1547,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 */ @@ -1586,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; /* @@ -1595,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. @@ -1628,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; @@ -1674,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; } @@ -1683,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) @@ -1716,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) @@ -1778,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; } @@ -1790,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; @@ -1799,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); @@ -1825,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); } } @@ -1844,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); @@ -1897,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); @@ -2026,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(); @@ -2037,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; } @@ -2059,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; } @@ -2076,52 +2261,66 @@ 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 */ 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); - CtdlRegisterCleanupHook(destroy_network_queue_room); - - + 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); + } + else + CtdlThreadSchedule("IGnet Network", CTDLTHREAD_BIGSTACK, network_do_queue, NULL, 0); /* return our Subversion id for the Log */ return "$Id$"; }