X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fnetconfig.c;h=f09c852fd32a3786ac5cc1f15c35c4e6fcbde087;hb=0d309c3f9280c215677530e59f68c8c149fd65ce;hp=41aeae6a6d00431df3e0d23370bf8b1f91a505d0;hpb=ace3b2c330af622a0f0a79edd369fca8e13a71a2;p=citadel.git

diff --git a/citadel/netconfig.c b/citadel/netconfig.c
index 41aeae6a6..f09c852fd 100644
--- a/citadel/netconfig.c
+++ b/citadel/netconfig.c
@@ -29,9 +29,10 @@
 #include <libcitadel.h>
 
 #include "include/ctdl_module.h"
-
+#include "serv_extensions.h"
 
 void vFreeRoomNetworkStruct(void *vOneRoomNetCfg);
+void FreeRoomNetworkStructContent(OneRoomNetCfg *OneRNCfg);
 
 HashList *CfgTypeHash = NULL;
 HashList *RoomConfigs = NULL;
@@ -132,7 +133,10 @@ void DeleteGenericCfgLine(const CfgLineType *ThisOne, RoomNetCfgLine **data)
 {
 	int i;
 
-	for (i = 0; i < ThisOne->nSegments; i++)
+	if (*data == NULL)
+		return;
+
+	for (i = 0; i < (*data)->nValues; i++)
 	{
 		FreeStrBuf(&(*data)->Value[i]);
 	}
@@ -142,16 +146,19 @@ void DeleteGenericCfgLine(const CfgLineType *ThisOne, RoomNetCfgLine **data)
 }
 RoomNetCfgLine *DuplicateOneGenericCfgLine(const RoomNetCfgLine *data)
 {
+	int i;
 	RoomNetCfgLine *NewData;
 
 	NewData = (RoomNetCfgLine*)malloc(sizeof(RoomNetCfgLine));
-	int i;
+	memset(NewData, 0, sizeof(RoomNetCfgLine));
 	NewData->Value = (StrBuf **)malloc(sizeof(StrBuf*) * data->nValues);
+	memset(NewData->Value, 0, sizeof(StrBuf*) * data->nValues);
 
 	for (i = 0; i < data->nValues; i++)
 	{
 		NewData->Value[i] = NewStrBufDup(data->Value[i]);
 	}
+	NewData->nValues = data->nValues;
 	return NewData;
 }
 int ReadRoomNetConfigFile(OneRoomNetCfg **pOneRNCfg, char *filename)
@@ -162,7 +169,7 @@ int ReadRoomNetConfigFile(OneRoomNetCfg **pOneRNCfg, char *filename)
 	const CfgLineType *pCfg;
 	StrBuf *Line;
 	StrBuf *InStr;
-	OneRoomNetCfg *OneRNCfg;
+	OneRoomNetCfg *OneRNCfg = NULL;
 
 	fd = open(filename, O_NONBLOCK|O_RDONLY);
 	if (fd == -1) {
@@ -170,18 +177,21 @@ int ReadRoomNetConfigFile(OneRoomNetCfg **pOneRNCfg, char *filename)
 		return 0;
 	}
 	if (*pOneRNCfg != NULL)
+	{
 		OneRNCfg = *pOneRNCfg;
+		FreeRoomNetworkStructContent (OneRNCfg);
+	}
 	else
 		OneRNCfg = malloc(sizeof(OneRoomNetCfg));
 	memset(OneRNCfg, 0, sizeof(OneRoomNetCfg));
 	*pOneRNCfg = OneRNCfg;
 	Line = NewStrBuf();
+	InStr = NewStrBuf();
 
 	while (StrBufTCP_read_line(Line, &fd, 0, &ErrStr) >= 0) {
 		if (StrLength(Line) == 0)
 			continue;
 		Pos = NULL;
-		InStr = NewStrBufPlain(NULL, StrLength(Line));
 		StrBufExtract_NextToken(InStr, Line, &Pos, '|');
 
 		pCfg = GetCfgTypeByStr(SKEY(InStr));
@@ -357,11 +367,18 @@ void FreeRoomNetworkStructContent(OneRoomNetCfg *OneRNCfg)
 		RoomNetCfgLine *pNext, *pName;
 		
 		pCfg = GetCfgTypeByEnum(eCfg, CfgIt);
-		pName= OneRNCfg->NetConfigs[pCfg->C];
+		pName= OneRNCfg->NetConfigs[eCfg];
 		while (pName != NULL)
 		{
 			pNext = pName->next;
-			pCfg->DeAllocator(pCfg, &pName);
+			if (pCfg != NULL)
+			{
+				pCfg->DeAllocator(pCfg, &pName);
+			}
+			else
+			{
+				DeleteGenericCfgLine(NULL, &pName);
+			}
 			pName = pNext;
 		}
 	}
@@ -370,6 +387,7 @@ void FreeRoomNetworkStructContent(OneRoomNetCfg *OneRNCfg)
 	FreeStrBuf(&OneRNCfg->Sender);
 	FreeStrBuf(&OneRNCfg->RoomInfo);
 	FreeStrBuf(&OneRNCfg->misc);
+	memset(OneRNCfg, 0, sizeof(OneRoomNetCfg));
 }
 void vFreeRoomNetworkStruct(void *vOneRoomNetCfg)
 {
@@ -558,7 +576,6 @@ const ConstStr ForceAliases[nForceAliases] = {
 	{HKEY("postmaster,")},
 	{HKEY("abuse,")}
 };
-
 void cmd_snet(char *argbuf)
 {
 	struct CitContext *CCC = CC;
@@ -701,7 +718,6 @@ void cmd_snet(char *argbuf)
 		RNCfg = CtdlGetNetCfgForRoom(CCC->room.QRnumber);
 		if (RNCfg != NULL)
 		{
-			FreeRoomNetworkStructContent(RNCfg);
 			ReadRoomNetConfigFile(&RNCfg, filename);
 		}
 		else
@@ -709,6 +725,8 @@ void cmd_snet(char *argbuf)
 			ReadRoomNetConfigFile(&RNCfg, filename);
 			Put(RoomConfigs, LKEY(CCC->room.QRnumber), RNCfg, vFreeRoomNetworkStruct);
 		}
+
+		PerformRoomHooks(&CCC->room);
 	}
 	end_critical_section(S_NETCONFIGS);
 }
@@ -821,6 +839,7 @@ int is_recipient(OneRoomNetCfg *RNCfg, const char *Name)
 			}
 			nptr = nptr->next;
 		}
+		i++;
 	}
 	return 0;
 }
@@ -833,7 +852,6 @@ int CtdlNetconfigCheckRoomaccess(
 	const char* RemoteIdentifier)
 {
 	OneRoomNetCfg *RNCfg;
-	char filename[SIZ];
 	int found;
 
 	if (RemoteIdentifier == NULL)
@@ -842,18 +860,18 @@ int CtdlNetconfigCheckRoomaccess(
 		return (ERROR + USERNAME_REQUIRED);
 	}
 
-	assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
 	begin_critical_section(S_NETCONFIGS);
-	if (!ReadRoomNetConfigFile(&RNCfg, filename))
+	RNCfg = CtdlGetNetCfgForRoom (CC->room.QRnumber);
+	if (RNCfg == NULL)
 	{
 		end_critical_section(S_NETCONFIGS);
 		snprintf(errmsgbuf, n,
 			 "This mailing list only accepts posts from subscribers.");
 		return (ERROR + NO_SUCH_USER);
 	}
-	end_critical_section(S_NETCONFIGS);
 	found = is_recipient (RNCfg, RemoteIdentifier);
-	vFreeRoomNetworkStruct(&RNCfg);
+	end_critical_section(S_NETCONFIGS);
+
 	if (found) {
 		return (0);
 	}
@@ -909,7 +927,9 @@ void cmd_netp(char *cmdbuf)
 		CtdlAideFPMessage(
 			err_buf,
 			"IGNet Networking.",
-			2, strs, (long*) &lens);
+			2, strs, (long*) &lens,
+			CCC->cs_pid, 0,
+			time(NULL));
 
 		DeleteHash(&working_ignetcfg);
 		FreeStrBuf(&NodeStr);
@@ -934,7 +954,10 @@ void cmd_netp(char *cmdbuf)
 		CtdlAideFPMessage(
 			err_buf,
 			"IGNet Networking.",
-			2, strs, (long*) &lens);
+			2, strs,
+			(long*) &lens,
+			CCC->cs_pid, 0,
+			time(NULL));
 
 		DeleteHash(&working_ignetcfg);
 		FreeStrBuf(&NodeStr);
@@ -1151,11 +1174,11 @@ void destroy_network_cfgs(void)
 	HashList *pCfgTypeHash = CfgTypeHash;
 	HashList *pRoomConfigs = RoomConfigs;
 
-	CfgTypeHash = NULL;
 	RoomConfigs = NULL;
-	
-	DeleteHash(&pCfgTypeHash);
 	DeleteHash(&pRoomConfigs);
+
+	CfgTypeHash = NULL;
+	DeleteHash(&pCfgTypeHash);
 }
 
 /*