X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fnetconfig.c;h=682d4e05acb301b59eb54a3293862e508743cb38;hb=66f09fdd7c3f58e13ed01431dd5148302327ca6e;hp=916835e53465f53f98b6f281674197ce1067e4ad;hpb=4fe4a42959a6634f59cf6f45c58a07da5b29cd45;p=citadel.git

diff --git a/citadel/netconfig.c b/citadel/netconfig.c
index 916835e53..682d4e05a 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;
@@ -145,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)
@@ -383,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)
 {
@@ -571,7 +576,6 @@ const ConstStr ForceAliases[nForceAliases] = {
 	{HKEY("postmaster,")},
 	{HKEY("abuse,")}
 };
-
 void cmd_snet(char *argbuf)
 {
 	struct CitContext *CCC = CC;
@@ -714,7 +718,6 @@ void cmd_snet(char *argbuf)
 		RNCfg = CtdlGetNetCfgForRoom(CCC->room.QRnumber);
 		if (RNCfg != NULL)
 		{
-			FreeRoomNetworkStructContent(RNCfg);
 			ReadRoomNetConfigFile(&RNCfg, filename);
 		}
 		else
@@ -722,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);
 }
@@ -921,7 +926,8 @@ void cmd_netp(char *cmdbuf)
 		CtdlAideFPMessage(
 			err_buf,
 			"IGNet Networking.",
-			2, strs, (long*) &lens);
+			2, strs, (long*) &lens,
+			time(NULL));
 
 		DeleteHash(&working_ignetcfg);
 		FreeStrBuf(&NodeStr);
@@ -946,7 +952,9 @@ void cmd_netp(char *cmdbuf)
 		CtdlAideFPMessage(
 			err_buf,
 			"IGNet Networking.",
-			2, strs, (long*) &lens);
+			2, strs,
+			(long*) &lens,
+			time(NULL));
 
 		DeleteHash(&working_ignetcfg);
 		FreeStrBuf(&NodeStr);