X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=c24f31bc55df207377bfb8fcc5bf18f494cc507c;hb=a6b82fe0d2a5b38201d21320f94d235a1c0290ad;hp=d66161bcc9429fe19f6f9d7c2b63cedc35c16a0e;hpb=e24d4d39b9e026d260c7745014bafe63e19f9b0b;p=citadel.git

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index d66161bcc..c24f31bc5 100644
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -79,28 +79,29 @@
 
 #include "ctdl_module.h"
 
-#include "netconfig.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
 
-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)
+
+void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
 {
-/*
-	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)
@@ -113,24 +114,19 @@ void ParseRoomAlias(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePo
 */
 }
 
-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);
 }
 
 
@@ -140,53 +136,13 @@ 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;
 }
 
-int is_recipient(OneRoomNetCfg *RNCfg, const char *Name)
-{
-	const RoomNetCfg RecipientCfgs[] = {
-		listrecp,
-		digestrecp,
-		participate,
-		maxRoomNetCfg
-	};
-	int i;
-	RoomNetCfgLine *nptr;
-	size_t len;
-	
-	len = strlen(Name);
-	i = 0;
-	while (RecipientCfgs[i] != maxRoomNetCfg)
-	{
-		nptr = RNCfg->NetConfigs[RecipientCfgs[i]];
-		
-		while (nptr != NULL)
-		{
-			if ((StrLength(nptr->Value) == len) && 
-			    (!strcmp(Name, ChrPtr(nptr->Value))))
-			{
-				return 1;
-			}
-			nptr = nptr->next;
-		}
-	}
-	return 0;
-}
+
 
 
 /*
@@ -196,66 +152,88 @@ void network_spoolout_room(RoomProcList *room_to_spool,
 			   HashList *working_ignetcfg,
 			   HashList *the_netmap)
 {
+	struct CitContext *CCC = CC;
 	char buf[SIZ];
-	char filename[PATH_MAX];
-	SpoolControl *sc;
+	SpoolControl sc;
 	int i;
 
+	memset(&sc, 0, sizeof(SpoolControl));
+	sc.RNCfg = room_to_spool->OneRNCfg;
+	sc.lastsent = room_to_spool->OneRNCfg->lastsent;
+	sc.working_ignetcfg = working_ignetcfg;
+	sc.the_netmap = the_netmap;
+
+	if ((sc.RNCfg->NetConfigs[listrecp] == NULL) && 
+	    (sc.RNCfg->NetConfigs[digestrecp] == NULL) && 
+	    (sc.RNCfg->NetConfigs[participate] == NULL) && 
+	    (sc.RNCfg->NetConfigs[ignet_push_share] == NULL))
+	{
+		/* nothing to do for this room... */
+		return;
+	}
+
 	/*
 	 * 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(&CCC->room, room_to_spool->name) != 0) {
 		syslog(LOG_CRIT, "ERROR: cannot load <%s>\n", room_to_spool->name);
 		return;
 	}
 
-	assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
-	begin_critical_section(S_NETCONFIGS);
-
-	/* Only do net processing for rooms that have netconfigs */
-	if (!read_spoolcontrol_file(&sc, filename))
-	{
-		end_critical_section(S_NETCONFIGS);
-		return;
-	}
-	syslog(LOG_INFO, "Networking started for <%s>\n", CC->room.QRname);
-
-	sc->working_ignetcfg = working_ignetcfg;
-	sc->the_netmap = the_netmap;
+	
+	syslog(LOG_INFO, "Networking started for <%s>\n", CCC->room.QRname);
 
 	/* 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");
+	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->RNCfg->lastsent, NULL, NULL, NULL,
-		network_spool_msg, sc);
+	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.RNCfg->Sender) > 0)
+	{
+		long len;
+		len = StrLength(sc.RNCfg->Sender);
+		if (len + 1 > sizeof(buf))
+			len = sizeof(buf) - 1;
+		memcpy(buf, ChrPtr(sc.RNCfg->Sender), 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,	" -----------------------------------"
-					"------------------------------------"
-					"-------\n"
-					"You are subscribed to the '%s' "
-					"list.\n"
-					"To post to the list: %s\n",
-					CC->room.QRname, buf
+	if (sc.digestfp != NULL) {
+		fprintf(sc.digestfp,
+			" -----------------------------------"
+			"------------------------------------"
+			"-------\n"
+			"You are subscribed to the '%s' "
+			"list.\n"
+			"To post to the list: %s\n",
+			CCC->room.QRname, buf
 		);
-		network_deliver_digest(sc);	/* deliver and close */
+		network_deliver_digest(&sc);	/* deliver and close */
 	}
 
 	/* Now rewrite the config file */
-	//// todo writenfree_spoolcontrol_file(&sc, filename);
+	if (sc.lastsent != room_to_spool->OneRNCfg->lastsent)
+	{
+		room_to_spool->OneRNCfg->lastsent = sc.lastsent;
+		room_to_spool->OneRNCfg->changed = 1;
+	}
 	end_critical_section(S_NETCONFIGS);
 }
 
@@ -313,11 +291,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) {
@@ -389,10 +367,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
@@ -545,9 +523,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
@@ -567,8 +548,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",
@@ -583,6 +616,7 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n
 	}
 
 	closedir(dp);
+	free(d);
 }
 
 /*
@@ -606,6 +640,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);
@@ -625,21 +661,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... */
 
@@ -673,7 +709,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",
@@ -685,7 +721,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) {
@@ -694,7 +730,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;				
 			}
 			
@@ -714,7 +750,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;
 			}
 
@@ -748,7 +784,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);
@@ -774,22 +810,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;
@@ -814,11 +849,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);
@@ -861,14 +896,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);