X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=0edb1f11efa0e240bcf7c7c3d79ead11d21b3934;hb=17facca88daba3788c5fcf6ffc8d57f3ed7a5905;hp=e1c75315d7f89d4b28cfd4db40e9f0ab8ef2861c;hpb=eac845c28129f29346a1e9dfd5ac06ddedcc65ca;p=citadel.git diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c index e1c75315d..0edb1f11e 100644 --- a/citadel/modules/network/serv_netspool.c +++ b/citadel/modules/network/serv_netspool.c @@ -72,7 +72,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" @@ -83,53 +82,49 @@ #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 -void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg) +void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG) { - rncfg->lastsent = extract_long(LinePos, 0); -} -void ParseIgnetPushShare(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg) -{ -/* - extract_token(nodename, LinePos, 0, '|', sizeof nodename); - extract_token(roomname, LinePos, 1, '|', sizeof roomname); - mptr = (maplist *) malloc(sizeof(maplist)); - mptr->next = rncfg->RNCfg->ignet_push_shares; - strcpy(mptr->remote_nodename, nodename); - strcpy(mptr->remote_roomname, roomname); - rncfg->RNCfg->ignet_push_shares = mptr; -*/ + RoomNetCfgLine *nptr; + nptr = (RoomNetCfgLine *) + malloc(sizeof(RoomNetCfgLine)); + memset(nptr, 0, sizeof(RoomNetCfgLine)); + OneRNCFG->lastsent = extract_long(LinePos, 0); + OneRNCFG->NetConfigs[ThisOne->C] = nptr; } void ParseRoomAlias(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg) { -/* - if (rncfg->RNCfg->sender != NULL) - continue; / * just one alowed... * / - extract_token(nptr->name, buf, 1, '|', sizeof nptr->name); - rncfg->RNCfg->sender = nptr; -*/ + if (rncfg->Sender != NULL) + return; + + ParseGeneric(ThisOne, Line, LinePos, rncfg); + rncfg->Sender = NewStrBufDup(rncfg->NetConfigs[roommailalias]->Value[0]); } -void ParseSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg) +void ParseSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG) { + if (time(NULL) - extract_long(LinePos, 3) > EXP) + return; /* expired subscription... */ - if (time(NULL) - extract_long(LinePos, 3) > EXP) { - // skipthisline = 1; - } - else - { - } - + ParseGeneric(ThisOne, Line, LinePos, OneRNCFG); } -void ParseUnSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg) +void ParseUnSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG) { - ///int skipthisline = 0; - if (time(NULL) - extract_long(LinePos, 2) > EXP) { - // skipthisline = 1; - } + if (time(NULL) - extract_long(LinePos, 2) > EXP) + return; /* expired subscription... */ + ParseGeneric(ThisOne, Line, LinePos, OneRNCFG); } @@ -139,92 +134,304 @@ void SerializeLastSent(const CfgLineType *ThisOne, StrBuf *OutputBuffer, OneRoom StrBufAppendPrintf(OutputBuffer, "|%ld\n", RNCfg->lastsent); } -void SerializeIgnetPushShare(const CfgLineType *ThisOne, StrBuf *OutputBuffer, OneRoomNetCfg *RNCfg, RoomNetCfgLine *data) +void DeleteLastSent(const CfgLineType *ThisOne, RoomNetCfgLine **data) { - StrBufAppendBufPlain(OutputBuffer, CKEY(ThisOne->Str), 0); -/* - StrBufAppendPrintf(Cfg, "ignet_push_share|%s", RNCfg->ignet_push_shares->remote_nodename); - if (!IsEmptyStr(RNCfg->ignet_push_shares->remote_roomname)) { - StrBufAppendPrintf(Cfg, "|%s", RNCfg->ignet_push_shares->remote_roomname); - } - StrBufAppendPrintf(Cfg, "\n"); - mptr = RNCfg->ignet_push_shares->next; - free(RNCfg->ignet_push_shares); - RNCfg->ignet_push_shares = mptr; -*/ - StrBufAppendBuf(OutputBuffer, data->Value, 0); - StrBufAppendBufPlain(OutputBuffer, HKEY("\n"), 0); + free(*data); + *data = NULL; } +static const RoomNetCfg SpoolCfgs [4] = { + listrecp, + digestrecp, + participate, + ignet_push_share +}; -/* - * Batch up and send all outbound traffic from the current room - */ -void network_spoolout_room(RoomProcList *room_to_spool, - HashList *working_ignetcfg, - HashList *the_netmap) +static const long SpoolCfgsCopyN [4] = { + 1, 1, 1, 2 +}; + +int HaveSpoolConfig(OneRoomNetCfg* RNCfg) { + int i; + int interested = 0; + for (i=0; i < 4; i++) if (RNCfg->NetConfigs[SpoolCfgs[i]] == NULL) interested = 1; + return interested; +} + +void Netmap_AddMe(struct CtdlMessage *msg, const char *defl, long defllen) +{ + long node_len; char buf[SIZ]; - char filename[PATH_MAX]; + + /* prepend our node to the path */ + if (CM_IsEmpty(msg, eMessagePath)) { + CM_SetField(msg, eMessagePath, defl, defllen); + } + node_len = configlen.c_nodename; + if (node_len >= SIZ) + node_len = SIZ - 1; + memcpy(buf, config.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) +{ + struct CitContext *CCC = CC; SpoolControl *sc; - int i; + int i = 0; + + 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; /* * If the room doesn't exist, don't try to perform its networking tasks. * Normally this should never happen, but once in a while maybe a room gets * queued for networking and then deleted before it can happen. */ - if (CtdlGetRoom(&CC->room, room_to_spool->name) != 0) { + 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); + free(sc); return; } - assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir); begin_critical_section(S_NETCONFIGS); + if (sc->RNCfg == NULL) + sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber); - /* Only do net processing for rooms that have netconfigs */ - if (!read_spoolcontrol_file(&sc, filename)) + if (!HaveSpoolConfig(sc->RNCfg)) { end_critical_section(S_NETCONFIGS); + free(sc); + /* nothing to do for this room... */ return; } - syslog(LOG_INFO, "Networking started for <%s>\n", CC->room.QRname); - sc->working_ignetcfg = working_ignetcfg; - sc->the_netmap = the_netmap; + /* Now lets remember whats needed for the actual work... */ - /* If there are digest recipients, we have to build a digest */ - if (sc->RNCfg->NetConfigs[digestrecp] != NULL) { - sc->digestfp = tmpfile(); - fprintf(sc->digestfp, "Content-type: text/plain\n\n"); + for (i=0; i < 4; i++) + { + aggregate_recipients(&sc->Users[SpoolCfgs[i]], + SpoolCfgs[i], + sc->RNCfg, + SpoolCfgsCopyN[i]); } + + if (StrLength(sc->RNCfg->Sender) > 0) + sc->Users[roommailalias] = NewStrBufDup(sc->RNCfg->Sender); + end_critical_section(S_NETCONFIGS); + + sc->next = *pSC; + *pSC = sc; + +} - /* Do something useful */ - CtdlForEachMessage(MSGS_GT, sc->RNCfg->lastsent, NULL, NULL, 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); + } + + sc->ListID = NewStrBufPlain(NULL, 1024); + if (StrLength(sc->RoomInfo) > 0) + { + const char *Pos = NULL; + StrBufSipLine(sc->ListID, sc->RoomInfo, &Pos); + + if (StrLength(sc->ListID) > MAX_LISTIDLENGTH) + { + StrBufCutAt(sc->ListID, MAX_LISTIDLENGTH, NULL); + StrBufAppendBufPlain(sc->ListID, HKEY("..."), 0); + } + StrBufAsciify(sc->ListID, ' '); + } + else + { + StrBufAppendBufPlain(sc->ListID, CCC->room.QRname, -1, 0); + } + + StrBufAppendBufPlain(sc->ListID, HKEY("<"), 0); + RoomName = NewStrBufPlain (sc->room.QRname, -1); + StrBufAsciify(RoomName, '_'); + StrBufReplaceChars(RoomName, ' ', '_'); + + if (StrLength(sc->Users[roommailalias]) > 0) + { + long Pos; + const char *AtPos; + + Pos = StrLength(sc->ListID); + StrBufAppendBuf(sc->ListID, sc->Users[roommailalias], 0); + AtPos = strchr(ChrPtr(sc->ListID) + Pos, '@'); + + if (AtPos != NULL) + { + StrBufPeek(sc->ListID, AtPos, 0, '.'); + } + } + else + { + StrBufAppendBufPlain(sc->ListID, HKEY("room_"), 0); + StrBufAppendBuf(sc->ListID, RoomName, 0); + StrBufAppendBufPlain(sc->ListID, HKEY("."), 0); + StrBufAppendBufPlain(sc->ListID, config.c_fqdn, -1, 0); + /* + * this used to be: + * roomname + * according to rfc2919.txt it only has to be a uniq identifier + * under the domain of the system; + * in general MUAs use it to calculate the reply address nowadays. + */ + } + StrBufAppendBufPlain(sc->ListID, HKEY(">"), 0); + + if (StrLength(sc->Users[roommailalias]) == 0) + { + sc->Users[roommailalias] = NewStrBuf(); + + 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); + + StrBufLowerCase(sc->Users[roommailalias]); + } + + FreeStrBuf(&RoomName); +} + +static time_t last_digest_delivery = 0; + +/* + * Batch up and send all outbound traffic from the current room + */ +void network_spoolout_room(SpoolControl *sc) +{ + struct CitContext *CCC = CC; + char buf[SIZ]; + int i; + long lastsent; + + /* + * If the room doesn't exist, don't try to perform its networking tasks. + * Normally this should never happen, but once in a while maybe a room gets + * queued for networking and then deleted before it can happen. + */ + memcpy (&CCC->room, &sc->room, sizeof(ctdlroom)); + + syslog(LOG_INFO, "Networking started for <%s>\n", CCC->room.QRname); + + CalcListID(sc); + + /* remember where we started... */ + lastsent = sc->lastsent; + + /* 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 */ - snprintf(buf, sizeof buf, "room_%s@%s", - CC->room.QRname, config.c_fqdn); + if (StrLength(sc->Users[roommailalias]) > 0) + { + long len; + len = StrLength(sc->Users[roommailalias]); + if (len + 1 > sizeof(buf)) + len = sizeof(buf) - 1; + memcpy(buf, ChrPtr(sc->Users[roommailalias]), len); + buf[len] = '\0'; + } + else + { + snprintf(buf, sizeof buf, "room_%s@%s", + CCC->room.QRname, config.c_fqdn); + } + for (i=0; buf[i]; ++i) { buf[i] = tolower(buf[i]); if (isspace(buf[i])) buf[i] = '_'; } - if (sc->digestfp != NULL) { - fprintf(sc->digestfp, " -----------------------------------" + + + /* 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", - CC->room.QRname, buf - ); - network_deliver_digest(sc); /* deliver and close */ + CCC->room.QRname, buf + ); + network_deliver_digest(sc); /* deliver */ + remove_digest_file(&sc->room); + } + } + } + if (sc->digestfp != NULL) { + fclose(sc->digestfp); + sc->digestfp = NULL; } /* Now rewrite the config file */ - //// todo writenfree_spoolcontrol_file(&sc, filename); - end_critical_section(S_NETCONFIGS); + if (sc->lastsent != lastsent) + { + begin_critical_section(S_NETCONFIGS); + sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber); + + sc->RNCfg->lastsent = sc->lastsent; + sc->RNCfg->changed = 1; + end_critical_section(S_NETCONFIGS); + } } /* @@ -233,15 +440,15 @@ void network_spoolout_room(RoomProcList *room_to_spool, */ 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 *oldpath = NULL; char filename[PATH_MAX]; FILE *fp; const StrBuf *nexthop = NULL; @@ -271,38 +478,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], config.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) { @@ -326,7 +522,7 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, QN_syslog(LOG_ERR, "%s: %s\n", filename, strerror(errno)); } free(sermsg.ser); - CtdlFreeMessage(msg); + CM_Free(msg); FreeStrBuf(&Buf); return; } @@ -351,14 +547,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); } @@ -366,13 +562,13 @@ 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, "A message you sent could not be delivered due to an invalid address.\n" @@ -386,28 +582,22 @@ 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 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); } @@ -459,7 +649,7 @@ void network_process_file(char *filename, long msgend = (-1L); long msgcur = 0L; int ch; - + int nMessages = 0; fp = fopen(filename, "rb"); if (fp == NULL) { @@ -488,6 +678,7 @@ void network_process_file(char *filename, } ++msgcur; + nMessages ++; } msgend = msgcur - 1; @@ -498,8 +689,15 @@ void network_process_file(char *filename, 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); } @@ -513,9 +711,12 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n 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 @@ -535,8 +736,60 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n dp = opendir(ctdl_netin_dir); if (dp == NULL) return; - while (d = readdir(dp), d != NULL) { - if ((strcmp(d->d_name, ".")) && (strcmp(d->d_name, ".."))) { + 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", @@ -551,6 +804,7 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n } closedir(dp); + free(d); } /* @@ -574,6 +828,8 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm 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); @@ -593,21 +849,21 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm while ((readdir_r(dp, d, &filedir_entry) == 0) && (filedir_entry != NULL)) { -#ifdef _DIRENT_HAVE_D_NAMELEN - d_namelen = filedir_entry->d_namelen; -#else +#ifdef _DIRENT_HAVE_D_NAMLEN + d_namelen = filedir_entry->d_namlen; -#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 +#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... */ @@ -703,6 +959,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 + ); } else { nFailed++; @@ -742,22 +1003,21 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm while ((readdir_r(dp, d, &filedir_entry) == 0) && (filedir_entry != NULL)) { -#ifdef _DIRENT_HAVE_D_NAMELEN - d_namelen = filedir_entry->d_namelen; - d_type = filedir_entry->d_type; -#else +#ifdef _DIRENT_HAVE_D_NAMLEN + d_namelen = filedir_entry->d_namlen; -#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 +#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; @@ -797,6 +1057,21 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm closedir(dp); } +void free_spoolcontrol_struct(SpoolControl **sc) +{ + free_spoolcontrol_struct_members(*sc); + free(*sc); + *sc = NULL; +} + +void free_spoolcontrol_struct_members(SpoolControl *sc) +{ + int i; + FreeStrBuf(&sc->RoomInfo); + FreeStrBuf(&sc->ListID); + for (i = 0; i < maxRoomNetCfg; i++) + FreeStrBuf(&sc->Users[i]); +} @@ -829,14 +1104,14 @@ CTDL_MODULE_INIT(network_spool) { if (!threading) { -// CtdlREGISTERRoomCfgType(subpending, ParseSubPendingLine, 0, SerializeSubPendingLine, DeleteSubPendingLine); /// todo: move this to mailinglist manager -// CtdlREGISTERRoomCfgType(unsubpending, ParseUnSubPendingLine0, SerializeUnSubPendingLine, DeleteUnSubPendingLine); /// todo: move this to mailinglist manager -// CtdlREGISTERRoomCfgType(lastsent, ParseLastSent, 1, SerializeLastSent, DeleteLastSent); -/// CtdlREGISTERRoomCfgType(ignet_push_share, ParseIgnetPushShare, 0, SerializeIgnetPushShare, DeleteIgnetPushShare); // todo: move this to the ignet client - CtdlREGISTERRoomCfgType(listrecp, ParseGeneric, 0, SerializeGeneric, DeleteGenericCfgLine); - CtdlREGISTERRoomCfgType(digestrecp, ParseGeneric, 0, SerializeGeneric, DeleteGenericCfgLine); - CtdlREGISTERRoomCfgType(participate, ParseGeneric, 0, SerializeGeneric, DeleteGenericCfgLine); - CtdlREGISTERRoomCfgType(roommailalias, ParseRoomAlias, 0, SerializeGeneric, DeleteGenericCfgLine); + 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(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);