X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=ab0aa9f9963dd6032d632c6261607f89d953b343;hb=5747f91e3c71cf1ecaa20bab38e74925c3f1271d;hp=3bb6166141dff6af4b8832c09a6ab4909c6da116;hpb=4be2e2842e9df34ff430fd4ac6bc4c8e1a9725fe;p=citadel.git diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c index 3bb616614..ab0aa9f99 100644 --- a/citadel/modules/network/serv_netspool.c +++ b/citadel/modules/network/serv_netspool.c @@ -2,15 +2,15 @@ * This module handles shared rooms, inter-Citadel mail, and outbound * mailing list processing. * - * Copyright (c) 2000-2012 by the citadel.org team + * Copyright (c) 2000-2016 by the citadel.org team * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 3. + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 3. * - * 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. + * 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. * * ** NOTE ** A word on the S_NETCONFIGS semaphore: * This is a fairly high-level type of critical section. It ensures that no @@ -60,6 +60,7 @@ #include #include #include +#include #include #include "citadel.h" #include "server.h" @@ -98,7 +99,6 @@ */ void network_bounce(struct CtdlMessage **pMsg, char *reason) { - struct CitContext *CCC = CC; char buf[SIZ]; char bouncesource[SIZ]; char recipient[SIZ]; @@ -108,11 +108,11 @@ void network_bounce(struct CtdlMessage **pMsg, char *reason) long len; struct CtdlMessage *msg = *pMsg; *pMsg = NULL; - QNM_syslog(LOG_DEBUG, "entering network_bounce()\n"); + syslog(LOG_DEBUG, "entering network_bounce()"); if (msg == NULL) return; - snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, config.c_nodename); + snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, CtdlGetConfigStr("c_nodename")); /* * Give it a fresh message ID @@ -122,7 +122,7 @@ void network_bounce(struct CtdlMessage **pMsg, char *reason) (long)time(NULL), (long)getpid(), ++serialnum, - config.c_fqdn); + CtdlGetConfigStr("c_fqdn")); CM_SetField(msg, emessageId, buf, len); @@ -130,7 +130,9 @@ void network_bounce(struct CtdlMessage **pMsg, char *reason) * FIXME ... right now we're just sending a bounce; we really want to * include the text of the bounced message. */ - CM_SetField(msg, eMesageText, reason, strlen(reason)); + if (!IsEmptyStr(reason)) { + CM_SetField(msg, eMesageText, reason, strlen(reason)); + } msg->cm_format_type = 0; /* @@ -144,7 +146,7 @@ void network_bounce(struct CtdlMessage **pMsg, char *reason) msg->cm_fields[eNodeName]); CM_SetField(msg, eAuthor, HKEY(BOUNCESOURCE)); - CM_SetField(msg, eNodeName, CFG_KEY(c_nodename)); + CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename"))); CM_SetField(msg, eMsgSubject, HKEY("Delivery Status Notification (Failure)")); Netmap_AddMe(msg, HKEY("unknown_user")); @@ -156,20 +158,20 @@ void network_bounce(struct CtdlMessage **pMsg, char *reason) valid = NULL; } if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) { - strcpy(force_room, config.c_aideroom); + strcpy(force_room, CtdlGetConfigStr("c_aideroom")); } else { strcpy(force_room, ""); } if ( (valid == NULL) && IsEmptyStr(force_room) ) { - strcpy(force_room, config.c_aideroom); + strcpy(force_room, CtdlGetConfigStr("c_aideroom")); } CtdlSubmitMsg(msg, valid, force_room, 0); /* Clean up */ if (valid != NULL) free_recipients(valid); CM_Free(msg); - QNM_syslog(LOG_DEBUG, "leaving network_bounce()\n"); + syslog(LOG_DEBUG, "leaving network_bounce()"); } @@ -248,10 +250,10 @@ void Netmap_AddMe(struct CtdlMessage *msg, const char *defl, long defllen) if (CM_IsEmpty(msg, eMessagePath)) { CM_SetField(msg, eMessagePath, defl, defllen); } - node_len = configlen.c_nodename; + node_len = strlen(CtdlGetConfigStr("c_nodename")); if (node_len >= SIZ) node_len = SIZ - 1; - memcpy(buf, config.c_nodename, node_len); + memcpy(buf, CtdlGetConfigStr("c_nodename"), node_len); buf[node_len] = '!'; buf[node_len + 1] = '\0'; CM_PrependToField(msg, eMessagePath, buf, node_len + 1); @@ -262,14 +264,13 @@ void InspectQueuedRoom(SpoolControl **pSC, HashList *working_ignetcfg, HashList *the_netmap) { - struct CitContext *CCC = CC; SpoolControl *sc; int i = 0; + syslog(LOG_INFO, "InspectQueuedRoom(%s)", room_to_spool->name); + sc = (SpoolControl*)malloc(sizeof(SpoolControl)); memset(sc, 0, sizeof(SpoolControl)); - sc->RNCfg = room_to_spool->OneRNCfg; - sc->lastsent = room_to_spool->lastsent; sc->working_ignetcfg = working_ignetcfg; sc->the_netmap = the_netmap; @@ -279,72 +280,68 @@ void InspectQueuedRoom(SpoolControl **pSC, * queued for networking and then deleted before it can happen. */ if (CtdlGetRoom(&sc->room, room_to_spool->name) != 0) { - syslog(LOG_CRIT, "ERROR: cannot load <%s>\n", room_to_spool->name); - free(sc); - return; - } - if (sc->room.QRhighest <= sc->lastsent) - { - QN_syslog(LOG_DEBUG, "nothing to do for <%s>\n", room_to_spool->name); + syslog(LOG_INFO, "ERROR: cannot load <%s>", room_to_spool->name); free(sc); return; } - begin_critical_section(S_NETCONFIGS); - if (sc->RNCfg == NULL) - sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber); + assert(sc->RNCfg == NULL); // checking to make sure we cleared it from last time - if (!HaveSpoolConfig(sc->RNCfg)) + sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber); + + syslog(LOG_DEBUG, "Room <%s> highest=%ld lastsent=%ld", room_to_spool->name, sc->room.QRhighest, sc->RNCfg->lastsent); + if ( (!HaveSpoolConfig(sc->RNCfg)) || (sc->room.QRhighest <= sc->RNCfg->lastsent) ) { - end_critical_section(S_NETCONFIGS); + // There is nothing to send from this room. + MARK_syslog(LOG_DEBUG, "Nothing to do for <%s>", room_to_spool->name); + FreeRoomNetworkStruct(&sc->RNCfg); + sc->RNCfg = NULL; free(sc); - /* nothing to do for this room... */ return; } + sc->lastsent = sc->RNCfg->lastsent; + room_to_spool->lastsent = sc->lastsent; + /* Now lets remember whats needed for the actual work... */ for (i=0; i < 4; i++) { - aggregate_recipients(&sc->Users[SpoolCfgs[i]], - SpoolCfgs[i], - sc->RNCfg, - SpoolCfgsCopyN[i]); + aggregate_recipients(&sc->Users[SpoolCfgs[i]], SpoolCfgs[i], sc->RNCfg, SpoolCfgsCopyN[i]); } - if (StrLength(sc->RNCfg->Sender) > 0) + if (StrLength(sc->RNCfg->Sender) > 0) { sc->Users[roommailalias] = NewStrBufDup(sc->RNCfg->Sender); - end_critical_section(S_NETCONFIGS); + } sc->next = *pSC; *pSC = sc; + FreeRoomNetworkStruct(&sc->RNCfg); // done with this for now, we'll grab it again next time + sc->RNCfg = NULL; } + void CalcListID(SpoolControl *sc) { StrBuf *RoomName; - const char *err; - int fd; struct CitContext *CCC = CC; - char filename[PATH_MAX]; #define MAX_LISTIDLENGTH 150 - assoc_file_name(filename, sizeof filename, &sc->room, ctdl_info_dir); - fd = open(filename, 0); - - if (fd > 0) { - struct stat stbuf; - - if ((fstat(fd, &stbuf) == 0) && - (stbuf.st_size > 0)) - { - sc->RoomInfo = NewStrBufPlain(NULL, stbuf.st_size + 1); - StrBufReadBLOB(sc->RoomInfo, &fd, 0, stbuf.st_size, &err); - } - close(fd); + // Load the room banner as the list description + struct CtdlMessage *msg = CtdlFetchMessage(sc->room.msgnum_info, 1, 1); + if (msg != NULL) { + CC->redirect_buffer = NewStrBufPlain(NULL, SIZ); + CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_NONE, 0, 0, 0); + CM_Free(msg); + sc->RoomInfo = CC->redirect_buffer; + CC->redirect_buffer = NULL; + } + else { + sc->RoomInfo = NewStrBufPlain(NULL, SIZ); } + // Calculate the List ID sc->ListID = NewStrBufPlain(NULL, 1024); if (StrLength(sc->RoomInfo) > 0) { @@ -387,7 +384,7 @@ void CalcListID(SpoolControl *sc) StrBufAppendBufPlain(sc->ListID, HKEY("room_"), 0); StrBufAppendBuf(sc->ListID, RoomName, 0); StrBufAppendBufPlain(sc->ListID, HKEY("."), 0); - StrBufAppendBufPlain(sc->ListID, config.c_fqdn, -1, 0); + StrBufAppendBufPlain(sc->ListID, CtdlGetConfigStr("c_fqdn"), -1, 0); /* * this used to be: * roomname @@ -405,7 +402,7 @@ void CalcListID(SpoolControl *sc) StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("room_"), 0); StrBufAppendBuf(sc->Users[roommailalias], RoomName, 0); StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("@"), 0); - StrBufAppendBufPlain(sc->Users[roommailalias], config.c_fqdn, -1, 0); + StrBufAppendBufPlain(sc->Users[roommailalias], CtdlGetConfigStr("c_fqdn"), -1, 0); StrBufLowerCase(sc->Users[roommailalias]); } @@ -413,7 +410,6 @@ void CalcListID(SpoolControl *sc) FreeStrBuf(&RoomName); } -static time_t last_digest_delivery = 0; /* * Batch up and send all outbound traffic from the current room @@ -432,7 +428,7 @@ void network_spoolout_room(SpoolControl *sc) */ memcpy (&CCC->room, &sc->room, sizeof(ctdlroom)); - syslog(LOG_INFO, "Networking started for <%s>\n", CCC->room.QRname); + syslog(LOG_INFO, "network_spoolout_room(room=%s, lastsent=%ld)", CCC->room.QRname, sc->lastsent); CalcListID(sc); @@ -440,8 +436,7 @@ void network_spoolout_room(SpoolControl *sc) lastsent = sc->lastsent; /* Fetch the messages we ought to send & prepare them. */ - CtdlForEachMessage(MSGS_GT, sc->lastsent, NULL, NULL, NULL, - network_spool_msg, sc); + CtdlForEachMessage(MSGS_GT, sc->lastsent, NULL, NULL, NULL, network_spool_msg, sc); if (StrLength(sc->Users[roommailalias]) > 0) { @@ -454,8 +449,7 @@ void network_spoolout_room(SpoolControl *sc) } else { - snprintf(buf, sizeof buf, "room_%s@%s", - CCC->room.QRname, config.c_fqdn); + snprintf(buf, sizeof buf, "room_%s@%s", CCC->room.QRname, CtdlGetConfigStr("c_fqdn")); } for (i=0; buf[i]; ++i) { @@ -465,51 +459,31 @@ void network_spoolout_room(SpoolControl *sc) /* If we wrote a digest, deliver it and then close it */ - if (sc->Users[digestrecp] != NULL) { - time_t now = time(NULL); - time_t secs_today = now % (24 * 60 * 60); - long delta = 0; - - if (last_digest_delivery != 0) { - delta = now - last_digest_delivery; - delta = (24 * 60 * 60) - delta; - } - - if ((secs_today < 300) && - (delta < 300)) - { - if (sc->digestfp == NULL) { - sc->digestfp = create_digest_file(&sc->room, 0); - } - if (sc->digestfp != NULL) { - last_digest_delivery = now; - fprintf(sc->digestfp, - " -----------------------------------" - "------------------------------------" - "-------\n" - "You are subscribed to the '%s' " - "list.\n" - "To post to the list: %s\n", - CCC->room.QRname, buf - ); - network_deliver_digest(sc); /* deliver */ - remove_digest_file(&sc->room); - } - } - } - if (sc->digestfp != NULL) { + if ( (sc->Users[digestrecp] != NULL) && (sc->digestfp != NULL) ) + { + fprintf(sc->digestfp, + " ------------------------------------------------------------------------------\n" + "You are subscribed to the '%s' list.\n" + "To post to the list: %s\n", + CCC->room.QRname, buf + ); + network_deliver_digest(sc); /* deliver */ fclose(sc->digestfp); sc->digestfp = NULL; + remove_digest_file(&sc->room); } - /* Now rewrite the config file */ + /* Now rewrite the netconfig */ + syslog(LOG_DEBUG, "lastsent was %ld , now it is %ld", lastsent, sc->lastsent); if (sc->lastsent != lastsent) { - begin_critical_section(S_NETCONFIGS); - sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber); + OneRoomNetCfg *r; - sc->RNCfg->lastsent = sc->lastsent; - sc->RNCfg->changed = 1; + begin_critical_section(S_NETCONFIGS); + r = CtdlGetNetCfgForRoom(sc->room.QRnumber); + r->lastsent = sc->lastsent; + SaveRoomNetConfigFile(r, sc->room.QRnumber); + FreeRoomNetworkStruct(&r); end_critical_section(S_NETCONFIGS); } } @@ -549,7 +523,7 @@ int network_usetable(struct CtdlMessage *msg) if (CheckIfAlreadySeen("Networker Import", msgid, now, 0, - eCheckUpdate, + eUpdate, CCC->cs_pid, 0) != 0) { FreeStrBuf(&msgid); @@ -568,7 +542,6 @@ int network_usetable(struct CtdlMessage *msg) void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, HashList *the_netmap, int *netmap_changed) { long len; - struct CitContext *CCC = CC; StrBuf *Buf = NULL; struct CtdlMessage *msg = NULL; long pos; @@ -582,14 +555,13 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, unsigned char firstbyte; unsigned char lastbyte; - QN_syslog(LOG_DEBUG, "network_process_buffer() processing %ld bytes\n", size); + syslog(LOG_DEBUG, "network_process_buffer() processing %ld bytes", size); /* Validate just a little bit. First byte should be FF and * last byte should be 00. */ firstbyte = buffer[0]; lastbyte = buffer[size-1]; if ( (firstbyte != 255) || (lastbyte != 0) ) { - QN_syslog(LOG_ERR, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d\n", - size, firstbyte, lastbyte); + syslog(LOG_ERR, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d", size, firstbyte, lastbyte); return; } @@ -612,7 +584,7 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, /* Check for message routing */ if (!CM_IsEmpty(msg, eDestination)) { - if (strcasecmp(msg->cm_fields[eDestination], config.c_nodename)) { + if (strcasecmp(msg->cm_fields[eDestination], CtdlGetConfigStr("c_nodename"))) { /* route the message */ Buf = NewStrBufPlain(CM_KEY(msg,eDestination)); @@ -639,14 +611,14 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, time(NULL), rand() ); - QN_syslog(LOG_DEBUG, "Appending to %s\n", filename); + syslog(LOG_DEBUG, "Appending to %s", filename); fp = fopen(filename, "ab"); if (fp != NULL) { fwrite(sermsg.ser, sermsg.len, 1, fp); fclose(fp); } else { - QN_syslog(LOG_ERR, "%s: %s\n", filename, strerror(errno)); + syslog(LOG_ERR, "%s: %s", filename, strerror(errno)); } free(sermsg.ser); CM_Free(msg); @@ -700,7 +672,7 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, "A message you sent could not be delivered due to an invalid address.\n" "Please check the address and try sending the message again.\n"); free_recipients(recp); - QNM_syslog(LOG_DEBUG, "Bouncing message due to invalid recipient address.\n"); + syslog(LOG_DEBUG, "Bouncing message due to invalid recipient address."); return; } strcpy(target_room, ""); /* no target room if mail */ @@ -768,7 +740,6 @@ void network_process_file(char *filename, HashList *the_netmap, int *netmap_changed) { - struct CitContext *CCC = CC; FILE *fp; long msgstart = (-1L); long msgend = (-1L); @@ -778,12 +749,12 @@ void network_process_file(char *filename, fp = fopen(filename, "rb"); if (fp == NULL) { - QN_syslog(LOG_CRIT, "Error opening %s: %s\n", filename, strerror(errno)); + syslog(LOG_CRIT, "Error opening %s: %s", filename, strerror(errno)); return; } fseek(fp, 0L, SEEK_END); - QN_syslog(LOG_INFO, "network: processing %ld bytes from %s\n", ftell(fp), filename); + syslog(LOG_INFO, "network: processing %ld bytes from %s", ftell(fp), filename); rewind(fp); /* Look for messages in the data stream and break them out */ @@ -818,10 +789,7 @@ void network_process_file(char *filename, } if (nMessages > 0) - QN_syslog(LOG_INFO, - "network: processed %d messages in %s\n", - nMessages, - filename); + syslog(LOG_INFO, "network: processed %d messages in %s", nMessages, filename); fclose(fp); unlink(filename); @@ -833,7 +801,6 @@ void network_process_file(char *filename, */ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *netmap_changed) { - struct CitContext *CCC = CC; DIR *dp; struct dirent *d; struct dirent *filedir_entry; @@ -849,11 +816,11 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n */ if (stat(ctdl_netin_dir, &statbuf)) return; if (statbuf.st_mtime == last_spoolin_mtime) { - QNM_syslog(LOG_DEBUG, "network: nothing in inbound queue\n"); + MARKM_syslog(LOG_DEBUG, "network: nothing in inbound queue"); return; } last_spoolin_mtime = statbuf.st_mtime; - QNM_syslog(LOG_DEBUG, "network: processing inbound queue\n"); + MARKM_syslog(LOG_DEBUG, "network: processing inbound queue"); /* * Ok, there's something interesting in there, so scan it. @@ -938,7 +905,6 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n */ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netmap) { - struct CitContext *CCC = CC; IOBuffer IOB; FDIOBuffer FDIO; int d_namelen; @@ -1021,13 +987,10 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm ctdl_netout_dir, ChrPtr(NextHop)); - QN_syslog(LOG_DEBUG, "Consolidate %s to %s\n", filename, ChrPtr(NextHop)); + syslog(LOG_DEBUG, "Consolidate %s to %s", filename, ChrPtr(NextHop)); if (CtdlNetworkTalkingTo(SKEY(NextHop), NTT_CHECK)) { nFailed++; - QN_syslog(LOG_DEBUG, - "Currently online with %s - skipping for now\n", - ChrPtr(NextHop) - ); + syslog(LOG_DEBUG, "Currently online with %s - skipping for now", ChrPtr(NextHop)); } else { size_t dsize; @@ -1039,10 +1002,10 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm infd = open(filename, O_RDONLY); if (infd == -1) { nFailed++; - QN_syslog(LOG_ERR, - "failed to open %s for reading due to %s; skipping.\n", + syslog(LOG_ERR, + "failed to open %s for reading due to %s; skipping.", filename, strerror(errno) - ); + ); CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE); continue; } @@ -1058,10 +1021,10 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm } if (outfd == -1) { nFailed++; - QN_syslog(LOG_ERR, - "failed to open %s for reading due to %s; skipping.\n", + syslog(LOG_ERR, + "failed to open %s for reading due to %s; skipping.", spooloutfilename, strerror(errno) - ); + ); close(infd); CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE); continue; @@ -1084,18 +1047,11 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm do {} while ((FileMoveChunked(&FDIO, &err) > 0) && (err == NULL)); if (err == NULL) { unlink(filename); - QN_syslog(LOG_DEBUG, - "Spoolfile %s now "SIZE_T_FMT" k\n", - spooloutfilename, - (dsize + fsize)/1024 - ); + syslog(LOG_DEBUG, "Spoolfile %s now "SIZE_T_FMT" KB", spooloutfilename, (dsize + fsize)/1024); } else { nFailed++; - QN_syslog(LOG_ERR, - "failed to append to %s [%s]; rolling back..\n", - spooloutfilename, strerror(errno) - ); + syslog(LOG_ERR, "failed to append to %s [%s]; rolling back..", spooloutfilename, strerror(errno)); /* whoops partial append?? truncate spooloutfilename again! */ ftruncate(outfd, dsize); } @@ -1109,10 +1065,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm if (nFailed > 0) { FreeStrBuf(&NextHop); - QN_syslog(LOG_INFO, - "skipping Spoolcleanup because of %d files unprocessed.\n", - nFailed - ); + syslog(LOG_INFO, "skipping Spoolcleanup because of %d files unprocessed.", nFailed); return; }