X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;h=254a01a28c46c748a543cdc4f23cbcf815c59277;hb=0388d17d6745c6c17bd8e5399b4188d9934e1115;hp=f65dda3e496fd4bdc4076e78eabb077602956981;hpb=b160dd583e9165da4689e1a09cd4d675dedb6ca4;p=citadel.git

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index f65dda3e4..254a01a28 100644
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -106,45 +106,40 @@ struct RoomProcList *rplist = NULL;
  */
 int network_usetable(struct CtdlMessage *msg)
 {
+	StrBuf *msgid;
 	struct CitContext *CCC = CC;
-	char msgid[SIZ];
-	struct cdbdata *cdbut;
-	struct UseTable ut;
+	time_t now;
 
 	/* 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'])) {
+	if ((msg == NULL) || (msg->cm_fields['I'] == NULL) || (IsEmptyStr(msg->cm_fields['I'])))
+	{
 		return(0);
 	}
 
 	/* Generate the message ID */
-	strcpy(msgid, msg->cm_fields['I']);
-	if (haschar(msgid, '@') == 0) {
-		strcat(msgid, "@");
+	msgid = NewStrBufPlain(msg->cm_fields['I'], -1);
+	if (haschar(ChrPtr(msgid), '@') == 0) {
+		StrBufAppendBufPlain(msgid, HKEY("@"), 0);
 		if (msg->cm_fields['N'] != NULL) {
-			strcat(msgid, msg->cm_fields['N']);
+			StrBufAppendBufPlain(msgid, msg->cm_fields['N'], -1, 0);
 		}
 		else {
+			FreeStrBuf(&msgid);
 			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);
+	now = time(NULL);
+	if (CheckIfAlreadySeen("Networker Import",
+			       msgid,
+			       now, 0,
+			       eCheckUpdate,
+			       CCC->cs_pid, 0) != 0)
+	{
+		FreeStrBuf(&msgid);
 		return(1);
 	}
+	FreeStrBuf(&msgid);
 
-	/* 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);
 }
 
@@ -176,7 +171,7 @@ int network_sync_to(char *target_node, long len)
 	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,10 +179,25 @@ int network_sync_to(char *target_node, long len)
 	{
 		return -1;
 	}
+
 	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);
 
@@ -203,6 +213,7 @@ int network_sync_to(char *target_node, long len)
 
 	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);
@@ -254,6 +265,7 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *One
 
 	ptr->lcname[ptr->namelen] = '\0';
 	ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345);
+	ptr->lastsent = OneRNCFG->lastsent;
 	ptr->OneRNCfg = OneRNCFG;
 	return ptr;
 }
@@ -266,10 +278,16 @@ void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, OneRoom
 	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;
+	}
 }
 
 /*
@@ -287,10 +305,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;
@@ -429,10 +451,6 @@ void network_bounce(struct CtdlMessage *msg, char *reason)
 
 
 
-
-
-
-
 /*
  * network_do_queue()
  * 
@@ -447,6 +465,8 @@ void network_do_queue(void)
 	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
@@ -508,14 +528,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, 
@@ -529,7 +565,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. */