X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=714bb0471918db577cc597c25e9b5d7e05313f45;hb=906ed8dd506c242cffd74bbbc85b5420b948cae9;hp=c75e682fb74a1b51d30e0821e8635c39bc3851b7;hpb=e750a47a92b48dfa6faf63a61a71f103871c9e5b;p=citadel.git

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index c75e682fb..714bb0471 100644
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -168,7 +168,7 @@ void Netmap_AddMe(struct CtdlMessage *msg, const char *defl, long defllen)
 	if (CM_IsEmpty(msg, eMessagePath)) {
 		CM_SetField(msg, eMessagePath, defl, defllen);
 	}
-	node_len = strlen(config.c_nodename);
+	node_len = configlen.c_nodename;
 	if (node_len >= SIZ) 
 		node_len = SIZ - 1;
 	memcpy(buf, config.c_nodename, node_len);
@@ -209,11 +209,13 @@ void InspectQueuedRoom(SpoolControl **pSC,
 		return;
 	}
 
+	begin_critical_section(S_NETCONFIGS);
 	if (sc->RNCfg == NULL)
 		sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
 
 	if (!HaveSpoolConfig(sc->RNCfg))
 	{
+		end_critical_section(S_NETCONFIGS);
 		free(sc);
 		/* nothing to do for this room... */
 		return;
@@ -231,6 +233,7 @@ void InspectQueuedRoom(SpoolControl **pSC,
 	
 	if (StrLength(sc->RNCfg->Sender) > 0)
 		sc->Users[roommailalias] = NewStrBufDup(sc->RNCfg->Sender);
+	end_critical_section(S_NETCONFIGS);
 
 	sc->next = *pSC;
 	*pSC = sc;
@@ -400,12 +403,13 @@ void network_spoolout_room(SpoolControl *sc)
 	/* Now rewrite the config file */
 	if (sc->lastsent != lastsent)
 	{
+		begin_critical_section(S_NETCONFIGS);
 		sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
 
 		sc->RNCfg->lastsent = sc->lastsent;
 		sc->RNCfg->changed = 1;
+		end_critical_section(S_NETCONFIGS);
 	}
-	end_critical_section(S_NETCONFIGS);
 }
 
 /*
@@ -420,7 +424,7 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
 	struct CtdlMessage *msg = NULL;
 	long pos;
 	int field;
-	struct recptypes *recp = NULL;
+	recptypes *recp = NULL;
 	char target_room[ROOMNAMELEN];
 	struct ser_ret sermsg;
 	char filename[PATH_MAX];
@@ -462,7 +466,7 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
 		if (strcasecmp(msg->cm_fields[eDestination], config.c_nodename)) {
 
 			/* route the message */
-			Buf = NewStrBufPlain(msg->cm_fields[eDestination], -1);
+			Buf = NewStrBufPlain(CM_KEY(msg,eDestination));
 			if (CtdlIsValidNode(&nexthop, 
 					    NULL, 
 					    Buf, 
@@ -720,7 +724,7 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n
 	       (filedir_entry != NULL))
 	{
 #ifdef _DIRENT_HAVE_D_NAMLEN
-		d_namelen = filedir_entry->d_namelen;
+		d_namelen = filedir_entry->d_namlen;
 
 #else
 		d_namelen = strlen(filedir_entry->d_name);
@@ -824,7 +828,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 	       (filedir_entry != NULL))
 	{
 #ifdef _DIRENT_HAVE_D_NAMLEN
-		d_namelen = filedir_entry->d_namelen;
+		d_namelen = filedir_entry->d_namlen;
 
 #else
 		d_namelen = strlen(filedir_entry->d_name);
@@ -978,7 +982,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 	       (filedir_entry != NULL))
 	{
 #ifdef _DIRENT_HAVE_D_NAMLEN
-		d_namelen = filedir_entry->d_namelen;
+		d_namelen = filedir_entry->d_namlen;
 
 #else
 		d_namelen = strlen(filedir_entry->d_name);