X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=0cdac085ec14ce8887484bdb7935ff9fcc6eb72b;hb=95bec9b0981b84742273c45d39aca9cb7cc9f5ef;hp=04144b54267317ffc1303d8aed8ddd090a3dbbe0;hpb=7cfe40f56853007488962e16e65ef939c9365866;p=citadel.git diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c index 04144b542..0cdac085e 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-2017 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" @@ -96,9 +97,8 @@ /* * Bounce a message back to the sender */ -void network_bounce(struct CtdlMessage *msg, char *reason) +void network_bounce(struct CtdlMessage **pMsg, char *reason) { - struct CitContext *CCC = CC; char buf[SIZ]; char bouncesource[SIZ]; char recipient[SIZ]; @@ -106,12 +106,13 @@ void network_bounce(struct CtdlMessage *msg, char *reason) char force_room[ROOMNAMELEN]; static int serialnum = 0; long len; - - QNM_syslog(LOG_DEBUG, "entering network_bounce()\n"); + struct CtdlMessage *msg = *pMsg; + *pMsg = NULL; + syslog(LOG_DEBUG, "netspool: 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 @@ -121,7 +122,7 @@ void network_bounce(struct CtdlMessage *msg, char *reason) (long)time(NULL), (long)getpid(), ++serialnum, - config.c_fqdn); + CtdlGetConfigStr("c_fqdn")); CM_SetField(msg, emessageId, buf, len); @@ -129,7 +130,9 @@ void network_bounce(struct CtdlMessage *msg, 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; /* @@ -143,7 +146,7 @@ void network_bounce(struct CtdlMessage *msg, 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")); @@ -155,20 +158,20 @@ void network_bounce(struct CtdlMessage *msg, 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, "netspool: leaving network_bounce()"); } @@ -247,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); @@ -261,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, "netspool: 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; @@ -278,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, "netspool: 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, "netspool: 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. + syslog(LOG_DEBUG, "netspool: 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) { @@ -386,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 @@ -404,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]); } @@ -412,10 +410,9 @@ void CalcListID(SpoolControl *sc) FreeStrBuf(&RoomName); } -static time_t last_digest_delivery = 0; /* - * Batch up and send all outbound traffic from the current room + * Batch up and send all outbound traffic from the current room (this is definitely used for mailing lists) */ void network_spoolout_room(SpoolControl *sc) { @@ -431,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, "netspool: network_spoolout_room(room=%s, lastsent=%ld)", CCC->room.QRname, sc->lastsent); CalcListID(sc); @@ -439,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) { @@ -453,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) { @@ -464,487 +459,46 @@ 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, "netspool: 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); } } -/* - * 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, - eCheckUpdate, - 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) -{ - long len; - struct CitContext *CCC = CC; - StrBuf *Buf = NULL; - struct CtdlMessage *msg = NULL; - long pos; - int field; - recptypes *recp = NULL; - char target_room[ROOMNAMELEN]; - struct ser_ret sermsg; - 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); - - /* 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); - return; - } - - /* Set default target room to trash */ - strcpy(target_room, TWITROOM); - - /* Load the message into memory */ - msg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage)); - memset(msg, 0, sizeof(struct CtdlMessage)); - msg->cm_magic = CTDLMESSAGE_MAGIC; - msg->cm_anon_type = buffer[1]; - msg->cm_format_type = buffer[2]; - - for (pos = 3; pos < size; ++pos) { - field = buffer[pos]; - len = strlen(buffer + pos + 1); - CM_SetField(msg, field, buffer + pos + 1, len); - pos = pos + len + 1; - } - - /* Check for message routing */ - if (!CM_IsEmpty(msg, eDestination)) { - if (strcasecmp(msg->cm_fields[eDestination], config.c_nodename)) { - - /* route the message */ - Buf = NewStrBufPlain(CM_KEY(msg,eDestination)); - if (CtdlIsValidNode(&nexthop, - NULL, - Buf, - working_ignetcfg, - the_netmap) == 0) - { - Netmap_AddMe(msg, HKEY("unknown_user")); - - /* serialize the message */ - CtdlSerializeMessage(&sermsg, msg); - - /* now send it */ - if (StrLength(nexthop) == 0) { - nexthop = Buf; - } - snprintf(filename, - sizeof filename, - "%s/%s@%lx%x", - ctdl_netout_dir, - ChrPtr(nexthop), - time(NULL), - rand() - ); - QN_syslog(LOG_DEBUG, "Appending to %s\n", 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)); - } - free(sermsg.ser); - CM_Free(msg); - FreeStrBuf(&Buf); - return; - } - - else { /* invalid destination node name */ - FreeStrBuf(&Buf); - - 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; - - } - } - } - - /* - * Check to see if we already have a copy of this message, and - * abort its processing if so. (We used to post a warning to Aide> - * every time this happened, but the network is now so densely - * connected that it's inevitable.) - */ - if (network_usetable(msg) != 0) { - CM_Free(msg); - return; - } - - /* Learn network topology from the path */ - if (!CM_IsEmpty(msg, eNodeName) && !CM_IsEmpty(msg, eMessagePath)) { - NetworkLearnTopology(msg->cm_fields[eNodeName], - msg->cm_fields[eMessagePath], - the_netmap, - netmap_changed); - } - - /* 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 (!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 (!CM_IsEmpty(msg, eRecipient)) { - recp = validate_recipients(msg->cm_fields[eRecipient], 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" - "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"); - 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 eOriginalRoom (O) field (Originating room) set. - */ - 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 */ - 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); - } - CM_Free(msg); - free_recipients(recp); -} - - -/* - * Process a single message from a single file from the inbound queue - */ -void network_process_message(FILE *fp, - long msgstart, - long msgend, - HashList *working_ignetcfg, - HashList *the_netmap, - int *netmap_changed) -{ - long hold_pos; - long size; - char *buffer; - - hold_pos = ftell(fp); - size = msgend - msgstart + 1; - buffer = malloc(size); - if (buffer != NULL) { - fseek(fp, msgstart, SEEK_SET); - if (fread(buffer, size, 1, fp) > 0) { - network_process_buffer(buffer, - size, - working_ignetcfg, - the_netmap, - netmap_changed); - } - free(buffer); - } - - fseek(fp, hold_pos, SEEK_SET); -} - - -/* - * Process a single file from the inbound queue - */ -void network_process_file(char *filename, - HashList *working_ignetcfg, - 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)); - return; - } - - fseek(fp, 0L, SEEK_END); - QN_syslog(LOG_INFO, "network: processing %ld bytes from %s\n", ftell(fp), filename); - rewind(fp); - - /* Look for messages in the data stream and break them out */ - while (ch = getc(fp), ch >= 0) { - - if (ch == 255) { - if (msgstart >= 0L) { - msgend = msgcur - 1; - network_process_message(fp, - msgstart, - msgend, - working_ignetcfg, - the_netmap, - netmap_changed); - } - msgstart = msgcur; - } - - ++msgcur; - nMessages ++; - } - - msgend = msgcur - 1; - if (msgstart >= 0L) { - network_process_message(fp, - msgstart, - msgend, - working_ignetcfg, - the_netmap, - netmap_changed); - nMessages ++; - } - - if (nMessages > 0) - QN_syslog(LOG_INFO, - "network: processed %d messages in %s\n", - nMessages, - filename); - - fclose(fp); - unlink(filename); -} - - -/* - * Process anything in the inbound queue - */ -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; - struct stat statbuf; - char filename[PATH_MAX]; - static time_t last_spoolin_mtime = 0L; - int d_type = 0; - int d_namelen; - - /* - * Check the spoolin directory's modification time. If it hasn't - * been touched, we don't need to scan it. - */ - if (stat(ctdl_netin_dir, &statbuf)) return; - if (statbuf.st_mtime == last_spoolin_mtime) { - QNM_syslog(LOG_DEBUG, "network: nothing in inbound queue\n"); - return; - } - last_spoolin_mtime = statbuf.st_mtime; - QNM_syslog(LOG_DEBUG, "network: processing inbound queue\n"); - - /* - * Ok, there's something interesting in there, so scan it. - */ - dp = opendir(ctdl_netin_dir); - if (dp == NULL) return; - - d = (struct dirent *)malloc(offsetof(struct dirent, d_name) + PATH_MAX + 1); - if (d == NULL) { - closedir(dp); - return; - } - - while ((readdir_r(dp, d, &filedir_entry) == 0) && - (filedir_entry != NULL)) - { -#ifdef _DIRENT_HAVE_D_NAMLEN - d_namelen = filedir_entry->d_namlen; - -#else - d_namelen = strlen(filedir_entry->d_name); -#endif - -#ifdef _DIRENT_HAVE_D_TYPE - d_type = filedir_entry->d_type; -#else - d_type = DT_UNKNOWN; -#endif - if ((d_namelen > 1) && filedir_entry->d_name[d_namelen - 1] == '~') - continue; /* Ignore backup files... */ - - if ((d_namelen == 1) && - (filedir_entry->d_name[0] == '.')) - continue; - - if ((d_namelen == 2) && - (filedir_entry->d_name[0] == '.') && - (filedir_entry->d_name[1] == '.')) - continue; - - if (d_type == DT_UNKNOWN) { - struct stat s; - char path[PATH_MAX]; - - snprintf(path, - PATH_MAX, - "%s/%s", - ctdl_netin_dir, - filedir_entry->d_name); - - if (lstat(path, &s) == 0) { - d_type = IFTODT(s.st_mode); - } - } - - switch (d_type) - { - case DT_DIR: - break; - case DT_LNK: /* TODO: check whether its a file or a directory */ - case DT_REG: - snprintf(filename, - sizeof filename, - "%s/%s", - ctdl_netin_dir, - d->d_name - ); - network_process_file(filename, - working_ignetcfg, - the_netmap, - netmap_changed); - } - } - - closedir(dp); - free(d); -} - /* * Step 1: consolidate files in the outbound queue into one file per neighbor node * Step 2: delete any files in the outbound queue that were for neighbors who no longer exist. */ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netmap) { - struct CitContext *CCC = CC; IOBuffer IOB; FDIOBuffer FDIO; int d_namelen; DIR *dp; - struct dirent *d; struct dirent *filedir_entry; const char *pch; char spooloutfilename[PATH_MAX]; @@ -956,14 +510,10 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm int nFailed = 0; int d_type = 0; - /* Step 1: consolidate files in the outbound queue into one file per neighbor node */ - d = (struct dirent *)malloc(offsetof(struct dirent, d_name) + PATH_MAX + 1); - if (d == NULL) return; dp = opendir(ctdl_netout_dir); if (dp == NULL) { - free(d); return; } @@ -972,8 +522,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm memset(&FDIO, 0, sizeof(FDIOBuffer)); FDIO.IOB = &IOB; - while ((readdir_r(dp, d, &filedir_entry) == 0) && - (filedir_entry != NULL)) + while ( (filedir_entry = readdir(dp)) , (filedir_entry != NULL)) { #ifdef _DIRENT_HAVE_D_NAMLEN d_namelen = filedir_entry->d_namlen; @@ -1022,13 +571,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, "netspool: 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, "netspool: currently online with %s - skipping for now", ChrPtr(NextHop)); } else { size_t dsize; @@ -1040,10 +586,7 @@ 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", - filename, strerror(errno) - ); + syslog(LOG_ERR, "%s: %s", filename, strerror(errno)); CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE); continue; } @@ -1059,10 +602,7 @@ 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", - spooloutfilename, strerror(errno) - ); + syslog(LOG_ERR, "%s: %s", spooloutfilename, strerror(errno)); close(infd); CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE); continue; @@ -1073,9 +613,6 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm fstat(infd, &statbuf); fsize = statbuf.st_size; -/* - fsize = lseek(infd, 0, SEEK_END); -*/ IOB.fd = infd; FDIOBufferInit(&FDIO, &IOB, outfd, fsize + dsize); FDIO.ChunkSendRemain = fsize; @@ -1085,18 +622,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, "netspool: 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, "netspool: failed to append to %s [%s]; rolling back..", spooloutfilename, strerror(errno)); /* whoops partial append?? truncate spooloutfilename again! */ ftruncate(outfd, dsize); } @@ -1110,11 +640,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, "netspool: skipping Spoolcleanup because of %d files unprocessed.", nFailed); return; } @@ -1122,12 +648,10 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm dp = opendir(ctdl_netout_dir); if (dp == NULL) { FreeStrBuf(&NextHop); - free(d); return; } - while ((readdir_r(dp, d, &filedir_entry) == 0) && - (filedir_entry != NULL)) + while ( (filedir_entry = readdir(dp)) , (filedir_entry != NULL)) { #ifdef _DIRENT_HAVE_D_NAMLEN d_namelen = filedir_entry->d_namlen; @@ -1179,7 +703,6 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm } } FreeStrBuf(&NextHop); - free(d); closedir(dp); } @@ -1200,27 +723,22 @@ void free_spoolcontrol_struct_members(SpoolControl *sc) } - /* * It's ok if these directories already exist. Just fail silently. */ void create_spool_dirs(void) { if ((mkdir(ctdl_spool_dir, 0700) != 0) && (errno != EEXIST)) - syslog(LOG_EMERG, "unable to create directory [%s]: %s", ctdl_spool_dir, strerror(errno)); + syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_spool_dir, strerror(errno)); if (chown(ctdl_spool_dir, CTDLUID, (-1)) != 0) - syslog(LOG_EMERG, "unable to set the access rights for [%s]: %s", ctdl_spool_dir, strerror(errno)); - if ((mkdir(ctdl_netin_dir, 0700) != 0) && (errno != EEXIST)) - syslog(LOG_EMERG, "unable to create directory [%s]: %s", ctdl_netin_dir, strerror(errno)); - if (chown(ctdl_netin_dir, CTDLUID, (-1)) != 0) - syslog(LOG_EMERG, "unable to set the access rights for [%s]: %s", ctdl_netin_dir, strerror(errno)); + syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_spool_dir, strerror(errno)); if ((mkdir(ctdl_nettmp_dir, 0700) != 0) && (errno != EEXIST)) - syslog(LOG_EMERG, "unable to create directory [%s]: %s", ctdl_nettmp_dir, strerror(errno)); + syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_nettmp_dir, strerror(errno)); if (chown(ctdl_nettmp_dir, CTDLUID, (-1)) != 0) - syslog(LOG_EMERG, "unable to set the access rights for [%s]: %s", ctdl_nettmp_dir, strerror(errno)); + syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_nettmp_dir, strerror(errno)); if ((mkdir(ctdl_netout_dir, 0700) != 0) && (errno != EEXIST)) - syslog(LOG_EMERG, "unable to create directory [%s]: %s", ctdl_netout_dir, strerror(errno)); + syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_netout_dir, strerror(errno)); if (chown(ctdl_netout_dir, CTDLUID, (-1)) != 0) - syslog(LOG_EMERG, "unable to set the access rights for [%s]: %s", ctdl_netout_dir, strerror(errno)); + syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_netout_dir, strerror(errno)); } /* @@ -1233,14 +751,12 @@ CTDL_MODULE_INIT(network_spool) CtdlREGISTERRoomCfgType(subpending, ParseSubPendingLine, 0, 5, SerializeGeneric, DeleteGenericCfgLine); /// todo: move this to mailinglist manager CtdlREGISTERRoomCfgType(unsubpending, ParseUnSubPendingLine, 0, 4, SerializeGeneric, DeleteGenericCfgLine); /// todo: move this to mailinglist manager CtdlREGISTERRoomCfgType(lastsent, ParseLastSent, 1, 1, SerializeLastSent, DeleteLastSent); - CtdlREGISTERRoomCfgType(ignet_push_share, ParseGeneric, 0, 2, SerializeGeneric, DeleteGenericCfgLine); // [remotenode|remoteroomname (optional)]// todo: move this to the ignet client + CtdlREGISTERRoomCfgType(ignet_push_share, ParseGeneric, 0, 2, SerializeGeneric, DeleteGenericCfgLine); // [remotenode|remoteroomname (optional)] CtdlREGISTERRoomCfgType(listrecp, ParseGeneric, 0, 1, SerializeGeneric, DeleteGenericCfgLine); CtdlREGISTERRoomCfgType(digestrecp, ParseGeneric, 0, 1, SerializeGeneric, DeleteGenericCfgLine); CtdlREGISTERRoomCfgType(participate, ParseGeneric, 0, 1, SerializeGeneric, DeleteGenericCfgLine); CtdlREGISTERRoomCfgType(roommailalias, ParseRoomAlias, 0, 1, SerializeGeneric, DeleteGenericCfgLine); - create_spool_dirs(); -//////todo CtdlRegisterCleanupHook(destroy_network_queue_room); } return "network_spool"; }