X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=1da98f8071412c5570a0aded7cf13fcdf0124168;hb=ec7c5eca2a8c4d3416c0c6b3f9db3ba95fb40094;hp=1aeb10ffc1537421996d66b255c214ee7f4e9f2d;hpb=50a7f9b7c2183eb912b5c22d8f70b82a8310a6c6;p=citadel.git

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index 1aeb10ffc..1da98f807 100644
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -5,19 +5,13 @@
  * Copyright (c) 2000-2012 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 as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  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.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  * ** NOTE **   A word on the S_NETCONFIGS semaphore:
  * This is a fairly high-level type of critical section.  It ensures that no
  * two threads work on the netconfigs files at the same time.  Since we do
@@ -81,270 +75,94 @@
 #include "file_ops.h"
 #include "citadel_dirs.h"
 #include "threads.h"
+#include "context.h"
 
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
+#include "ctdl_module.h"
 
-#include "context.h"
-#include "netconfig.h"
 #include "netspool.h"
 #include "netmail.h"
-#include "ctdl_module.h"
-
 
-	
 
-int read_spoolcontrol_file(SpoolControl **scc, char *filename)
-{
-	FILE *fp;
-	char instr[SIZ];
-	char buf[SIZ];
-	char nodename[256];
-	char roomname[ROOMNAMELEN];
-	size_t miscsize = 0;
-	size_t linesize = 0;
-	int skipthisline = 0;
-	namelist *nptr = NULL;
-	maplist *mptr = NULL;
-	SpoolControl *sc;
-
-	fp = fopen(filename, "r");
-	if (fp == NULL) {
-		return 0;
-	}
-	sc = malloc(sizeof(SpoolControl));
-	memset(sc, 0, sizeof(SpoolControl));
-	*scc = sc;
-
-	while (fgets(buf, sizeof buf, fp) != NULL) {
-		buf[strlen(buf)-1] = 0;
+#ifndef DT_UNKNOWN
+#define DT_UNKNOWN     0
+#define DT_DIR         4
+#define DT_REG         8
+#define DT_LNK         10
 
-		extract_token(instr, buf, 0, '|', sizeof instr);
-		if (!strcasecmp(instr, strof(lastsent))) {
-			sc->lastsent = extract_long(buf, 1);
-		}
-		else if (!strcasecmp(instr, strof(listrecp))) {
-			nptr = (namelist *)
-				malloc(sizeof(namelist));
-			nptr->next = sc->listrecps;
-			extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
-			sc->listrecps = nptr;
-		}
-		else if (!strcasecmp(instr, strof(participate))) {
-			nptr = (namelist *)
-				malloc(sizeof(namelist));
-			nptr->next = sc->participates;
-			extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
-			sc->participates = nptr;
-		}
-		else if (!strcasecmp(instr, strof(digestrecp))) {
-			nptr = (namelist *)
-				malloc(sizeof(namelist));
-			nptr->next = sc->digestrecps;
-			extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
-			sc->digestrecps = nptr;
-		}
-		else if (!strcasecmp(instr, strof(ignet_push_share))) {
-			extract_token(nodename, buf, 1, '|', sizeof nodename);
-			extract_token(roomname, buf, 2, '|', sizeof roomname);
-			mptr = (maplist *) malloc(sizeof(maplist));
-			mptr->next = sc->ignet_push_shares;
-			strcpy(mptr->remote_nodename, nodename);
-			strcpy(mptr->remote_roomname, roomname);
-			sc->ignet_push_shares = mptr;
-		}
-		else {
-			/* Preserve 'other' lines ... *unless* they happen to
-			 * be subscribe/unsubscribe pendings with expired
-			 * timestamps.
-			 */
-			skipthisline = 0;
-			if (!strncasecmp(buf, strof(subpending)"|", 11)) {
-				if (time(NULL) - extract_long(buf, 4) > EXP) {
-					skipthisline = 1;
-				}
-			}
-			if (!strncasecmp(buf, strof(unsubpending)"|", 13)) {
-				if (time(NULL) - extract_long(buf, 3) > EXP) {
-					skipthisline = 1;
-				}
-			}
+#define IFTODT(mode)   (((mode) & 0170000) >> 12)
+#define DTTOIF(dirtype)        ((dirtype) << 12)
+#endif
 
-			if (skipthisline == 0) {
-				linesize = strlen(buf);
-				sc->misc = realloc(sc->misc,
-					(miscsize + linesize + 2) );
-				sprintf(&sc->misc[miscsize], "%s\n", buf);
-				miscsize = miscsize + linesize + 1;
-			}
-		}
 
+void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg)
+{
+	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;
+*/
+}
 
-	}
-	fclose(fp);
-	return 1;
+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;
+*/
 }
 
-void free_spoolcontrol_struct(SpoolControl **scc)
+void ParseSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg)
 {
-	SpoolControl *sc;
-	namelist *nptr = NULL;
-	maplist *mptr = NULL;
-
-	sc = *scc;
-	while (sc->listrecps != NULL) {
-		nptr = sc->listrecps->next;
-		free(sc->listrecps);
-		sc->listrecps = nptr;
-	}
-	/* Do the same for digestrecps */
-	while (sc->digestrecps != NULL) {
-		nptr = sc->digestrecps->next;
-		free(sc->digestrecps);
-		sc->digestrecps = nptr;
-	}
-	/* Do the same for participates */
-	while (sc->participates != NULL) {
-		nptr = sc->participates->next;
-		free(sc->participates);
-		sc->participates = nptr;
+
+	if (time(NULL) - extract_long(LinePos, 3) > EXP) {
+		//	skipthisline = 1;
 	}
-	while (sc->ignet_push_shares != NULL) {
-		mptr = sc->ignet_push_shares->next;
-		free(sc->ignet_push_shares);
-		sc->ignet_push_shares = mptr;
+	else
+	{
 	}
-	free(sc->misc);
-	free(sc);
-	*scc=NULL;
-}
 
-int writenfree_spoolcontrol_file(SpoolControl **scc, char *filename)
+}
+void ParseUnSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg)
 {
-	char tempfilename[PATH_MAX];
-	int TmpFD;
-	SpoolControl *sc;
-	namelist *nptr = NULL;
-	maplist *mptr = NULL;
-	long len;
-	time_t unixtime;
-	struct timeval tv;
-	long reltid; /* if we don't have SYS_gettid, use "random" value */
-	StrBuf *Cfg;
-	int rc;
-
-	len = strlen(filename);
-	memcpy(tempfilename, filename, len + 1);
+	///int skipthisline = 0;
+	if (time(NULL) - extract_long(LinePos, 2) > EXP) {
+		//	skipthisline = 1;
+	}
 
+}
 
-#if defined(HAVE_SYSCALL_H) && defined (SYS_gettid)
-	reltid = syscall(SYS_gettid);
-#endif
-	gettimeofday(&tv, NULL);
-	/* Promote to time_t; types differ on some OSes (like darwin) */
-	unixtime = tv.tv_sec;
-
-	sprintf(tempfilename + len, ".%ld-%ld", reltid, unixtime);
-	sc = *scc;
-	errno = 0;
-	TmpFD = open(tempfilename, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR);
-	Cfg = NewStrBuf();
-	if ((TmpFD < 0) || (errno != 0)) {
-		syslog(LOG_CRIT, "ERROR: cannot open %s: %s\n",
-			filename, strerror(errno));
-		free_spoolcontrol_struct(scc);
-		unlink(tempfilename);
-	}
-	else {
-		fchown(TmpFD, config.c_ctdluid, 0);
-		StrBufAppendPrintf(Cfg, "lastsent|%ld\n", sc->lastsent);
-		
-		/* Write out the listrecps while freeing from memory at the
-		 * same time.  Am I clever or what?  :)
-		 */
-		while (sc->listrecps != NULL) {
-		    StrBufAppendPrintf(Cfg, "listrecp|%s\n", sc->listrecps->name);
-			nptr = sc->listrecps->next;
-			free(sc->listrecps);
-			sc->listrecps = nptr;
-		}
-		/* Do the same for digestrecps */
-		while (sc->digestrecps != NULL) {
-			StrBufAppendPrintf(Cfg, "digestrecp|%s\n", sc->digestrecps->name);
-			nptr = sc->digestrecps->next;
-			free(sc->digestrecps);
-			sc->digestrecps = nptr;
-		}
-		/* Do the same for participates */
-		while (sc->participates != NULL) {
-			StrBufAppendPrintf(Cfg, "participate|%s\n", sc->participates->name);
-			nptr = sc->participates->next;
-			free(sc->participates);
-			sc->participates = nptr;
-		}
-		while (sc->ignet_push_shares != NULL) {
-			StrBufAppendPrintf(Cfg, "ignet_push_share|%s", sc->ignet_push_shares->remote_nodename);
-			if (!IsEmptyStr(sc->ignet_push_shares->remote_roomname)) {
-				StrBufAppendPrintf(Cfg, "|%s", sc->ignet_push_shares->remote_roomname);
-			}
-			StrBufAppendPrintf(Cfg, "\n");
-			mptr = sc->ignet_push_shares->next;
-			free(sc->ignet_push_shares);
-			sc->ignet_push_shares = mptr;
-		}
-		if (sc->misc != NULL) {
-			StrBufAppendBufPlain(Cfg, sc->misc, -1, 0);
-		}
-		free(sc->misc);
 
-		rc = write(TmpFD, ChrPtr(Cfg), StrLength(Cfg));
-		if ((rc >=0 ) && (rc == StrLength(Cfg))) 
-		{
-			close(TmpFD);
-			rename(tempfilename, filename);
-		}
-		else {
-			syslog(LOG_EMERG, 
-				      "unable to write %s; [%s]; not enough space on the disk?\n", 
-				      tempfilename, 
-				      strerror(errno));
-			close(TmpFD);
-			unlink(tempfilename);
-		}
-		FreeStrBuf(&Cfg);
-		free(sc);
-		*scc=NULL;
-	}
-	return 1;
+void SerializeLastSent(const CfgLineType *ThisOne, StrBuf *OutputBuffer, OneRoomNetCfg *RNCfg, RoomNetCfgLine *data)
+{
+	StrBufAppendBufPlain(OutputBuffer, CKEY(ThisOne->Str), 0);
+	StrBufAppendPrintf(OutputBuffer, "|%ld\n", RNCfg->lastsent);
 }
-int is_recipient(SpoolControl *sc, const char *Name)
+
+void SerializeIgnetPushShare(const CfgLineType *ThisOne, StrBuf *OutputBuffer, OneRoomNetCfg *RNCfg, RoomNetCfgLine *data)
 {
-	namelist *nptr;
-	size_t len;
-
-	len = strlen(Name);
-	nptr = sc->listrecps;
-	while (nptr != NULL) {
-		if (strncmp(Name, nptr->name, len)==0)
-			return 1;
-		nptr = nptr->next;
-	}
-	/* Do the same for digestrecps */
-	nptr = sc->digestrecps;
-	while (nptr != NULL) {
-		if (strncmp(Name, nptr->name, len)==0)
-			return 1;
-		nptr = nptr->next;
-	}
-	/* Do the same for participates */
-	nptr = sc->participates;
-	while (nptr != NULL) {
-		if (strncmp(Name, nptr->name, len)==0)
-			return 1;
-		nptr = nptr->next;
-	}
-	return 0;
+	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);
 }
 
 
@@ -385,13 +203,13 @@ void network_spoolout_room(RoomProcList *room_to_spool,
 	sc->the_netmap = the_netmap;
 
 	/* If there are digest recipients, we have to build a digest */
-	if (sc->digestrecps != NULL) {
+	if (sc->RNCfg->NetConfigs[digestrecp] != NULL) {
 		sc->digestfp = tmpfile();
 		fprintf(sc->digestfp, "Content-type: text/plain\n\n");
 	}
 
 	/* Do something useful */
-	CtdlForEachMessage(MSGS_GT, sc->lastsent, NULL, NULL, NULL,
+	CtdlForEachMessage(MSGS_GT, sc->RNCfg->lastsent, NULL, NULL, NULL,
 		network_spool_msg, sc);
 
 	/* If we wrote a digest, deliver it and then close it */
@@ -414,7 +232,7 @@ void network_spoolout_room(RoomProcList *room_to_spool,
 	}
 
 	/* Now rewrite the config file */
-	writenfree_spoolcontrol_file(&sc, filename);
+	//// todo writenfree_spoolcontrol_file(&sc, filename);
 	end_critical_section(S_NETCONFIGS);
 }
 
@@ -472,11 +290,11 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
 
 			/* route the message */
 			Buf = NewStrBufPlain(msg->cm_fields['D'], -1);
-			if (is_valid_node(&nexthop, 
-					  NULL, 
-					  Buf, 
-					  working_ignetcfg, 
-					  the_netmap) == 0) 
+			if (CtdlIsValidNode(&nexthop, 
+					    NULL, 
+					    Buf, 
+					    working_ignetcfg, 
+					    the_netmap) == 0) 
 			{
 				/* prepend our node to the path */
 				if (msg->cm_fields['P'] != NULL) {
@@ -548,10 +366,10 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
 
 	/* Learn network topology from the path */
 	if ((msg->cm_fields['N'] != NULL) && (msg->cm_fields['P'] != NULL)) {
-		network_learn_topology(msg->cm_fields['N'], 
-				       msg->cm_fields['P'], 
-				       the_netmap, 
-				       netmap_changed);
+		NetworkLearnTopology(msg->cm_fields['N'], 
+				     msg->cm_fields['P'], 
+				     the_netmap, 
+				     netmap_changed);
 	}
 
 	/* Is the sending node giving us a very persuasive suggestion about
@@ -704,9 +522,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
@@ -726,8 +547,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_namelen;
+
+#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",
@@ -742,6 +615,7 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n
 	}
 
 	closedir(dp);
+	free(d);
 }
 
 /*
@@ -765,6 +639,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);
@@ -784,21 +660,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
+#ifdef _DIRENT_HAVE_D_NAMLEN
 		d_namelen = filedir_entry->d_namelen;
-#else
-
-#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... */
 
@@ -832,7 +708,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 			 ChrPtr(NextHop));
 
 		QN_syslog(LOG_DEBUG, "Consolidate %s to %s\n", filename, ChrPtr(NextHop));
-		if (network_talking_to(SKEY(NextHop), NTT_CHECK)) {
+		if (CtdlNetworkTalkingTo(SKEY(NextHop), NTT_CHECK)) {
 			nFailed++;
 			QN_syslog(LOG_DEBUG,
 				  "Currently online with %s - skipping for now\n",
@@ -844,7 +720,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 			size_t fsize;
 			int infd, outfd;
 			const char *err = NULL;
-			network_talking_to(SKEY(NextHop), NTT_ADD);
+			CtdlNetworkTalkingTo(SKEY(NextHop), NTT_ADD);
 
 			infd = open(filename, O_RDONLY);
 			if (infd == -1) {
@@ -853,7 +729,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 					  "failed to open %s for reading due to %s; skipping.\n",
 					  filename, strerror(errno)
 					);
-				network_talking_to(SKEY(NextHop), NTT_REMOVE);
+				CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE);
 				continue;				
 			}
 			
@@ -873,7 +749,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 					  spooloutfilename, strerror(errno)
 					);
 				close(infd);
-				network_talking_to(SKEY(NextHop), NTT_REMOVE);
+				CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE);
 				continue;
 			}
 
@@ -907,7 +783,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 			FDIOBufferDelete(&FDIO);
 			close(infd);
 			close(outfd);
-			network_talking_to(SKEY(NextHop), NTT_REMOVE);
+			CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE);
 		}
 	}
 	closedir(dp);
@@ -933,22 +809,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
+#ifdef _DIRENT_HAVE_D_NAMLEN
 		d_namelen = filedir_entry->d_namelen;
-		d_type = filedir_entry->d_type;
-#else
-
-#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;
@@ -973,11 +848,11 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 			filedir_entry->d_name
 		);
 
-		i = is_valid_node(&nexthop,
-				  NULL,
-				  NextHop,
-				  working_ignetcfg,
-				  the_netmap);
+		i = CtdlIsValidNode(&nexthop,
+				    NULL,
+				    NextHop,
+				    working_ignetcfg,
+				    the_netmap);
 	
 		if ( (i != 0) || (StrLength(nexthop) > 0) ) {
 			unlink(filename);
@@ -1020,6 +895,15 @@ 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);
+
 		create_spool_dirs();
 //////todo		CtdlRegisterCleanupHook(destroy_network_queue_room);
 	}