X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;h=1d843b46116d072f9b44f172df4689c1c5abf19a;hb=7c94d5bb68f1c448770d31205ec5ae12bd8a02ed;hp=aeaab4cad5105184532cdff357415f0febc25d23;hpb=dd2755182e2edca1254c956c10c153841868393a;p=citadel.git

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index aeaab4cad..1d843b461 100644
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.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-2015 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
@@ -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"
@@ -88,7 +87,6 @@ extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval);
 
 typedef struct __roomlists {
 	RoomProcList *rplist;
-	HashList *RoomsInterestedIn;
 }roomlists;
 /*
  * When we do network processing, it's accomplished in two passes; one to
@@ -98,59 +96,6 @@ typedef struct __roomlists {
 struct RoomProcList *rplist = NULL;
 
 
-
-/*
- * 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)
-{
-	struct CitContext *CCC = CC;
-	char msgid[SIZ];
-	struct cdbdata *cdbut;
-	struct UseTable ut;
-
-	/* Bail out if we can't generate a message ID */
-	if (msg == NULL) {
-		return(0);
-	}
-	if (msg->cm_fields['I'] == NULL) {
-		return(0);
-	}
-	if (IsEmptyStr(msg->cm_fields['I'])) {
-		return(0);
-	}
-
-	/* Generate the message ID */
-	strcpy(msgid, msg->cm_fields['I']);
-	if (haschar(msgid, '@') == 0) {
-		strcat(msgid, "@");
-		if (msg->cm_fields['N'] != NULL) {
-			strcat(msgid, msg->cm_fields['N']);
-		}
-		else {
-			return(0);
-		}
-	}
-
-	cdbut = cdb_fetch(CDB_USETABLE, msgid, strlen(msgid));
-	if (cdbut != NULL) {
-		cdb_free(cdbut);
-		QN_syslog(LOG_DEBUG, "network_usetable() : we already have %s\n", msgid);
-		return(1);
-	}
-
-	/* If we got to this point, it's unique: add it. */
-	strcpy(ut.ut_msgid, msgid);
-	ut.ut_timestamp = time(NULL);
-	cdb_store(CDB_USETABLE, msgid, strlen(msgid), &ut, sizeof(struct UseTable) );
-	return(0);
-}
-
-
-
 /*
  * Send the *entire* contents of the current room to one specific network node,
  * ignoring anything we know about which messages have already undergone
@@ -159,24 +104,25 @@ int network_usetable(struct CtdlMessage *msg)
 int network_sync_to(char *target_node, long len)
 {
 	struct CitContext *CCC = CC;
-	const OneRoomNetCfg *OneRNCFG;
+	OneRoomNetCfg OneRNCFG;
+	OneRoomNetCfg *pRNCFG;
 	const RoomNetCfgLine *pCfgLine;
 	SpoolControl sc;
 	int num_spooled = 0;
 
 	/* Grab the configuration line we're looking for */
 	begin_critical_section(S_NETCONFIGS);
-	OneRNCFG = CtdlGetNetCfgForRoom(CCC->room.QRnumber);
-	if ((OneRNCFG == NULL) ||
-	    (OneRNCFG->NetConfigs[ignet_push_share] == NULL))
+	pRNCFG = CtdlGetNetCfgForRoom(CCC->room.QRnumber);
+	if ((pRNCFG == NULL) ||
+	    (pRNCFG->NetConfigs[ignet_push_share] == NULL))
 	{
 		return -1;
 	}
 
-	pCfgLine = OneRNCFG->NetConfigs[ignet_push_share];
+	pCfgLine = pRNCFG->NetConfigs[ignet_push_share];
 	while (pCfgLine != NULL)
 	{
-		if (strcmp(ChrPtr(pCfgLine->Value[0]), target_node))
+		if (!strcmp(ChrPtr(pCfgLine->Value[0]), target_node))
 			break;
 		pCfgLine = pCfgLine->next;
 	}
@@ -184,9 +130,25 @@ int network_sync_to(char *target_node, long len)
 	{
 		return -1;
 	}
-	memset(&sc, 0, sizeof(SpoolControl));
 
-	sc.NetConfigs[ignet_push_share] = DuplicateOneGenericCfgLine(pCfgLine);
+	memset(&sc, 0, sizeof(SpoolControl));
+	memset(&OneRNCFG, 0, sizeof(OneRoomNetCfg));
+	sc.RNCfg = &OneRNCFG;
+	sc.RNCfg->NetConfigs[ignet_push_share] = DuplicateOneGenericCfgLine(pCfgLine);
+	sc.Users[ignet_push_share] = NewStrBufPlain(NULL,
+						    StrLength(pCfgLine->Value[0]) +
+						    StrLength(pCfgLine->Value[1]) + 10);
+	StrBufAppendBuf(sc.Users[ignet_push_share], 
+			pCfgLine->Value[0],
+			0);
+	StrBufAppendBufPlain(sc.Users[ignet_push_share], 
+			     HKEY(","),
+			     0);
+
+	StrBufAppendBuf(sc.Users[ignet_push_share], 
+			pCfgLine->Value[1],
+			0);
+	CalcListID(&sc);
 
 	end_critical_section(S_NETCONFIGS);
 
@@ -198,10 +160,11 @@ int network_sync_to(char *target_node, long len)
 		network_spool_msg, &sc);
 
 	/* Concise cleanup because we know there's only one node in the sc */
-	DeleteGenericCfgLine(NULL/*TODO*/, &sc.NetConfigs[ignet_push_share]);
+	DeleteGenericCfgLine(NULL/*TODO*/, &sc.RNCfg->NetConfigs[ignet_push_share]);
 
 	DeleteHash(&sc.working_ignetcfg);
 	DeleteHash(&sc.the_netmap);
+	free_spoolcontrol_struct_members(&sc);
 
 	QN_syslog(LOG_NOTICE, "Synchronized %d messages to <%s>\n",
 		  num_spooled, target_node);
@@ -230,7 +193,7 @@ void cmd_nsyn(char *argbuf) {
 	}
 }
 
-RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, const OneRoomNetCfg *OneRNCFG)
+RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *OneRNCFG)
 {
 	int i;
 	struct RoomProcList *ptr;
@@ -253,22 +216,29 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, const OneRoomNetCf
 
 	ptr->lcname[ptr->namelen] = '\0';
 	ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345);
-	ptr->OneRNCFG = OneRNCFG;
+	ptr->lastsent = OneRNCFG->lastsent;
+	ptr->OneRNCfg = OneRNCFG;
 	return ptr;
 }
 
 /*
  * Batch up and send all outbound traffic from the current room
  */
-void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, const OneRoomNetCfg *OneRNCfg)
+void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneRNCfg)
 {
 	struct RoomProcList *ptr;
 	roomlists *RP = (roomlists*) data;
 
+	if (!HaveSpoolConfig(OneRNCfg))
+		return;
+
 	ptr = CreateRoomProcListEntry(qrbuf, OneRNCfg);
 
-	ptr->next = RP->rplist;
-	RP->rplist = ptr;
+	if (ptr != NULL)
+	{
+		ptr->next = RP->rplist;
+		RP->rplist = ptr;
+	}
 }
 
 /*
@@ -277,7 +247,7 @@ void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, const O
 int network_room_handler (struct ctdlroom *qrbuf)
 {
 	struct RoomProcList *ptr;
-	const OneRoomNetCfg* RNCfg;
+	OneRoomNetCfg* RNCfg;
 
 	if (qrbuf->QRdefaultview == VIEW_QUEUE)
 		return 1;
@@ -286,10 +256,14 @@ int network_room_handler (struct ctdlroom *qrbuf)
 	if (RNCfg == NULL)
 		return 1;
 
+	if (!HaveSpoolConfig(RNCfg))
+		return 1;
+
 	ptr = CreateRoomProcListEntry(qrbuf, RNCfg);
 	if (ptr == NULL)
 		return 1;
 
+	ptr->OneRNCfg = NULL;
 	begin_critical_section(S_RPLIST);
 	ptr->next = rplist;
 	rplist = ptr;
@@ -318,120 +292,6 @@ void destroy_network_queue_room_locked (void)
 }
 
 
-
-/*
- * Bounce a message back to the sender
- */
-void network_bounce(struct CtdlMessage *msg, char *reason)
-{
-	struct CitContext *CCC = CC;
-	char *oldpath = NULL;
-	char buf[SIZ];
-	char bouncesource[SIZ];
-	char recipient[SIZ];
-	struct recptypes *valid = NULL;
-	char force_room[ROOMNAMELEN];
-	static int serialnum = 0;
-	size_t size;
-
-	QNM_syslog(LOG_DEBUG, "entering network_bounce()\n");
-
-	if (msg == NULL) return;
-
-	snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, config.c_nodename);
-
-	/* 
-	 * Give it a fresh message ID
-	 */
-	if (msg->cm_fields['I'] != NULL) {
-		free(msg->cm_fields['I']);
-	}
-	snprintf(buf, sizeof buf, "%ld.%04lx.%04x@%s",
-		(long)time(NULL), (long)getpid(), ++serialnum, config.c_fqdn);
-	msg->cm_fields['I'] = strdup(buf);
-
-	/*
-	 * FIXME ... right now we're just sending a bounce; we really want to
-	 * include the text of the bounced message.
-	 */
-	if (msg->cm_fields['M'] != NULL) {
-		free(msg->cm_fields['M']);
-	}
-	msg->cm_fields['M'] = strdup(reason);
-	msg->cm_format_type = 0;
-
-	/*
-	 * Turn the message around
-	 */
-	if (msg->cm_fields['R'] == NULL) {
-		free(msg->cm_fields['R']);
-	}
-
-	if (msg->cm_fields['D'] == NULL) {
-		free(msg->cm_fields['D']);
-	}
-
-	snprintf(recipient, sizeof recipient, "%s@%s",
-		msg->cm_fields['A'], msg->cm_fields['N']);
-
-	if (msg->cm_fields['A'] == NULL) {
-		free(msg->cm_fields['A']);
-	}
-
-	if (msg->cm_fields['N'] == NULL) {
-		free(msg->cm_fields['N']);
-	}
-
-	if (msg->cm_fields['U'] == NULL) {
-		free(msg->cm_fields['U']);
-	}
-
-	msg->cm_fields['A'] = strdup(BOUNCESOURCE);
-	msg->cm_fields['N'] = strdup(config.c_nodename);
-	msg->cm_fields['U'] = strdup("Delivery Status Notification (Failure)");
-
-	/* 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);
-
-	/* 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, config.c_aideroom);
-	}
-	else {
-		strcpy(force_room, "");
-	}
-	if ( (valid == NULL) && IsEmptyStr(force_room) ) {
-		strcpy(force_room, config.c_aideroom);
-	}
-	CtdlSubmitMsg(msg, valid, force_room, 0);
-
-	/* Clean up */
-	if (valid != NULL) free_recipients(valid);
-	CtdlFreeMessage(msg);
-	QNM_syslog(LOG_DEBUG, "leaving network_bounce()\n");
-}
-
-
-
-
-
-
-
 /*
  * network_do_queue()
  * 
@@ -440,36 +300,27 @@ void network_bounce(struct CtdlMessage *msg, char *reason)
 void network_do_queue(void)
 {
 	struct CitContext *CCC = CC;
-	static int doing_queue = 0;
 	static time_t last_run = 0L;
 	int full_processing = 1;
 	HashList *working_ignetcfg;
 	HashList *the_netmap = NULL;
 	int netmap_changed = 0;
 	roomlists RL;
+	SpoolControl *sc = NULL;
+	SpoolControl *pSC;
 
 	/*
 	 * Run the full set of processing tasks no more frequently
 	 * than once every n seconds
 	 */
-	if ( (time(NULL) - last_run) < config.c_net_freq ) {
+	if ( (time(NULL) - last_run) < CtdlGetConfigLong("c_net_freq") )
+	{
 		full_processing = 0;
 		syslog(LOG_DEBUG, "Network full processing in %ld seconds.\n",
-		       config.c_net_freq - (time(NULL)- last_run)
+		       CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run)
 		);
 	}
 
-	/*
-	 * This is a simple concurrency check to make sure only one queue run
-	 * is done at a time.  We could do this with a mutex, but since we
-	 * don't really require extremely fine granularity here, we'll do it
-	 * with a static variable instead.
-	 */
-	if (doing_queue) {
-		return;
-	}
-	doing_queue = 1;
-
 	become_session(&networker_spool_CC);
 	begin_critical_section(S_RPLIST);
 	RL.rplist = rplist;
@@ -484,8 +335,12 @@ void network_do_queue(void)
 	 */
 	if (!server_shutting_down)
 		the_netmap = CtdlReadNetworkMap();
+#if 0
+	/* filterlist isn't supported anymore
 	if (!server_shutting_down)
 		load_network_filter_list();
+	*/
+#endif
 
 	/* 
 	 * Go ahead and run the queue
@@ -502,7 +357,7 @@ void network_do_queue(void)
 		while (ptr != NULL && !server_shutting_down) {
 			
 			cmp = ptr->next;
-
+			/* filter duplicates from the list... */
 			while (cmp != NULL) {
 				if ((cmp->namelen > 0) &&
 				    (cmp->key == ptr->key) &&
@@ -515,14 +370,30 @@ void network_do_queue(void)
 			}
 
 			if (ptr->namelen > 0) {
-				network_spoolout_room(ptr, 
-						      working_ignetcfg,
-						      the_netmap);
+				InspectQueuedRoom(&sc,
+						  ptr, 
+						  working_ignetcfg,
+						  the_netmap);
 			}
 			ptr = ptr->next;
 		}
 	}
 
+
+	pSC = sc;
+	while (pSC != NULL)
+	{
+		network_spoolout_room(pSC);
+		pSC = pSC->next;
+	}
+
+	pSC = sc;
+	while (pSC != NULL)
+	{
+		sc = pSC->next;
+		free_spoolcontrol_struct(&pSC);
+		pSC = sc;
+	}
 	/* If there is anything in the inbound queue, process it */
 	if (!server_shutting_down) {
 		network_do_spoolin(working_ignetcfg, 
@@ -536,7 +407,9 @@ void network_do_queue(void)
 	/* Save the network map back to disk */
 	if (netmap_changed) {
 		StrBuf *MapStr = CtdlSerializeNetworkMap(the_netmap);
-		CtdlPutSysConfig(IGNETMAP, SmashStrBuf(&MapStr));
+		char *pMapStr = SmashStrBuf(&MapStr);
+		CtdlPutSysConfig(IGNETMAP, pMapStr);
+		free(pMapStr);
 	}
 
 	/* combine singe message files into one spool entry per remote node. */
@@ -553,9 +426,9 @@ void network_do_queue(void)
 	if (full_processing) {
 		last_run = time(NULL);
 	}
-	DeleteHash(&RL.RoomsInterestedIn);
 	destroy_network_queue_room(RL.rplist);
-	doing_queue = 0;
+	SaveChangedConfigs();
+
 }
 
 
@@ -588,6 +461,80 @@ void network_cleanup_function(void)
 }
 
 
+int ignet_aftersave(struct CtdlMessage *msg,
+		    recptypes *recps)	/* recipients (if mail) */
+{
+	/* For IGnet mail, we have to save a new copy into the spooler for
+	 * each recipient, with the R and D fields set to the recipient and
+	 * destination-node.  This has two ugly side effects: all other
+	 * recipients end up being unlisted in this recipient's copy of the
+	 * message, and it has to deliver multiple messages to the same
+	 * node.  We'll revisit this again in a year or so when everyone has
+	 * a network spool receiver that can handle the new style messages.
+	 */
+	if ((recps != NULL) && (recps->num_ignet > 0))
+	{
+		char *recipient;
+		int rv = 0;
+		struct ser_ret smr;
+		FILE *network_fp = NULL;
+		char submit_filename[128];
+		static int seqnum = 1;
+		int i;
+		char *hold_R, *hold_D, *RBuf, *DBuf;
+		long hrlen, hdlen, rblen, dblen, count, rlen;
+		CitContext *CCC = MyContext();
+
+		CM_GetAsField(msg, eRecipient, &hold_R, &hrlen);;
+		CM_GetAsField(msg, eDestination, &hold_D, &hdlen);;
+
+		count = num_tokens(recps->recp_ignet, '|');
+		rlen = strlen(recps->recp_ignet);
+		recipient = malloc(rlen + 1);
+		RBuf = malloc(rlen + 1);
+		DBuf = malloc(rlen + 1);
+		for (i=0; i<count; ++i) {
+			extract_token(recipient, recps->recp_ignet, i,
+				      '|', rlen + 1);
+
+			rblen = extract_token(RBuf, recipient, 0, '@', rlen + 1);
+			dblen = extract_token(DBuf, recipient, 1, '@', rlen + 1);
+		
+			CM_SetAsField(msg, eRecipient, &RBuf, rblen);;
+			CM_SetAsField(msg, eDestination, &DBuf, dblen);;
+			CtdlSerializeMessage(&smr, msg);
+			if (smr.len > 0) {
+				snprintf(submit_filename, sizeof submit_filename,
+					 "%s/netmail.%04lx.%04x.%04x",
+					 ctdl_netin_dir,
+					 (long) getpid(),
+					 CCC->cs_pid,
+					 ++seqnum);
+
+				network_fp = fopen(submit_filename, "wb+");
+				if (network_fp != NULL) {
+					rv = fwrite(smr.ser, smr.len, 1, network_fp);
+					if (rv == -1) {
+						MSG_syslog(LOG_EMERG, "CtdlSubmitMsg(): Couldn't write network spool file: %s\n",
+							   strerror(errno));
+					}
+					fclose(network_fp);
+				}
+				free(smr.ser);
+			}
+			CM_GetAsField(msg, eRecipient, &RBuf, &rblen);;
+			CM_GetAsField(msg, eDestination, &DBuf, &dblen);;
+		}
+		free(RBuf);
+		free(DBuf);
+		free(recipient);
+		CM_SetAsField(msg, eRecipient, &hold_R, hrlen);
+		CM_SetAsField(msg, eDestination, &hold_D, hdlen);
+		return 1;
+	}
+	return 0;
+}
+
 /*
  * Module entry point
  */
@@ -601,6 +548,8 @@ CTDL_MODULE_INIT(network)
 {
 	if (!threading)
 	{
+		CtdlRegisterMessageHook(ignet_aftersave, EVT_AFTERSAVE);
+
 		CtdlFillSystemContext(&networker_spool_CC, "CitNetSpool");
 		CtdlRegisterDebugFlagHook(HKEY("networkqueue"), SetNetQDebugEnabled, &NetQDebugEnabled);
 		CtdlRegisterSessionHook(network_cleanup_function, EVT_STOP, PRIO_STOP + 30);