From: Art Cancro Date: Sat, 23 Jan 2016 00:20:27 +0000 (-0500) Subject: closer... X-Git-Tag: Release_902~70 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=924b8cd997f56b68e16fa1dfc1be55722596f5d8 closer... --- diff --git a/citadel/citserver.h b/citadel/citserver.h index 997775bd2..c02492512 100644 --- a/citadel/citserver.h +++ b/citadel/citserver.h @@ -18,7 +18,6 @@ typedef struct RoomProcList RoomProcList; struct RoomProcList { struct RoomProcList *next; - OneRoomNetCfg *OneRNCfg; char name[ROOMNAMELEN]; char lcname[ROOMNAMELEN]; long namelen; diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h index 57444eea0..50490ba53 100644 --- a/citadel/include/ctdl_module.h +++ b/citadel/include/ctdl_module.h @@ -330,7 +330,7 @@ struct RoomNetCfgLine { struct OneRoomNetCfg { long lastsent; - long changed; + // long changed; StrBuf *Sender; StrBuf *RoomInfo; RoomNetCfgLine *NetConfigs[maxRoomNetCfg]; diff --git a/citadel/modules/listsub/serv_listsub.c b/citadel/modules/listsub/serv_listsub.c index 658fbbc06..ae41d1746 100644 --- a/citadel/modules/listsub/serv_listsub.c +++ b/citadel/modules/listsub/serv_listsub.c @@ -594,7 +594,6 @@ void do_confirm(StrBuf **room, StrBuf **token) { else { /* whipe duplicate subscribe entry... */ - OneRNCfg->changed = 1; errmsg = "already subscribed"; } } @@ -637,7 +636,6 @@ void do_confirm(StrBuf **room, StrBuf **token) { errmsg = "no subscriber found for this unsubscription request"; } DeleteGenericCfgLine(NULL/*TODO*/, &ConfirmLine); - OneRNCfg->changed = 1; } SaveRoomNetConfigFile(OneRNCfg, qrbuf.QRnumber); diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c index 32528dfb5..3b53305b1 100644 --- a/citadel/modules/network/serv_netspool.c +++ b/citadel/modules/network/serv_netspool.c @@ -60,6 +60,7 @@ #include #include #include +#include #include #include "citadel.h" #include "server.h" @@ -98,7 +99,6 @@ */ void network_bounce(struct CtdlMessage **pMsg, char *reason) { - struct CitContext *CCC = CC; char buf[SIZ]; char bouncesource[SIZ]; char recipient[SIZ]; @@ -108,7 +108,7 @@ void network_bounce(struct CtdlMessage **pMsg, char *reason) long len; struct CtdlMessage *msg = *pMsg; *pMsg = NULL; - QNM_syslog(LOG_DEBUG, "entering network_bounce()"); + syslog(LOG_DEBUG, "entering network_bounce()"); if (msg == NULL) return; @@ -171,7 +171,7 @@ void network_bounce(struct CtdlMessage **pMsg, char *reason) /* Clean up */ if (valid != NULL) free_recipients(valid); CM_Free(msg); - QNM_syslog(LOG_DEBUG, "leaving network_bounce()"); + syslog(LOG_DEBUG, "leaving network_bounce()"); } @@ -264,13 +264,13 @@ void InspectQueuedRoom(SpoolControl **pSC, HashList *working_ignetcfg, HashList *the_netmap) { - struct CitContext *CCC = CC; SpoolControl *sc; int i = 0; + syslog(LOG_INFO, "InspectQueuedRoom(%s)", room_to_spool->name); + sc = (SpoolControl*)malloc(sizeof(SpoolControl)); memset(sc, 0, sizeof(SpoolControl)); - sc->RNCfg = room_to_spool->OneRNCfg; sc->lastsent = room_to_spool->lastsent; sc->working_ignetcfg = working_ignetcfg; sc->the_netmap = the_netmap; @@ -281,51 +281,47 @@ void InspectQueuedRoom(SpoolControl **pSC, * queued for networking and then deleted before it can happen. */ if (CtdlGetRoom(&sc->room, room_to_spool->name) != 0) { - syslog(LOG_CRIT, "ERROR: cannot load <%s>", room_to_spool->name); - free(sc); - return; - } - if (sc->room.QRhighest <= sc->lastsent) - { - QN_syslog(LOG_DEBUG, "nothing to do for <%s>", room_to_spool->name); + syslog(LOG_INFO, "ERROR: cannot load <%s>", room_to_spool->name); free(sc); return; } - begin_critical_section(S_NETCONFIGS); - if (sc->RNCfg == NULL) { - sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber); - } + assert(sc->RNCfg == NULL); // checking to make sure we cleared it from last time - if (!HaveSpoolConfig(sc->RNCfg)) + sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber); + + syslog(LOG_DEBUG, "Room <%s> highest=%ld lastsent=%ld", room_to_spool->name, sc->room.QRhighest, sc->RNCfg->lastsent); + if ( (!HaveSpoolConfig(sc->RNCfg)) || (sc->room.QRhighest <= sc->RNCfg->lastsent) ) { - end_critical_section(S_NETCONFIGS); + // There is nothing to send from this room. + syslog(LOG_DEBUG, "nothing to do for <%s>", room_to_spool->name); + FreeRoomNetworkStruct(&sc->RNCfg); + sc->RNCfg = NULL; free(sc); - /* nothing to do for this room... */ return; } + sc->lastsent = sc->RNCfg->lastsent; + /* Now lets remember whats needed for the actual work... */ for (i=0; i < 4; i++) { - aggregate_recipients(&sc->Users[SpoolCfgs[i]], - SpoolCfgs[i], - sc->RNCfg, - SpoolCfgsCopyN[i] - ); + aggregate_recipients(&sc->Users[SpoolCfgs[i]], SpoolCfgs[i], sc->RNCfg, SpoolCfgsCopyN[i]); } if (StrLength(sc->RNCfg->Sender) > 0) { sc->Users[roommailalias] = NewStrBufDup(sc->RNCfg->Sender); } - end_critical_section(S_NETCONFIGS); sc->next = *pSC; *pSC = sc; + FreeRoomNetworkStruct(&sc->RNCfg); // done with this for now, we'll grab it again next time + sc->RNCfg = NULL; } + void CalcListID(SpoolControl *sc) { StrBuf *RoomName; @@ -437,7 +433,7 @@ void network_spoolout_room(SpoolControl *sc) */ memcpy (&CCC->room, &sc->room, sizeof(ctdlroom)); - syslog(LOG_INFO, "Networking started for <%s>", CCC->room.QRname); + syslog(LOG_INFO, "network_spoolout_room(%s)", CCC->room.QRname); CalcListID(sc); @@ -514,11 +510,15 @@ void network_spoolout_room(SpoolControl *sc) if (sc->lastsent != lastsent) { + OneRoomNetCfg *r; + begin_critical_section(S_NETCONFIGS); - sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber); + r = CtdlGetNetCfgForRoom(sc->room.QRnumber); + + r->lastsent = sc->lastsent; // FIXME we have to do something here !!!!!!! - sc->RNCfg->lastsent = sc->lastsent; - sc->RNCfg->changed = 1; + SaveRoomNetConfigFile(r, sc->room.QRnumber); + FreeRoomNetworkStruct(&r); end_critical_section(S_NETCONFIGS); } } @@ -577,7 +577,6 @@ int network_usetable(struct CtdlMessage *msg) void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, HashList *the_netmap, int *netmap_changed) { long len; - struct CitContext *CCC = CC; StrBuf *Buf = NULL; struct CtdlMessage *msg = NULL; long pos; @@ -591,13 +590,13 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, unsigned char firstbyte; unsigned char lastbyte; - QN_syslog(LOG_DEBUG, "network_process_buffer() processing %ld bytes", size); + syslog(LOG_DEBUG, "network_process_buffer() processing %ld bytes", size); /* Validate just a little bit. First byte should be FF and * last byte should be 00. */ firstbyte = buffer[0]; lastbyte = buffer[size-1]; if ( (firstbyte != 255) || (lastbyte != 0) ) { - QN_syslog(LOG_ERR, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d", size, firstbyte, lastbyte); + syslog(LOG_ERR, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d", size, firstbyte, lastbyte); return; } @@ -647,14 +646,14 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, time(NULL), rand() ); - QN_syslog(LOG_DEBUG, "Appending to %s", filename); + syslog(LOG_DEBUG, "Appending to %s", filename); fp = fopen(filename, "ab"); if (fp != NULL) { fwrite(sermsg.ser, sermsg.len, 1, fp); fclose(fp); } else { - QN_syslog(LOG_ERR, "%s: %s", filename, strerror(errno)); + syslog(LOG_ERR, "%s: %s", filename, strerror(errno)); } free(sermsg.ser); CM_Free(msg); @@ -708,7 +707,7 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, "A message you sent could not be delivered due to an invalid address.\n" "Please check the address and try sending the message again.\n"); free_recipients(recp); - QNM_syslog(LOG_DEBUG, "Bouncing message due to invalid recipient address."); + syslog(LOG_DEBUG, "Bouncing message due to invalid recipient address."); return; } strcpy(target_room, ""); /* no target room if mail */ @@ -776,7 +775,6 @@ void network_process_file(char *filename, HashList *the_netmap, int *netmap_changed) { - struct CitContext *CCC = CC; FILE *fp; long msgstart = (-1L); long msgend = (-1L); @@ -786,12 +784,12 @@ void network_process_file(char *filename, fp = fopen(filename, "rb"); if (fp == NULL) { - QN_syslog(LOG_CRIT, "Error opening %s: %s", filename, strerror(errno)); + syslog(LOG_CRIT, "Error opening %s: %s", filename, strerror(errno)); return; } fseek(fp, 0L, SEEK_END); - QN_syslog(LOG_INFO, "network: processing %ld bytes from %s", ftell(fp), filename); + syslog(LOG_INFO, "network: processing %ld bytes from %s", ftell(fp), filename); rewind(fp); /* Look for messages in the data stream and break them out */ @@ -826,7 +824,7 @@ void network_process_file(char *filename, } if (nMessages > 0) - QN_syslog(LOG_INFO, "network: processed %d messages in %s", nMessages, filename); + syslog(LOG_INFO, "network: processed %d messages in %s", nMessages, filename); fclose(fp); unlink(filename); @@ -838,7 +836,6 @@ void network_process_file(char *filename, */ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *netmap_changed) { - struct CitContext *CCC = CC; DIR *dp; struct dirent *d; struct dirent *filedir_entry; @@ -854,11 +851,11 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n */ if (stat(ctdl_netin_dir, &statbuf)) return; if (statbuf.st_mtime == last_spoolin_mtime) { - QNM_syslog(LOG_DEBUG, "network: nothing in inbound queue"); + syslog(LOG_DEBUG, "network: nothing in inbound queue"); return; } last_spoolin_mtime = statbuf.st_mtime; - QNM_syslog(LOG_DEBUG, "network: processing inbound queue"); + syslog(LOG_DEBUG, "network: processing inbound queue"); /* * Ok, there's something interesting in there, so scan it. @@ -943,7 +940,6 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n */ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netmap) { - struct CitContext *CCC = CC; IOBuffer IOB; FDIOBuffer FDIO; int d_namelen; @@ -1026,10 +1022,10 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm ctdl_netout_dir, ChrPtr(NextHop)); - QN_syslog(LOG_DEBUG, "Consolidate %s to %s", filename, ChrPtr(NextHop)); + syslog(LOG_DEBUG, "Consolidate %s to %s", filename, ChrPtr(NextHop)); if (CtdlNetworkTalkingTo(SKEY(NextHop), NTT_CHECK)) { nFailed++; - QN_syslog(LOG_DEBUG, "Currently online with %s - skipping for now", ChrPtr(NextHop)); + syslog(LOG_DEBUG, "Currently online with %s - skipping for now", ChrPtr(NextHop)); } else { size_t dsize; @@ -1041,7 +1037,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm infd = open(filename, O_RDONLY); if (infd == -1) { nFailed++; - QN_syslog(LOG_ERR, + syslog(LOG_ERR, "failed to open %s for reading due to %s; skipping.", filename, strerror(errno) ); @@ -1060,7 +1056,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm } if (outfd == -1) { nFailed++; - QN_syslog(LOG_ERR, + syslog(LOG_ERR, "failed to open %s for reading due to %s; skipping.", spooloutfilename, strerror(errno) ); @@ -1086,11 +1082,11 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm do {} while ((FileMoveChunked(&FDIO, &err) > 0) && (err == NULL)); if (err == NULL) { unlink(filename); - QN_syslog(LOG_DEBUG, "Spoolfile %s now "SIZE_T_FMT" KB", spooloutfilename, (dsize + fsize)/1024); + syslog(LOG_DEBUG, "Spoolfile %s now "SIZE_T_FMT" KB", spooloutfilename, (dsize + fsize)/1024); } else { nFailed++; - QN_syslog(LOG_ERR, "failed to append to %s [%s]; rolling back..", spooloutfilename, strerror(errno)); + syslog(LOG_ERR, "failed to append to %s [%s]; rolling back..", spooloutfilename, strerror(errno)); /* whoops partial append?? truncate spooloutfilename again! */ ftruncate(outfd, dsize); } @@ -1104,7 +1100,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm if (nFailed > 0) { FreeStrBuf(&NextHop); - QN_syslog(LOG_INFO, "skipping Spoolcleanup because of %d files unprocessed.", nFailed); + syslog(LOG_INFO, "skipping Spoolcleanup because of %d files unprocessed.", nFailed); return; } diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index c81f016ab..d36660e4b 100644 --- a/citadel/modules/network/serv_network.c +++ b/citadel/modules/network/serv_network.c @@ -214,8 +214,6 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *One ptr->lcname[ptr->namelen] = '\0'; ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345); - ptr->lastsent = OneRNCFG->lastsent; - ptr->OneRNCfg = OneRNCFG; return ptr; } @@ -268,7 +266,6 @@ int network_room_handler(struct ctdlroom *qrbuf) return 1; } - ptr->OneRNCfg = NULL; begin_critical_section(S_RPLIST); ptr->next = rplist; rplist = ptr; @@ -372,10 +369,7 @@ void network_do_queue(void) } if (ptr->namelen > 0) { - InspectQueuedRoom(&sc, - ptr, - working_ignetcfg, - the_netmap); + InspectQueuedRoom(&sc, ptr, working_ignetcfg, the_netmap); } ptr = ptr->next; } diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c index acae63787..2fa5134e9 100644 --- a/citadel/modules/rssclient/serv_rssclient.c +++ b/citadel/modules/rssclient/serv_rssclient.c @@ -523,11 +523,9 @@ void UpdateLastKnownGood(pRSSConfig *pCfg, time_t now) } if (RSSCfg != NULL) { - pRNCfg->changed = 1; RSSCfg->last_known_good = now; } } - SaveRoomNetConfigFile(pRNCfg, pCfg->QRnumber); FreeRoomNetworkStruct(&pRNCfg); end_critical_section(S_NETCONFIGS); diff --git a/citadel/netconfig.c b/citadel/netconfig.c index d87d522cb..239ab731d 100644 --- a/citadel/netconfig.c +++ b/citadel/netconfig.c @@ -191,7 +191,6 @@ void write_netconfig_to_configdb(long roomnum, const char *raw_netconfig) int enc_len; int len; - syslog(LOG_DEBUG, "\033[32m--- START WRITE ---\033[0m\n\033[31m%s\033[0m\n\033[32m---- END WRITE ----\033[0m", raw_netconfig); len = strlen(raw_netconfig); netcfg_keyname(keyname, roomnum); enc = malloc(len * 2); @@ -250,9 +249,7 @@ OneRoomNetCfg *ParseRoomNetConfigFile(char *serialized_data) InStr = NewStrBuf(); Cfg = NewStrBufPlain(serialized_data, -1); - syslog(LOG_DEBUG, "\033[32m--- START READ ---\033[0m"); while (StrBufSipLine(Line, Cfg, &CPos)) { - syslog(LOG_DEBUG, "READ NET CONFIG LINE: '\033[31m%s\033[0m'", ChrPtr(Line)); if (StrLength(Line) > 0) { Pos = NULL; @@ -279,7 +276,6 @@ OneRoomNetCfg *ParseRoomNetConfigFile(char *serialized_data) } } } - syslog(LOG_DEBUG, "\033[32m---- END READ ----\033[0m"); FreeStrBuf(&InStr); FreeStrBuf(&Line); FreeStrBuf(&Cfg);