X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fnetconfig.c;h=ff60c1027ee3369eceb6e255eedf26bf1c82411c;hp=de180074baf612300e8e58d3306b6c47c848e5b6;hb=7a9b0685e406cc83597171cc39d008c7e5459ca8;hpb=7a65130ea2a5be56603233ba7b8d230691f604a0

diff --git a/citadel/netconfig.c b/citadel/netconfig.c
index de180074b..ff60c1027 100644
--- a/citadel/netconfig.c
+++ b/citadel/netconfig.c
@@ -34,153 +34,11 @@
 #include "serv_extensions.h"
 #include "config.h"
 
-void vFreeRoomNetworkStruct(void *vOneRoomNetCfg);
-void FreeRoomNetworkStructContent(OneRoomNetCfg *OneRNCfg);
-
-HashList *CfgTypeHash = NULL;
-
-/*-----------------------------------------------------------------------------*
- *                       Per room network configs                              *
- *-----------------------------------------------------------------------------*/
-
-
-void RegisterRoomCfgType(const char* Name, long len, RoomNetCfg eCfg, CfgLineParser p, int uniq,  int nSegments, CfgLineSerializer s, CfgLineDeAllocator d)
-{
-	CfgLineType *pCfg;
-
-	pCfg = (CfgLineType*) malloc(sizeof(CfgLineType));
-	pCfg->Parser = p;
-	pCfg->Serializer = s;
-	pCfg->DeAllocator = d;
-	pCfg->C = eCfg;
-	pCfg->Str.Key = Name;
-	pCfg->Str.len = len;
-	pCfg->IsSingleLine = uniq;
- 	pCfg->nSegments = nSegments;
-	if (CfgTypeHash == NULL) {
-		CfgTypeHash = NewHash(1, NULL);
-	}
-	Put(CfgTypeHash, Name, len, pCfg, NULL);
-}
-
-
-const CfgLineType *GetCfgTypeByStr(const char *Key, long len)
-{
-	void *pv;
-	
-	if (GetHash(CfgTypeHash, Key, len, &pv) && (pv != NULL))
-	{
-		return (const CfgLineType *) pv;
-	}
-	else
-	{
-		return NULL;
-	}
-}
-
-
-const CfgLineType *GetCfgTypeByEnum(RoomNetCfg eCfg, HashPos *It)
-{
-	const char *Key;
-	long len;
-	void *pv;
-	CfgLineType *pCfg;
-
-	RewindHashPos(CfgTypeHash, It, 1);
-	while (GetNextHashPos(CfgTypeHash, It, &len, &Key, &pv) && (pv != NULL))
-	{
-		pCfg = (CfgLineType*) pv;
-		if (pCfg->C == eCfg)
-			return pCfg;
-	}
-	return NULL;
-}
-
-
-void ParseGeneric(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCfg)
-{
-	RoomNetCfgLine *nptr;
-	int i;
-
-	nptr = (RoomNetCfgLine *)
-		malloc(sizeof(RoomNetCfgLine));
-	nptr->next = OneRNCfg->NetConfigs[ThisOne->C];
-	nptr->Value = malloc(sizeof(StrBuf*) * ThisOne->nSegments);
-	nptr->nValues = 0;
-	memset(nptr->Value, 0, sizeof(StrBuf*) * ThisOne->nSegments);
-	if (ThisOne->nSegments == 1)
-	{
-		nptr->Value[0] = NewStrBufPlain(LinePos, StrLength(Line) - ( LinePos - ChrPtr(Line)) );
-		nptr->nValues = 1;
-	}
-	else for (i = 0; i < ThisOne->nSegments; i++)
-	{
-		nptr->nValues++;
-		nptr->Value[i] = NewStrBufPlain(NULL, StrLength(Line) - ( LinePos - ChrPtr(Line)) );
-		StrBufExtract_NextToken(nptr->Value[i], Line, &LinePos, '|');
-	}
-
-	OneRNCfg->NetConfigs[ThisOne->C] = nptr;
-}
-
-
-void SerializeGeneric(const CfgLineType *ThisOne, StrBuf *OutputBuffer, OneRoomNetCfg *OneRNCfg, RoomNetCfgLine *data)
-{
-	int i;
-
-	StrBufAppendBufPlain(OutputBuffer, CKEY(ThisOne->Str), 0);
-	StrBufAppendBufPlain(OutputBuffer, HKEY("|"), 0);
-	for (i = 0; i < ThisOne->nSegments; i++)
-	{
-		StrBufAppendBuf(OutputBuffer, data->Value[i], 0);
-		if (i + 1 < ThisOne->nSegments)
-			StrBufAppendBufPlain(OutputBuffer, HKEY("|"), 0);
-	}
-	StrBufAppendBufPlain(OutputBuffer, HKEY("\n"), 0);
-}
-
-
-void DeleteGenericCfgLine(const CfgLineType *ThisOne, RoomNetCfgLine **data)
-{
-	int i;
-
-	if (*data == NULL)
-		return;
-
-	for (i = 0; i < (*data)->nValues; i++)
-	{
-		FreeStrBuf(&(*data)->Value[i]);
-	}
-	free ((*data)->Value);
-	free(*data);
-	*data = NULL;
-}
-
-
-RoomNetCfgLine *DuplicateOneGenericCfgLine(const RoomNetCfgLine *data)
-{
-	int i;
-	RoomNetCfgLine *NewData;
-
-	NewData = (RoomNetCfgLine*)malloc(sizeof(RoomNetCfgLine));
-	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;
-}
-
 
 /*
  * Create a config key for a room's netconfig entry
  */
-void netcfg_keyname(char *keybuf, long roomnum)
-{
+void netcfg_keyname(char *keybuf, long roomnum) {
 	if (!keybuf) return;
 	sprintf(keybuf, "c_netconfig_%010ld", roomnum);
 }
@@ -189,8 +47,7 @@ void netcfg_keyname(char *keybuf, long roomnum)
 /*
  * Given a room number and a textual netconfig, convert to base64 and write to the configdb
  */
-void write_netconfig_to_configdb(long roomnum, const char *raw_netconfig)
-{
+void write_netconfig_to_configdb(long roomnum, const char *raw_netconfig) {
 	char keyname[25];
 	char *enc;
 	int enc_len;
@@ -217,8 +74,7 @@ void write_netconfig_to_configdb(long roomnum, const char *raw_netconfig)
  * If it returns NULL, there is no netconfig.
  * Otherwise the caller owns the returned memory and is responsible for freeing it.
  */
-char *LoadRoomNetConfigFile(long roomnum)
-{
+char *LoadRoomNetConfigFile(long roomnum) {
 	char keyname[25];
 	char *encoded_netconfig = NULL;
 	char *decoded_netconfig = NULL;
@@ -233,199 +89,11 @@ char *LoadRoomNetConfigFile(long roomnum)
 }
 
 
-/*
- * Deserialize a netconfig , allocate and return structured data
- */
-OneRoomNetCfg *ParseRoomNetConfigFile(char *serialized_data)
-{
-	const char *Pos = NULL;
-	const CfgLineType *pCfg = NULL;
-	StrBuf *Line = NULL;
-	StrBuf *InStr = NULL;
-	StrBuf *Cfg = NULL;
-	OneRoomNetCfg *OneRNCfg = NULL;
-	int num_lines = 0;
-	int i = 0;
-
-	OneRNCfg = malloc(sizeof(OneRoomNetCfg));
-	memset(OneRNCfg, 0, sizeof(OneRoomNetCfg));
-
-	Line = NewStrBuf();
-	InStr = NewStrBuf();
-        Cfg = NewStrBufPlain(serialized_data, -1);
-	num_lines = num_tokens(ChrPtr(Cfg), '\n');
-
-	for (i=0; i<num_lines; ++i) {
-		StrBufExtract_token(Line, Cfg, i, '\n');
-		if (StrLength(Line) > 0) {
-			Pos = NULL;
-			StrBufExtract_NextToken(InStr, Line, &Pos, '|');
-	
-			pCfg = GetCfgTypeByStr(SKEY(InStr));
-			if (pCfg != NULL)
-			{
-				pCfg->Parser(pCfg, Line, Pos, OneRNCfg);
-			}
-			else
-			{
-				if (OneRNCfg->misc == NULL)
-				{
-					OneRNCfg->misc = NewStrBufDup(Line);
-				}
-				else
-				{
-					if (StrLength(OneRNCfg->misc) > 0) {
-						StrBufAppendBufPlain(OneRNCfg->misc, HKEY("\n"), 0);
-					}
-					StrBufAppendBuf(OneRNCfg->misc, Line, 0);
-				}
-			}
-		}
-	}
-	FreeStrBuf(&InStr);
-	FreeStrBuf(&Line);
-	FreeStrBuf(&Cfg);
-	return OneRNCfg;
-}
-
-
-void SaveRoomNetConfigFile(OneRoomNetCfg *OneRNCfg, long roomnum)
-{
-	RoomNetCfg eCfg;
-	StrBuf *Cfg = NULL;
-	StrBuf *OutBuffer = NULL;
-	HashPos *CfgIt;
-
-	Cfg = NewStrBuf();
-	OutBuffer = NewStrBuf();
-	CfgIt = GetNewHashPos(CfgTypeHash, 1);
-	for (eCfg = subpending; eCfg < maxRoomNetCfg; eCfg ++)
-	{
-		const CfgLineType *pCfg;
-		pCfg = GetCfgTypeByEnum(eCfg, CfgIt);
-		if (pCfg)
-		{
-			if (pCfg->IsSingleLine)
-			{
-				pCfg->Serializer(pCfg, OutBuffer, OneRNCfg, NULL);
-			}
-			else
-			{
-				RoomNetCfgLine *pName = OneRNCfg->NetConfigs[pCfg->C];
-				while (pName != NULL)
-				{
-					pCfg->Serializer(pCfg, OutBuffer, OneRNCfg, pName);
-					pName = pName->next;
-				}
-			}
-		}
-
-	}
-	DeleteHashPos(&CfgIt);
-
-	if (OneRNCfg->misc != NULL) {
-		StrBufAppendBuf(OutBuffer, OneRNCfg->misc, 0);
-	}
-
-	write_netconfig_to_configdb(roomnum, ChrPtr(OutBuffer));
-
-	FreeStrBuf(&OutBuffer);
-	FreeStrBuf(&Cfg);
-}
-
-
-void AddRoomCfgLine(OneRoomNetCfg *OneRNCfg, struct ctdlroom *qrbuf, RoomNetCfg LineType, RoomNetCfgLine *Line)
-{
-	RoomNetCfgLine **pLine;
-
-	if (OneRNCfg == NULL)
-	{
-		OneRNCfg = (OneRoomNetCfg*) malloc(sizeof(OneRoomNetCfg));
-		memset(OneRNCfg, 0, sizeof(OneRoomNetCfg));
-	}
-	pLine = &OneRNCfg->NetConfigs[LineType];
-
-	while(*pLine != NULL) pLine = &((*pLine)->next);
-	*pLine = Line;
-}
-
-
-void FreeRoomNetworkStructContent(OneRoomNetCfg *OneRNCfg)
-{
-	RoomNetCfg eCfg;
-	HashPos *CfgIt;
-
-	CfgIt = GetNewHashPos(CfgTypeHash, 1);
-	for (eCfg = subpending; eCfg < maxRoomNetCfg; eCfg ++)
-	{
-		const CfgLineType *pCfg;
-		RoomNetCfgLine *pNext, *pName;
-		
-		pCfg = GetCfgTypeByEnum(eCfg, CfgIt);
-		pName= OneRNCfg->NetConfigs[eCfg];
-		while (pName != NULL)
-		{
-			pNext = pName->next;
-			if (pCfg != NULL)
-			{
-				pCfg->DeAllocator(pCfg, &pName);
-			}
-			else
-			{
-				DeleteGenericCfgLine(NULL, &pName);
-			}
-			pName = pNext;
-		}
-	}
-	DeleteHashPos(&CfgIt);
-
-	FreeStrBuf(&OneRNCfg->Sender);
-	FreeStrBuf(&OneRNCfg->RoomInfo);
-	FreeStrBuf(&OneRNCfg->misc);
-	memset(OneRNCfg, 0, sizeof(OneRoomNetCfg));
-}
-
-
-void vFreeRoomNetworkStruct(void *vOneRoomNetCfg)
-{
-	OneRoomNetCfg *OneRNCfg;
-	OneRNCfg = (OneRoomNetCfg*)vOneRoomNetCfg;
-	FreeRoomNetworkStructContent(OneRNCfg);
-	free(OneRNCfg);
-}
-
-
-void FreeRoomNetworkStruct(OneRoomNetCfg **pOneRNCfg)
-{
-	vFreeRoomNetworkStruct(*pOneRNCfg);
-	*pOneRNCfg=NULL;
-}
-
-
-/*
- * Fetch the netconfig entry for a room, parse it, and return the data.
- * Caller owns the returned memory and MUST free it using FreeRoomNetworkStruct()
- */
-OneRoomNetCfg *CtdlGetNetCfgForRoom(long roomnum)
-{
-	OneRoomNetCfg *OneRNCfg = NULL;
-	char *serialized_config = NULL;
-
-	serialized_config = LoadRoomNetConfigFile(roomnum);
-	if (!serialized_config) return NULL;
-
-	OneRNCfg = ParseRoomNetConfigFile(serialized_config);
-	free(serialized_config);
-	return OneRNCfg;
-}
-
-
 /*-----------------------------------------------------------------------------*
  *              Per room network configs : exchange with client                *
  *-----------------------------------------------------------------------------*/
 
-void cmd_gnet(char *argbuf)
-{
+void cmd_gnet(char *argbuf) {
 	if ( (CC->room.QRflags & QR_MAILBOX) && (CC->user.usernum == atol(CC->room.QRname)) ) {
 		/* users can edit the netconfigs for their own mailbox rooms */
 	}
@@ -446,9 +114,7 @@ void cmd_gnet(char *argbuf)
 }
 
 
-void cmd_snet(char *argbuf)
-{
-	struct CitContext *CCC = CC;
+void cmd_snet(char *argbuf) {
 	StrBuf *Line = NULL;
 	StrBuf *TheConfig = NULL;
 	int rc;
@@ -458,8 +124,7 @@ void cmd_snet(char *argbuf)
 	TheConfig = NewStrBuf();
 	cprintf("%d send new netconfig now\n", SEND_LISTING);
 
-	while (rc = CtdlClientGetLine(Line), (rc >= 0))
-	{
+	while (rc = CtdlClientGetLine(Line), (rc >= 0)) {
 		if ((rc == 3) && (strcmp(ChrPtr(Line), "000") == 0))
 			break;
 
@@ -468,254 +133,11 @@ void cmd_snet(char *argbuf)
 	}
 	FreeStrBuf(&Line);
 
-	write_netconfig_to_configdb(CCC->room.QRnumber, ChrPtr(TheConfig));
+	write_netconfig_to_configdb(CC->room.QRnumber, ChrPtr(TheConfig));
 	FreeStrBuf(&TheConfig);
 }
 
 
-/*-----------------------------------------------------------------------------*
- *                       Per node network configs                              *
- *-----------------------------------------------------------------------------*/
-void DeleteCtdlNodeConf(void *vNode)
-{
-	CtdlNodeConf *Node = (CtdlNodeConf*) vNode;
-	FreeStrBuf(&Node->NodeName);
-	FreeStrBuf(&Node->Secret);
-	FreeStrBuf(&Node->Host);
-	FreeStrBuf(&Node->Port);
-	free(Node);
-}
-
-
-CtdlNodeConf *NewNode(StrBuf *SerializedNode)
-{
-	const char *Pos = NULL;
-	CtdlNodeConf *Node;
-
-	/* we need at least 4 pipes and some other text so its invalid. */
-	if (StrLength(SerializedNode) < 8)
-		return NULL;
-	Node = (CtdlNodeConf *) malloc(sizeof(CtdlNodeConf));
-
-	Node->DeleteMe = 0;
-
-	Node->NodeName=NewStrBuf();
-	StrBufExtract_NextToken(Node->NodeName, SerializedNode, &Pos, '|');
-
-	Node->Secret=NewStrBuf();
-	StrBufExtract_NextToken(Node->Secret, SerializedNode, &Pos, '|');
-
-	Node->Host=NewStrBuf();
-	StrBufExtract_NextToken(Node->Host, SerializedNode, &Pos, '|');
-
-	Node->Port=NewStrBuf();
-	StrBufExtract_NextToken(Node->Port, SerializedNode, &Pos, '|');
-	return Node;
-}
-
-
-/*
- * Load or refresh the Citadel network (IGnet) configuration for this node.
- */
-HashList* CtdlLoadIgNetCfg(void)
-{
-	const char *LinePos;
-	char       *Cfg;
-	StrBuf     *Buf;
-	StrBuf     *LineBuf;
-	HashList   *Hash;
-	CtdlNodeConf   *Node;
-
-	Cfg =  CtdlGetSysConfig(IGNETCFG);
-	if ((Cfg == NULL) || IsEmptyStr(Cfg)) {
-		if (Cfg != NULL)
-			free(Cfg);
-		return NULL;
-	}
-
-	Hash = NewHash(1, NULL);
-	Buf = NewStrBufPlain(Cfg, -1);
-	free(Cfg);
-	LineBuf = NewStrBufPlain(NULL, StrLength(Buf));
-	LinePos = NULL;
-	do
-	{
-		StrBufSipLine(LineBuf, Buf, &LinePos);
-		if (StrLength(LineBuf) != 0) {
-			Node = NewNode(LineBuf);
-			if (Node != NULL) {
-				Put(Hash, SKEY(Node->NodeName), Node, DeleteCtdlNodeConf);
-			}
-		}
-	} while (LinePos != StrBufNOTNULL);
-	FreeStrBuf(&Buf);
-	FreeStrBuf(&LineBuf);
-	return Hash;
-}
-
-
-int is_recipient(OneRoomNetCfg *RNCfg, const char *Name)
-{
-	const RoomNetCfg RecipientCfgs[] = {
-		listrecp,
-		digestrecp,
-		participate,
-		maxRoomNetCfg
-	};
-	int i;
-	RoomNetCfgLine *nptr;
-	size_t len;
-	
-	len = strlen(Name);
-	i = 0;
-	while (RecipientCfgs[i] != maxRoomNetCfg)
-	{
-		nptr = RNCfg->NetConfigs[RecipientCfgs[i]];
-		
-		while (nptr != NULL)
-		{
-			if ((StrLength(nptr->Value[0]) == len) && 
-			    (!strcmp(Name, ChrPtr(nptr->Value[0]))))
-			{
-				return 1;
-			}
-			nptr = nptr->next;
-		}
-		i++;
-	}
-	return 0;
-}
-
-
-int CtdlNetconfigCheckRoomaccess(char *errmsgbuf, size_t n, const char* RemoteIdentifier)
-{
-	OneRoomNetCfg *RNCfg;
-	int found;
-
-	if (RemoteIdentifier == NULL)
-	{
-		snprintf(errmsgbuf, n, "Need sender to permit access.");
-		return (ERROR + USERNAME_REQUIRED);
-	}
-
-	begin_critical_section(S_NETCONFIGS);
-	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);
-	}
-	found = is_recipient (RNCfg, RemoteIdentifier);
-	FreeRoomNetworkStruct(&RNCfg);
-	end_critical_section(S_NETCONFIGS);
-
-	if (found) {
-		return (0);
-	}
-	else {
-		snprintf(errmsgbuf, n,
-			 "This mailing list only accepts posts from subscribers.");
-		return (ERROR + NO_SUCH_USER);
-	}
-}
-
-
-/*-----------------------------------------------------------------------------*
- *                 Network maps: evaluate other nodes                          *
- *-----------------------------------------------------------------------------*/
-
-void DeleteNetMap(void *vNetMap)
-{
-	CtdlNetMap *TheNetMap = (CtdlNetMap*) vNetMap;
-	FreeStrBuf(&TheNetMap->NodeName);
-	FreeStrBuf(&TheNetMap->NextHop);
-	free(TheNetMap);
-}
-
-
-CtdlNetMap *NewNetMap(StrBuf *SerializedNetMap)
-{
-	const char *Pos = NULL;
-	CtdlNetMap *NM;
-
-	/* we need at least 3 pipes and some other text so its invalid. */
-	if (StrLength(SerializedNetMap) < 6)
-		return NULL;
-	NM = (CtdlNetMap *) malloc(sizeof(CtdlNetMap));
-
-	NM->NodeName=NewStrBuf();
-	StrBufExtract_NextToken(NM->NodeName, SerializedNetMap, &Pos, '|');
-
-	NM->lastcontact = StrBufExtractNext_long(SerializedNetMap, &Pos, '|');
-
-	NM->NextHop=NewStrBuf();
-	StrBufExtract_NextToken(NM->NextHop, SerializedNetMap, &Pos, '|');
-
-	return NM;
-}
-
-
-HashList* CtdlReadNetworkMap(void)
-{
-	const char *LinePos;
-	char       *Cfg;
-	StrBuf     *Buf;
-	StrBuf     *LineBuf;
-	HashList   *Hash;
-	CtdlNetMap     *TheNetMap;
-
-	Hash = NewHash(1, NULL);
-	Cfg =  CtdlGetSysConfig(IGNETMAP);
-	if ((Cfg == NULL) || IsEmptyStr(Cfg)) {
-		if (Cfg != NULL)
-			free(Cfg);
-		return Hash;
-	}
-
-	Buf = NewStrBufPlain(Cfg, -1);
-	free(Cfg);
-	LineBuf = NewStrBufPlain(NULL, StrLength(Buf));
-	LinePos = NULL;
-	while (StrBufSipLine(Buf, LineBuf, &LinePos))
-	{
-		TheNetMap = NewNetMap(LineBuf);
-		if (TheNetMap != NULL) { /* TODO: is the NodeName Uniq? */
-			Put(Hash, SKEY(TheNetMap->NodeName), TheNetMap, DeleteNetMap);
-		}
-	}
-	FreeStrBuf(&Buf);
-	FreeStrBuf(&LineBuf);
-	return Hash;
-}
-
-
-StrBuf *CtdlSerializeNetworkMap(HashList *Map)
-{
-	void *vMap;
-	const char *key;
-	long len;
-	StrBuf *Ret = NewStrBuf();
-	HashPos *Pos = GetNewHashPos(Map, 0);
-
-	while (GetNextHashPos(Map, Pos, &len, &key, &vMap))
-	{
-		CtdlNetMap *pMap = (CtdlNetMap*) vMap;
-		StrBufAppendBuf(Ret, pMap->NodeName, 0);
-		StrBufAppendBufPlain(Ret, HKEY("|"), 0);
-
-		StrBufAppendPrintf(Ret, "%ld", pMap->lastcontact, 0);
-		StrBufAppendBufPlain(Ret, HKEY("|"), 0);
-
-		StrBufAppendBuf(Ret, pMap->NextHop, 0);
-		StrBufAppendBufPlain(Ret, HKEY("\n"), 0);
-	}
-	DeleteHashPos(&Pos);
-	return Ret;
-}
-
-
 /*
  * Convert any legacy configuration files in the "netconfigs" directory
  */
@@ -734,32 +156,26 @@ void convert_legacy_netcfg_files(void)
 
 	syslog(LOG_INFO, "netconfig: legacy netconfig files exist - converting them!");
 
-	while (dit = readdir(dh), dit != NULL)			// yes, we use the non-reentrant version; we're not in threaded mode yet
-	{
+	while (dit = readdir(dh), dit != NULL) {	// yes, we use the non-reentrant version; we're not in threaded mode yet
 		roomnum = atol(dit->d_name);
 		if (roomnum > 0) {
 			snprintf(filename, sizeof filename, "%s/%ld", ctdl_netcfg_dir, roomnum);
 			fp = fopen(filename, "r");
-			if (fp)
-			{
+			if (fp) {
 				fseek(fp, 0L, SEEK_END);
 				len = ftell(fp);
-				if (len > 0)
-				{
+				if (len > 0) {
 					v = malloc(len);
-					if (v)
-					{
+					if (v) {
 						rewind(fp);
-						if (fread(v, len, 1, fp))
-						{
+						if (fread(v, len, 1, fp)) {
 							write_netconfig_to_configdb(roomnum, v);
 							unlink(filename);
 						}
 						free(v);
 					}
 				}
-				else
-				{
+				else {
 					unlink(filename);	// zero length netconfig, just delete it
 				}
 				fclose(fp);