X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;h=1f610f258f67f2bcb41ddc73d04b04f6a93a6f1c;hb=c71df26b9d35c07eb9c1322a7e83caa86337ad82;hp=819ec09ab93d71c74d0f49a390a1bcf5552621ea;hpb=323eca5f8455a707b7799bb6bfd36f6cac35aab6;p=citadel.git

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 819ec09ab..1f610f258 100644
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -1,8 +1,7 @@
 /*
- * This module handles shared rooms, inter-Citadel mail, and outbound
- * mailing list processing.
+ * This module handles network mail and mailing list processing.
  *
- * Copyright (c) 2000-2018 by the citadel.org team
+ * Copyright (c) 2000-2019 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.
@@ -78,8 +77,6 @@
 #include "netspool.h"
 #include "netmail.h"
 
-struct CitContext networker_spool_CC;
-
 /* comes from lookup3.c from libcitadel... */
 extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval);
 
@@ -95,98 +92,6 @@ typedef struct __roomlists {
  */
 struct RoomProcList *rplist = NULL;
 
-
-/*
- * Send the *entire* contents of the current room to one specific network node,
- * ignoring anything we know about which messages have already undergone
- * network processing.  This can be used to bring a new node into sync.
- */
-int network_sync_to(char *target_node, long len)
-{
-	struct CitContext *CCC = CC;
-	OneRoomNetCfg OneRNCFG;
-	OneRoomNetCfg *pRNCFG;
-	const RoomNetCfgLine *pCfgLine;
-	SpoolControl sc;
-	int num_spooled = 0;
-
-	/* Load the netconfig for this room */
-	pRNCFG = CtdlGetNetCfgForRoom(CCC->room.QRnumber);
-	if (pRNCFG == NULL) {					// no netconfig at all?
-		return -1;
-	}
-	if (pRNCFG->NetConfigs[ignet_push_share] == NULL)	// no ignet push shares?
-	{
-		FreeRoomNetworkStruct(&pRNCFG);
-		return -1;
-	}
-
-	/* Search for an ignet_oush_share configuration bearing the target node's name */
-	for (pCfgLine = pRNCFG->NetConfigs[ignet_push_share]; pCfgLine != NULL; pCfgLine = pCfgLine->next)
-	{
-		if (!strcmp(ChrPtr(pCfgLine->Value[0]), target_node))
-			break;
-	}
-
-	/* If we aren't sharing with that node, bail out */
-	if (pCfgLine == NULL)
-	{
-		FreeRoomNetworkStruct(&pRNCFG);
-		return -1;
-	}
-
-	/* If we got here, we're good to go ... make up a dummy spoolconfig and roll with it */
-
-	begin_critical_section(S_NETCONFIGS);
-	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);
-
-	sc.working_ignetcfg = CtdlLoadIgNetCfg();
-	sc.the_netmap = CtdlReadNetworkMap();
-
-	/* Send ALL messages */
-	num_spooled = CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL, network_spool_msg, &sc);
-
-	/* Concise cleanup because we know there's only one node in the sc */
-	DeleteGenericCfgLine(NULL, &sc.RNCfg->NetConfigs[ignet_push_share]);
-
-	DeleteHash(&sc.working_ignetcfg);
-	DeleteHash(&sc.the_netmap);
-	free_spoolcontrol_struct_members(&sc);
-
-	syslog(LOG_NOTICE, "network: synchronized %d messages to <%s>", num_spooled, target_node);
-	return(num_spooled);
-}
-
-
-/*
- * Implements the NSYN command
- */
-void cmd_nsyn(char *argbuf) {
-	int num_spooled;
-	long len;
-	char target_node[256];
-
-	if (CtdlAccessCheck(ac_aide)) return;
-
-	len = extract_token(target_node, argbuf, 0, '|', sizeof target_node);
-	num_spooled = network_sync_to(target_node, len);
-	if (num_spooled >= 0) {
-		cprintf("%d Spooled %d messages.\n", CIT_OK, num_spooled);
-	}
-	else {
-		cprintf("%d No such room/node share exists.\n", ERROR + ROOM_NOT_FOUND);
-	}
-}
-
 RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *OneRNCFG)
 {
 	int i;
@@ -320,7 +225,6 @@ void network_do_queue(void)
 		syslog(LOG_DEBUG, "network: full processing in %ld seconds.", CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run));
 	}
 
-	become_session(&networker_spool_CC);
 	begin_critical_section(S_RPLIST);
 	RL.rplist = rplist;
 	rplist = NULL;
@@ -410,44 +314,13 @@ void network_do_queue(void)
 }
 
 
-void network_logout_hook(void)
-{
-	CitContext *CCC = MyContext();
-
-	/*
-	 * If we were talking to a network node, we're not anymore...
-	 */
-	if (!IsEmptyStr(CCC->net_node)) {
-		CtdlNetworkTalkingTo(CCC->net_node, strlen(CCC->net_node), NTT_REMOVE);
-		CCC->net_node[0] = '\0';
-	}
-}
-
-
-void network_cleanup_function(void)
-{
-	struct CitContext *CCC = CC;
-
-	if (!IsEmptyStr(CCC->net_node)) {
-		CtdlNetworkTalkingTo(CCC->net_node, strlen(CCC->net_node), NTT_REMOVE);
-		CCC->net_node[0] = '\0';
-	}
-}
-
-
 /*
  * Module entry point
  */
-
-
 CTDL_MODULE_INIT(network)
 {
 	if (!threading)
 	{
-		CtdlFillSystemContext(&networker_spool_CC, "CitNetSpool");
-		CtdlRegisterSessionHook(network_cleanup_function, EVT_STOP, PRIO_STOP + 30);
-                CtdlRegisterSessionHook(network_logout_hook, EVT_LOGOUT, PRIO_LOGOUT + 10);
-		CtdlRegisterProtoHook(cmd_nsyn, "NSYN", "Synchronize room to node");
 		CtdlRegisterRoomHook(network_room_handler);
 		CtdlRegisterCleanupHook(destroy_network_queue_room_locked);
 		CtdlRegisterSessionHook(network_do_queue, EVT_TIMER, PRIO_QUEUE + 10);