X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=3ebac02fe1da072764f7e1b4da1835c01f9d9ceb;hb=3052311a6d7a2b14d2ff24edff6344cf1ae109b4;hp=dd049a878445e24f91b3a39c6442d5dae006592b;hpb=5bd9e05d88e95684e380408e9f2f891c84d8e344;p=citadel.git diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c index dd049a878..3ebac02fe 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; @@ -160,7 +241,23 @@ int HaveSpoolConfig(OneRoomNetCfg* RNCfg) return interested; } +void Netmap_AddMe(struct CtdlMessage *msg, const char *defl, long defllen) +{ + long node_len; + char buf[SIZ]; + /* prepend our node to the path */ + if (CM_IsEmpty(msg, eMessagePath)) { + CM_SetField(msg, eMessagePath, defl, defllen); + } + node_len = strlen(CtdlGetConfigStr("c_nodename")); + if (node_len >= SIZ) + node_len = SIZ - 1; + memcpy(buf, CtdlGetConfigStr("c_nodename"), node_len); + buf[node_len] = '!'; + buf[node_len + 1] = '\0'; + CM_PrependToField(msg, eMessagePath, buf, node_len + 1); +} void InspectQueuedRoom(SpoolControl **pSC, RoomProcList *room_to_spool, @@ -170,10 +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; @@ -183,47 +280,51 @@ 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. + 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); + } 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; @@ -233,7 +334,7 @@ void CalcListID(SpoolControl *sc) assoc_file_name(filename, sizeof filename, &sc->room, ctdl_info_dir); fd = open(filename, 0); - if (fd != 0) { + if (fd > 0) { struct stat stbuf; if ((fstat(fd, &stbuf) == 0) && @@ -264,6 +365,9 @@ void CalcListID(SpoolControl *sc) } StrBufAppendBufPlain(sc->ListID, HKEY("<"), 0); + RoomName = NewStrBufPlain (sc->room.QRname, -1); + StrBufAsciify(RoomName, '_'); + StrBufReplaceChars(RoomName, ' ', '_'); if (StrLength(sc->Users[roommailalias]) > 0) { @@ -282,9 +386,9 @@ void CalcListID(SpoolControl *sc) else { StrBufAppendBufPlain(sc->ListID, HKEY("room_"), 0); - StrBufAppendBufPlain(sc->ListID, sc->room.QRname, -1, 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 @@ -299,17 +403,18 @@ void CalcListID(SpoolControl *sc) { sc->Users[roommailalias] = NewStrBuf(); - StrBufPrintf(sc->Users[roommailalias], - "room_%s@%s", - CCC->room.QRname, - config.c_fqdn); + StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("room_"), 0); + StrBufAppendBuf(sc->Users[roommailalias], RoomName, 0); + StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("@"), 0); + StrBufAppendBufPlain(sc->Users[roommailalias], CtdlGetConfigStr("c_fqdn"), -1, 0); - StrBufAsciify(sc->Users[roommailalias], '_'); StrBufLowerCase(sc->Users[roommailalias]); } + FreeStrBuf(&RoomName); } +static time_t last_digest_delivery = 0; /* * Batch up and send all outbound traffic from the current room @@ -328,24 +433,16 @@ 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(room=%s, lastsent=%ld)", CCC->room.QRname, sc->lastsent); CalcListID(sc); /* remember where we started... */ lastsent = sc->lastsent; - /* Do something useful */ - CtdlForEachMessage(MSGS_GT, sc->lastsent, NULL, NULL, NULL, - network_spool_msg, sc); + /* 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; @@ -358,66 +455,142 @@ 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 */ + syslog(LOG_DEBUG, "lastsent was %ld , now it is %ld", lastsent, sc->lastsent); if (sc->lastsent != lastsent) { - sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber); + OneRoomNetCfg *r; + + 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); + } +} + - sc->RNCfg->lastsent = sc->lastsent; - sc->RNCfg->changed = 1; +/* + * 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); + } } - end_critical_section(S_NETCONFIGS); + 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 */ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, HashList *the_netmap, int *netmap_changed) { - struct CitContext *CCC = CC; + long len; 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 *oldpath = NULL; char filename[PATH_MAX]; FILE *fp; const StrBuf *nexthop = NULL; 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; } @@ -433,38 +606,27 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, for (pos = 3; pos < size; ++pos) { field = buffer[pos]; - msg->cm_fields[field] = strdup(&buffer[pos+1]); - pos = pos + strlen(&buffer[(int)pos]); + len = strlen(buffer + pos + 1); + CM_SetField(msg, field, buffer + pos + 1, len); + pos = pos + len + 1; } /* Check for message routing */ - if (msg->cm_fields['D'] != NULL) { - if (strcasecmp(msg->cm_fields['D'], 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['D'], -1); + Buf = NewStrBufPlain(CM_KEY(msg,eDestination)); if (CtdlIsValidNode(&nexthop, NULL, Buf, working_ignetcfg, the_netmap) == 0) { - /* prepend our node to the path */ - if (msg->cm_fields['P'] != NULL) { - oldpath = msg->cm_fields['P']; - msg->cm_fields['P'] = NULL; - } - else { - oldpath = strdup("unknown_user"); - } - size = strlen(oldpath) + SIZ; - msg->cm_fields['P'] = malloc(size); - snprintf(msg->cm_fields['P'], size, "%s!%s", - config.c_nodename, oldpath); - free(oldpath); + Netmap_AddMe(msg, HKEY("unknown_user")); /* serialize the message */ - serialize_message(&sermsg, msg); + CtdlSerializeMessage(&sermsg, msg); /* now send it */ if (StrLength(nexthop) == 0) { @@ -478,17 +640,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; } @@ -496,10 +658,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; } @@ -513,14 +674,14 @@ 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['N'] != NULL) && (msg->cm_fields['P'] != NULL)) { - NetworkLearnTopology(msg->cm_fields['N'], - msg->cm_fields['P'], + if (!CM_IsEmpty(msg, eNodeName) && !CM_IsEmpty(msg, eMessagePath)) { + NetworkLearnTopology(msg->cm_fields[eNodeName], + msg->cm_fields[eMessagePath], the_netmap, netmap_changed); } @@ -528,48 +689,41 @@ 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['C'] != NULL) { - safestrncpy(target_room, msg->cm_fields['C'], sizeof target_room); + 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['R'] != NULL) { - recp = validate_recipients(msg->cm_fields['R'], NULL, 0); + 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 */ } /* Our last shot at finding a home for this message is to see if - * it has the O field (Originating room) set. + * it has the eOriginalRoom (O) field (Originating room) set. */ - else if (msg->cm_fields['O'] != NULL) { - safestrncpy(target_room, msg->cm_fields['O'], sizeof target_room); + else if (!CM_IsEmpty(msg, eOriginalRoom)) { + safestrncpy(target_room, msg->cm_fields[eOriginalRoom], sizeof target_room); } /* Strip out fields that are only relevant during transit */ - if (msg->cm_fields['D'] != NULL) { - free(msg->cm_fields['D']); - msg->cm_fields['D'] = NULL; - } - if (msg->cm_fields['C'] != NULL) { - free(msg->cm_fields['C']); - msg->cm_fields['C'] = NULL; - } + CM_FlushField(msg, eDestination); + CM_FlushField(msg, eRemoteRoom); /* save the message into a room */ if (PerformNetprocHooks(msg, target_room) == 0) { msg->cm_flags = CM_SKIP_HOOKS; CtdlSubmitMsg(msg, recp, target_room, 0); } - CtdlFreeMessage(msg); + CM_Free(msg); free_recipients(recp); } @@ -615,22 +769,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 */ @@ -650,6 +803,7 @@ void network_process_file(char *filename, } ++msgcur; + nMessages ++; } msgend = msgcur - 1; @@ -660,8 +814,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); } @@ -672,7 +830,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; @@ -688,11 +845,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. @@ -710,7 +867,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); @@ -777,7 +934,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; @@ -814,7 +970,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); @@ -860,13 +1016,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; @@ -878,10 +1031,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; } @@ -897,10 +1050,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; @@ -923,13 +1076,11 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm do {} while ((FileMoveChunked(&FDIO, &err) > 0) && (err == NULL)); if (err == NULL) { unlink(filename); + 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); } @@ -943,10 +1094,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; } @@ -963,7 +1111,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);