X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;fp=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;h=a597a68bb93e6ebe6e1aa59ed8ac8a8331ad801e;hp=1d843b46116d072f9b44f172df4689c1c5abf19a;hb=2807ad968981de0aae10473ee5fbd7a4c0d513bd;hpb=ec3a9fd41d060931332bee674e856ce5265a1d8a diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index 1d843b461..a597a68bb 100644 --- a/citadel/modules/network/serv_network.c +++ b/citadel/modules/network/serv_network.c @@ -87,7 +87,9 @@ extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval); typedef struct __roomlists { RoomProcList *rplist; -}roomlists; +} roomlists; + + /* * When we do network processing, it's accomplished in two passes; one to * gather a list of rooms and one to actually do them. It's ok that rplist @@ -113,8 +115,7 @@ int network_sync_to(char *target_node, long len) /* Grab the configuration line we're looking for */ begin_critical_section(S_NETCONFIGS); pRNCFG = CtdlGetNetCfgForRoom(CCC->room.QRnumber); - if ((pRNCFG == NULL) || - (pRNCFG->NetConfigs[ignet_push_share] == NULL)) + if ((pRNCFG == NULL) || (pRNCFG->NetConfigs[ignet_push_share] == NULL)) { return -1; } @@ -137,17 +138,11 @@ int network_sync_to(char *target_node, long len) 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); + 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); @@ -156,8 +151,7 @@ int network_sync_to(char *target_node, long len) sc.the_netmap = CtdlReadNetworkMap(); /* Send ALL messages */ - num_spooled = CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL, - network_spool_msg, &sc); + num_spooled = CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL, network_spool_msg, &sc); /* Concise cleanup because we know there's only one node in the sc */ DeleteGenericCfgLine(NULL/*TODO*/, &sc.RNCfg->NetConfigs[ignet_push_share]); @@ -427,7 +421,7 @@ void network_do_queue(void) last_run = time(NULL); } destroy_network_queue_room(RL.rplist); - SaveChangedConfigs(); + // SaveChangedConfigs(); // FIXME FOOFOO SAVE CHANGED THIS AACACACACCKK }