X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=3b53305b153eb074c5295541af4dd312de09e801;hb=924b8cd997f56b68e16fa1dfc1be55722596f5d8;hp=dac6db41c3bce08bd93df8a2b5cd992c814ace90;hpb=848934c1722edc208c4df49c571586b72c3fc486;p=citadel.git diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c index dac6db41c..3b53305b1 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" @@ -72,7 +73,6 @@ #include "internet_addressing.h" #include "serv_network.h" #include "clientsocket.h" -#include "file_ops.h" #include "citadel_dirs.h" #include "threads.h" #include "context.h" @@ -94,6 +94,87 @@ #endif +/* + * Bounce a message back to the sender + */ +void network_bounce(struct CtdlMessage **pMsg, char *reason) +{ + char buf[SIZ]; + char bouncesource[SIZ]; + char recipient[SIZ]; + recptypes *valid = NULL; + char force_room[ROOMNAMELEN]; + static int serialnum = 0; + long len; + struct CtdlMessage *msg = *pMsg; + *pMsg = NULL; + syslog(LOG_DEBUG, "entering network_bounce()"); + + if (msg == NULL) return; + + snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, CtdlGetConfigStr("c_nodename")); + + /* + * Give it a fresh message ID + */ + len = snprintf(buf, sizeof(buf), + "%ld.%04lx.%04x@%s", + (long)time(NULL), + (long)getpid(), + ++serialnum, + CtdlGetConfigStr("c_fqdn")); + + CM_SetField(msg, emessageId, buf, len); + + /* + * FIXME ... right now we're just sending a bounce; we really want to + * include the text of the bounced message. + */ + if (!IsEmptyStr(reason)) { + CM_SetField(msg, eMesageText, reason, strlen(reason)); + } + msg->cm_format_type = 0; + + /* + * Turn the message around + */ + CM_FlushField(msg, eRecipient); + CM_FlushField(msg, eDestination); + + len = snprintf(recipient, sizeof(recipient), "%s@%s", + msg->cm_fields[eAuthor], + msg->cm_fields[eNodeName]); + + CM_SetField(msg, eAuthor, HKEY(BOUNCESOURCE)); + 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")); + + /* Now submit the message */ + valid = validate_recipients(recipient, NULL, 0); + if (valid != NULL) if (valid->num_error != 0) { + free_recipients(valid); + valid = NULL; + } + if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) { + strcpy(force_room, CtdlGetConfigStr("c_aideroom")); + } + else { + strcpy(force_room, ""); + } + if ( (valid == NULL) && IsEmptyStr(force_room) ) { + strcpy(force_room, CtdlGetConfigStr("c_aideroom")); + } + CtdlSubmitMsg(msg, valid, force_room, 0); + + /* Clean up */ + if (valid != NULL) free_recipients(valid); + CM_Free(msg); + syslog(LOG_DEBUG, "leaving network_bounce()"); +} + + void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG) { RoomNetCfgLine *nptr; @@ -166,13 +247,13 @@ void Netmap_AddMe(struct CtdlMessage *msg, const char *defl, long defllen) char buf[SIZ]; /* prepend our node to the path */ - if (msg->cm_fields[eMessagePath] == NULL) { + if (CM_IsEmpty(msg, eMessagePath)) { CM_SetField(msg, eMessagePath, defl, defllen); } - node_len = strlen(config.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); @@ -186,9 +267,10 @@ void InspectQueuedRoom(SpoolControl **pSC, 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; @@ -199,45 +281,47 @@ 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) - { - 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; } - if (sc->RNCfg == NULL) - sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber); + assert(sc->RNCfg == NULL); // checking to make sure we cleared it from last time + + sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber); - if (!HaveSpoolConfig(sc->RNCfg)) + 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) ) { + // There is nothing to send from this room. + 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; + /* 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); + } 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; @@ -304,7 +388,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 @@ -322,7 +406,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]); } @@ -330,6 +414,7 @@ void CalcListID(SpoolControl *sc) FreeStrBuf(&RoomName); } +static time_t last_digest_delivery = 0; /* * Batch up and send all outbound traffic from the current room @@ -348,24 +433,17 @@ void network_spoolout_room(SpoolControl *sc) */ memcpy (&CCC->room, &sc->room, sizeof(ctdlroom)); - syslog(LOG_INFO, "Networking started for <%s>\n", CCC->room.QRname); - - /* If there are digest recipients, we have to build a digest */ - if (sc->Users[digestrecp] != NULL) { - sc->digestfp = tmpfile(); - fprintf(sc->digestfp, "Content-type: text/plain\n\n"); - } + syslog(LOG_INFO, "network_spoolout_room(%s)", CCC->room.QRname); CalcListID(sc); /* remember where we started... */ lastsent = sc->lastsent; - /* Do something useful */ + /* Fetch the messages we ought to send & prepare them. */ CtdlForEachMessage(MSGS_GT, sc->lastsent, NULL, NULL, NULL, network_spool_msg, sc); - /* If we wrote a digest, deliver it and then close it */ if (StrLength(sc->Users[roommailalias]) > 0) { long len; @@ -378,37 +456,120 @@ void network_spoolout_room(SpoolControl *sc) else { snprintf(buf, sizeof buf, "room_%s@%s", - CCC->room.QRname, config.c_fqdn); + CCC->room.QRname, CtdlGetConfigStr("c_fqdn")); } for (i=0; buf[i]; ++i) { buf[i] = tolower(buf[i]); if (isspace(buf[i])) buf[i] = '_'; } + + + /* 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) { - 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 and close */ + fclose(sc->digestfp); + sc->digestfp = NULL; } - /* Now rewrite the config file */ + /* Now rewrite the netconfig */ + + // THIS IS THE ONLY PLACE WHERE WE HAVE TO REWRITE THE NETCONFIG. + + if (sc->lastsent != lastsent) { - 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; // FIXME we have to do something here !!!!!!! + + SaveRoomNetConfigFile(r, sc->room.QRnumber); + FreeRoomNetworkStruct(&r); + end_critical_section(S_NETCONFIGS); } - end_critical_section(S_NETCONFIGS); } + +/* + * Check the use table. This is a list of messages which have recently + * arrived on the system. It is maintained and queried to prevent the same + * message from being entered into the database multiple times if it happens + * to arrive multiple times by accident. + */ +int network_usetable(struct CtdlMessage *msg) +{ + StrBuf *msgid; + struct CitContext *CCC = CC; + time_t now; + + /* Bail out if we can't generate a message ID */ + if ((msg == NULL) || CM_IsEmpty(msg, emessageId)) + { + return(0); + } + + /* Generate the message ID */ + msgid = NewStrBufPlain(CM_KEY(msg, emessageId)); + if (haschar(ChrPtr(msgid), '@') == 0) { + StrBufAppendBufPlain(msgid, HKEY("@"), 0); + if (!CM_IsEmpty(msg, eNodeName)) { + StrBufAppendBufPlain(msgid, CM_KEY(msg, eNodeName), 0); + } + else { + FreeStrBuf(&msgid); + return(0); + } + } + now = time(NULL); + if (CheckIfAlreadySeen("Networker Import", + msgid, + now, 0, + eUpdate, + CCC->cs_pid, 0) != 0) + { + FreeStrBuf(&msgid); + return(1); + } + FreeStrBuf(&msgid); + + return(0); +} + + /* * Process a buffer containing a single message from a single file * from the inbound queue @@ -416,12 +577,11 @@ void network_spoolout_room(SpoolControl *sc) 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; int field; - struct recptypes *recp = NULL; + recptypes *recp = NULL; char target_room[ROOMNAMELEN]; struct ser_ret sermsg; char filename[PATH_MAX]; @@ -430,14 +590,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; } @@ -459,11 +618,11 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, } /* Check for message routing */ - if (msg->cm_fields[eDestination] != NULL) { - if (strcasecmp(msg->cm_fields[eDestination], config.c_nodename)) { + if (!CM_IsEmpty(msg, eDestination)) { + if (strcasecmp(msg->cm_fields[eDestination], CtdlGetConfigStr("c_nodename"))) { /* route the message */ - Buf = NewStrBufPlain(msg->cm_fields[eDestination], -1); + Buf = NewStrBufPlain(CM_KEY(msg,eDestination)); if (CtdlIsValidNode(&nexthop, NULL, Buf, @@ -473,7 +632,7 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, Netmap_AddMe(msg, HKEY("unknown_user")); /* serialize the message */ - serialize_message(&sermsg, msg); + CtdlSerializeMessage(&sermsg, msg); /* now send it */ if (StrLength(nexthop) == 0) { @@ -487,17 +646,17 @@ 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); - CtdlFreeMessage(msg); + CM_Free(msg); FreeStrBuf(&Buf); return; } @@ -505,10 +664,9 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, else { /* invalid destination node name */ FreeStrBuf(&Buf); - network_bounce(msg, + network_bounce(&msg, "A message you sent could not be delivered due to an invalid destination node" " name. Please check the address and try sending the message again.\n"); - msg = NULL; return; } @@ -522,12 +680,12 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, * connected that it's inevitable.) */ if (network_usetable(msg) != 0) { - CtdlFreeMessage(msg); + CM_Free(msg); return; } /* Learn network topology from the path */ - if ((msg->cm_fields[eNodeName] != NULL) && (msg->cm_fields[eMessagePath] != NULL)) { + if (!CM_IsEmpty(msg, eNodeName) && !CM_IsEmpty(msg, eMessagePath)) { NetworkLearnTopology(msg->cm_fields[eNodeName], msg->cm_fields[eMessagePath], the_netmap, @@ -537,20 +695,19 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, /* Is the sending node giving us a very persuasive suggestion about * which room this message should be saved in? If so, go with that. */ - if (msg->cm_fields[eRemoteRoom] != NULL) { + if (!CM_IsEmpty(msg, eRemoteRoom)) { safestrncpy(target_room, msg->cm_fields[eRemoteRoom], sizeof target_room); } /* Otherwise, does it have a recipient? If so, validate it... */ - else if (msg->cm_fields[eRecipient] != NULL) { + else if (!CM_IsEmpty(msg, eRecipient)) { recp = validate_recipients(msg->cm_fields[eRecipient], NULL, 0); if (recp != NULL) if (recp->num_error != 0) { - network_bounce(msg, + network_bounce(&msg, "A message you sent could not be delivered due to an invalid address.\n" "Please check the address and try sending the message again.\n"); - msg = NULL; free_recipients(recp); - 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 */ @@ -559,7 +716,7 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, /* Our last shot at finding a home for this message is to see if * it has the eOriginalRoom (O) field (Originating room) set. */ - else if (msg->cm_fields[eOriginalRoom] != NULL) { + else if (!CM_IsEmpty(msg, eOriginalRoom)) { safestrncpy(target_room, msg->cm_fields[eOriginalRoom], sizeof target_room); } @@ -572,7 +729,7 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, msg->cm_flags = CM_SKIP_HOOKS; CtdlSubmitMsg(msg, recp, target_room, 0); } - CtdlFreeMessage(msg); + CM_Free(msg); free_recipients(recp); } @@ -618,22 +775,21 @@ void network_process_file(char *filename, HashList *the_netmap, int *netmap_changed) { - struct CitContext *CCC = CC; FILE *fp; long msgstart = (-1L); long msgend = (-1L); long msgcur = 0L; int ch; - + int nMessages = 0; 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 */ @@ -653,6 +809,7 @@ void network_process_file(char *filename, } ++msgcur; + nMessages ++; } msgend = msgcur - 1; @@ -663,8 +820,12 @@ void network_process_file(char *filename, working_ignetcfg, the_netmap, netmap_changed); + nMessages ++; } + if (nMessages > 0) + syslog(LOG_INFO, "network: processed %d messages in %s", nMessages, filename); + fclose(fp); unlink(filename); } @@ -675,7 +836,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; @@ -691,11 +851,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"); + syslog(LOG_DEBUG, "network: nothing in inbound queue"); return; } last_spoolin_mtime = statbuf.st_mtime; - QNM_syslog(LOG_DEBUG, "network: processing inbound queue\n"); + syslog(LOG_DEBUG, "network: processing inbound queue"); /* * Ok, there's something interesting in there, so scan it. @@ -713,7 +873,7 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n (filedir_entry != NULL)) { #ifdef _DIRENT_HAVE_D_NAMLEN - d_namelen = filedir_entry->d_namelen; + d_namelen = filedir_entry->d_namlen; #else d_namelen = strlen(filedir_entry->d_name); @@ -780,7 +940,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; @@ -817,7 +976,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm (filedir_entry != NULL)) { #ifdef _DIRENT_HAVE_D_NAMLEN - d_namelen = filedir_entry->d_namelen; + d_namelen = filedir_entry->d_namlen; #else d_namelen = strlen(filedir_entry->d_name); @@ -863,13 +1022,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; @@ -881,10 +1037,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; } @@ -900,10 +1056,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; @@ -926,18 +1082,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); } @@ -951,10 +1100,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; } @@ -971,7 +1117,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm (filedir_entry != NULL)) { #ifdef _DIRENT_HAVE_D_NAMLEN - d_namelen = filedir_entry->d_namelen; + d_namelen = filedir_entry->d_namlen; #else d_namelen = strlen(filedir_entry->d_name);