X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=5055eabfa0bd9230a4bad7355dac7426c03b1b74;hb=aca7dd04d80f04b9cd61f740549ce370e76bc332;hp=7ca9edcd8422f7936ae7d8ecfb321f9ad652e179;hpb=dc56ca4c678006a3930caa42688b2f02a9535270;p=citadel.git diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c index 7ca9edcd8..5055eabfa 100644 --- a/citadel/modules/network/serv_netspool.c +++ b/citadel/modules/network/serv_netspool.c @@ -2,7 +2,7 @@ * This module handles shared rooms, inter-Citadel mail, and outbound * mailing list processing. * - * Copyright (c) 2000-2017 by the citadel.org team + * Copyright (c) 2000-2020 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. @@ -76,110 +76,15 @@ #include "citadel_dirs.h" #include "threads.h" #include "context.h" - #include "ctdl_module.h" - #include "netspool.h" #include "netmail.h" -#ifndef DT_UNKNOWN -#define DT_UNKNOWN 0 -#define DT_DIR 4 -#define DT_REG 8 -#define DT_LNK 10 - -#define IFTODT(mode) (((mode) & 0170000) >> 12) -#define DTTOIF(dirtype) ((dirtype) << 12) -#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, "netspool: 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, "netspool: leaving network_bounce()"); -} - - void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG) { RoomNetCfgLine *nptr; - nptr = (RoomNetCfgLine *) - malloc(sizeof(RoomNetCfgLine)); + nptr = (RoomNetCfgLine *) malloc(sizeof(RoomNetCfgLine)); memset(nptr, 0, sizeof(RoomNetCfgLine)); OneRNCFG->lastsent = extract_long(LinePos, 0); OneRNCFG->NetConfigs[ThisOne->C] = nptr; @@ -187,8 +92,9 @@ void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos void ParseRoomAlias(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg) { - if (rncfg->Sender != NULL) + if (rncfg->Sender != NULL) { return; + } ParseGeneric(ThisOne, Line, LinePos, rncfg); rncfg->Sender = NewStrBufDup(rncfg->NetConfigs[roommailalias]->Value[0]); @@ -226,7 +132,6 @@ static const RoomNetCfg SpoolCfgs [4] = { listrecp, digestrecp, participate, - ignet_push_share }; static const long SpoolCfgsCopyN [4] = { @@ -241,29 +146,12 @@ 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, HashList *working_ignetcfg, - HashList *the_netmap) -{ + HashList *the_netmap +) { SpoolControl *sc; int i = 0; @@ -329,7 +217,7 @@ void CalcListID(SpoolControl *sc) #define MAX_LISTIDLENGTH 150 // Load the room banner as the list description - struct CtdlMessage *msg = CtdlFetchMessage(sc->room.msgnum_info, 1, 1); + struct CtdlMessage *msg = CtdlFetchMessage(sc->room.msgnum_info, 1); if (msg != NULL) { CC->redirect_buffer = NewStrBufPlain(NULL, SIZ); CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_NONE, 0, 0, 0); @@ -388,7 +276,7 @@ void CalcListID(SpoolControl *sc) /* * this used to be: * roomname - * according to rfc2919.txt it only has to be a uniq identifier + * according to rfc2919.txt it only has to be a unique identifier * under the domain of the system; * in general MUAs use it to calculate the reply address nowadays. */ @@ -412,7 +300,7 @@ void CalcListID(SpoolControl *sc) /* - * 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) { @@ -457,7 +345,6 @@ void network_spoolout_room(SpoolControl *sc) if (isspace(buf[i])) buf[i] = '_'; } - /* If we wrote a digest, deliver it and then close it */ if ( (sc->Users[digestrecp] != NULL) && (sc->digestfp != NULL) ) { @@ -489,634 +376,6 @@ void network_spoolout_room(SpoolControl *sc) } -/* - * 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; - - /* 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); - } - } - if (CheckIfAlreadySeen(msgid)) { - 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; - 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; - - syslog(LOG_DEBUG, "netspool: 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) ) { - syslog(LOG_ERR, "netspool: corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d", 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], CtdlGetConfigStr("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() - ); - syslog(LOG_DEBUG, "netspool: appending to %s", filename); - fp = fopen(filename, "ab"); - if (fp != NULL) { - fwrite(sermsg.ser, sermsg.len, 1, fp); - fclose(fp); - } - else { - syslog(LOG_ERR, "%s: %s", 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"); - 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"); - free_recipients(recp); - syslog(LOG_DEBUG, "netspool: 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 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) -{ - FILE *fp; - long msgstart = (-1L); - long msgend = (-1L); - long msgcur = 0L; - int ch; - int nMessages = 0; - - fp = fopen(filename, "rb"); - if (fp == NULL) { - syslog(LOG_ERR, "%s: %s", filename, strerror(errno)); - return; - } - - fseek(fp, 0L, SEEK_END); - syslog(LOG_INFO, "netspool: processing %ld bytes from %s", 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) - syslog(LOG_INFO, "netspool: processed %d messages in %s", 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) -{ - 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) { - syslog(LOG_DEBUG, "netspool: nothing in inbound queue"); - return; - } - last_spoolin_mtime = statbuf.st_mtime; - syslog(LOG_DEBUG, "netspool: processing inbound queue"); - - /* - * 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) -{ - IOBuffer IOB; - FDIOBuffer FDIO; - int d_namelen; - DIR *dp; - struct dirent *d; - struct dirent *filedir_entry; - const char *pch; - char spooloutfilename[PATH_MAX]; - char filename[PATH_MAX]; - const StrBuf *nexthop; - StrBuf *NextHop; - int i; - struct stat statbuf; - 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; - } - - NextHop = NewStrBuf(); - memset(&IOB, 0, sizeof(IOBuffer)); - memset(&FDIO, 0, sizeof(FDIOBuffer)); - FDIO.IOB = &IOB; - - 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_type == DT_DIR) - continue; - - 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; - - pch = strchr(filedir_entry->d_name, '@'); - if (pch == NULL) - continue; - - snprintf(filename, - sizeof filename, - "%s/%s", - ctdl_netout_dir, - filedir_entry->d_name); - - StrBufPlain(NextHop, - filedir_entry->d_name, - pch - filedir_entry->d_name); - - snprintf(spooloutfilename, - sizeof spooloutfilename, - "%s/%s", - ctdl_netout_dir, - ChrPtr(NextHop)); - - syslog(LOG_DEBUG, "netspool: consolidate %s to %s", filename, ChrPtr(NextHop)); - if (CtdlNetworkTalkingTo(SKEY(NextHop), NTT_CHECK)) { - nFailed++; - syslog(LOG_DEBUG, "netspool: currently online with %s - skipping for now", ChrPtr(NextHop)); - } - else { - size_t dsize; - size_t fsize; - int infd, outfd; - const char *err = NULL; - CtdlNetworkTalkingTo(SKEY(NextHop), NTT_ADD); - - infd = open(filename, O_RDONLY); - if (infd == -1) { - nFailed++; - syslog(LOG_ERR, "%s: %s", filename, strerror(errno)); - CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE); - continue; - } - - outfd = open(spooloutfilename, - O_EXCL|O_CREAT|O_NONBLOCK|O_WRONLY, - S_IRUSR|S_IWUSR); - if (outfd == -1) - { - outfd = open(spooloutfilename, - O_EXCL|O_NONBLOCK|O_WRONLY, - S_IRUSR | S_IWUSR); - } - if (outfd == -1) { - nFailed++; - syslog(LOG_ERR, "%s: %s", spooloutfilename, strerror(errno)); - close(infd); - CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE); - continue; - } - - dsize = lseek(outfd, 0, SEEK_END); - lseek(outfd, -dsize, SEEK_SET); - - fstat(infd, &statbuf); - fsize = statbuf.st_size; - IOB.fd = infd; - FDIOBufferInit(&FDIO, &IOB, outfd, fsize + dsize); - FDIO.ChunkSendRemain = fsize; - FDIO.TotalSentAlready = dsize; - err = NULL; - errno = 0; - do {} while ((FileMoveChunked(&FDIO, &err) > 0) && (err == NULL)); - if (err == NULL) { - unlink(filename); - syslog(LOG_DEBUG, "netspool: spoolfile %s now "SIZE_T_FMT" KB", spooloutfilename, (dsize + fsize)/1024); - } - else { - nFailed++; - syslog(LOG_ERR, "netspool: failed to append to %s [%s]; rolling back..", spooloutfilename, strerror(errno)); - /* whoops partial append?? truncate spooloutfilename again! */ - ftruncate(outfd, dsize); - } - FDIOBufferDelete(&FDIO); - close(infd); - close(outfd); - CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE); - } - } - closedir(dp); - - if (nFailed > 0) { - FreeStrBuf(&NextHop); - syslog(LOG_INFO, "netspool: skipping Spoolcleanup because of %d files unprocessed.", nFailed); - - return; - } - - /* Step 2: delete any files in the outbound queue that were for neighbors who no longer exist */ - dp = opendir(ctdl_netout_dir); - if (dp == NULL) { - FreeStrBuf(&NextHop); - free(d); - 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_type == DT_DIR) - continue; - - 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; - - pch = strchr(filedir_entry->d_name, '@'); - if (pch == NULL) /* no @ in name? consolidated file. */ - continue; - - StrBufPlain(NextHop, - filedir_entry->d_name, - pch - filedir_entry->d_name); - - snprintf(filename, - sizeof filename, - "%s/%s", - ctdl_netout_dir, - filedir_entry->d_name - ); - - i = CtdlIsValidNode(&nexthop, - NULL, - NextHop, - working_ignetcfg, - the_netmap); - - if ( (i != 0) || (StrLength(nexthop) > 0) ) { - unlink(filename); - } - } - FreeStrBuf(&NextHop); - free(d); - closedir(dp); -} - void free_spoolcontrol_struct(SpoolControl **sc) { free_spoolcontrol_struct_members(*sc); @@ -1124,6 +383,7 @@ void free_spoolcontrol_struct(SpoolControl **sc) *sc = NULL; } + void free_spoolcontrol_struct_members(SpoolControl *sc) { int i; @@ -1142,20 +402,13 @@ void create_spool_dirs(void) { 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, "netspool: 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, "netspool: unable to create directory [%s]: %s", ctdl_netin_dir, strerror(errno)); - if (chown(ctdl_netin_dir, CTDLUID, (-1)) != 0) - syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_netin_dir, strerror(errno)); if ((mkdir(ctdl_nettmp_dir, 0700) != 0) && (errno != EEXIST)) 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, "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, "netspool: unable to create directory [%s]: %s", ctdl_netout_dir, strerror(errno)); - if (chown(ctdl_netout_dir, CTDLUID, (-1)) != 0) - syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_netout_dir, strerror(errno)); } + /* * Module entry point */ @@ -1163,17 +416,14 @@ CTDL_MODULE_INIT(network_spool) { if (!threading) { - 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(subpending, ParseSubPendingLine, 0, 5, SerializeGeneric, DeleteGenericCfgLine); + CtdlREGISTERRoomCfgType(unsubpending, ParseUnSubPendingLine, 0, 4, SerializeGeneric, DeleteGenericCfgLine); 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(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"; }