From dbe2d722b03546ea75dbf5b4edeacd2bb8a6c897 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 4 May 2015 22:16:03 -0400 Subject: [PATCH] Moved more code over to the new config system --- citadel/modules/network/serv_network.c | 33 ++++++++++--------- .../networkclient/serv_networkclient.c | 21 ++++++------ citadel/modules/nntp/serv_nntp.c | 10 +++--- 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index 9fa82734e..58d2094af 100644 --- a/citadel/modules/network/serv_network.c +++ b/citadel/modules/network/serv_network.c @@ -2,15 +2,15 @@ * This module handles shared rooms, inter-Citadel mail, and outbound * mailing list processing. * - * Copyright (c) 2000-2012 by the citadel.org team + * Copyright (c) 2000-2015 by the citadel.org team * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 3. + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 3. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * * ** NOTE ** A word on the S_NETCONFIGS semaphore: * This is a fairly high-level type of critical section. It ensures that no @@ -359,7 +359,7 @@ void network_bounce(struct CtdlMessage *msg, char *reason) if (msg == NULL) return; - snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, config.c_nodename); + snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, CtdlGetConfigStr("c_nodename")); /* * Give it a fresh message ID @@ -369,7 +369,8 @@ void network_bounce(struct CtdlMessage *msg, char *reason) (long)time(NULL), (long)getpid(), ++serialnum, - config.c_fqdn); + CtdlGetConfigStr("c_fqdn") + ); CM_SetField(msg, emessageId, buf, len); @@ -391,7 +392,7 @@ void network_bounce(struct CtdlMessage *msg, char *reason) msg->cm_fields[eNodeName]); CM_SetField(msg, eAuthor, HKEY(BOUNCESOURCE)); - CM_SetField(msg, eNodeName, CFG_KEY(c_nodename)); + CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename"))); CM_SetField(msg, eMsgSubject, HKEY("Delivery Status Notification (Failure)")); Netmap_AddMe(msg, HKEY("unknown_user")); @@ -402,14 +403,15 @@ void network_bounce(struct CtdlMessage *msg, char *reason) free_recipients(valid); valid = NULL; } - if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) { - strcpy(force_room, config.c_aideroom); + if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) + { + strcpy(force_room, CtdlGetConfigStr("c_aideroom")); } else { strcpy(force_room, ""); } if ( (valid == NULL) && IsEmptyStr(force_room) ) { - strcpy(force_room, config.c_aideroom); + strcpy(force_room, CtdlGetConfigStr("c_aideroom")); } CtdlSubmitMsg(msg, valid, force_room, 0); @@ -442,10 +444,11 @@ void network_do_queue(void) * Run the full set of processing tasks no more frequently * than once every n seconds */ - if ( (time(NULL) - last_run) < config.c_net_freq ) { + if ( (time(NULL) - last_run) < CtdlGetConfigLong("c_net_freq") ) + { full_processing = 0; syslog(LOG_DEBUG, "Network full processing in %ld seconds.\n", - config.c_net_freq - (time(NULL)- last_run) + CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run) ); } diff --git a/citadel/modules/networkclient/serv_networkclient.c b/citadel/modules/networkclient/serv_networkclient.c index 34ea669e5..0fe749d33 100644 --- a/citadel/modules/networkclient/serv_networkclient.c +++ b/citadel/modules/networkclient/serv_networkclient.c @@ -2,15 +2,15 @@ * This module handles shared rooms, inter-Citadel mail, and outbound * mailing list processing. * - * Copyright (c) 2000-2012 by the citadel.org team + * Copyright (c) 2000-2015 by the citadel.org team * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 3. + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 3. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * * ** NOTE ** A word on the S_NETCONFIGS semaphore: * This is a fairly high-level type of critical section. It ensures that no @@ -256,7 +256,7 @@ eNextState NWC_SendAuth(AsyncNetworker *NW) SetNWCState(IO, eNWCVSAuth); /* We're talking to the correct node. Now identify ourselves. */ StrBufPrintf(NW->IO.SendBuf.Buf, "NETP %s|%s\n", - config.c_nodename, + CtdlGetConfigStr("c_nodename"), ChrPtr(NW->secret)); NWC_DBG_SEND(); return eSendReply; @@ -1117,10 +1117,11 @@ void network_do_clientqueue(void) * Run the full set of processing tasks no more frequently * than once every n seconds */ - if ( (time(NULL) - last_run) < config.c_net_freq ) { + if ( (time(NULL) - last_run) < CtdlGetConfigLong("c_net_freq") ) + { full_processing = 0; syslog(LOG_DEBUG, "Network full processing in %ld seconds.\n", - config.c_net_freq - (time(NULL)- last_run) + CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run) ); } diff --git a/citadel/modules/nntp/serv_nntp.c b/citadel/modules/nntp/serv_nntp.c index b5b91db79..15f91d466 100644 --- a/citadel/modules/nntp/serv_nntp.c +++ b/citadel/modules/nntp/serv_nntp.c @@ -1,7 +1,7 @@ // // NNTP server module (RFC 3977) // -// Copyright (c) 2014 by the citadel.org team +// Copyright (c) 2014-2015 by the citadel.org team // // This program is open source software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 3. @@ -200,7 +200,7 @@ void nntp_greeting(void) } // Display the standard greeting - cprintf("200 %s NNTP Citadel server is not finished yet\r\n", config.c_fqdn); + cprintf("200 %s NNTP Citadel server is not finished yet\r\n", CtdlGetConfigStr("c_fqdn")); } @@ -284,7 +284,7 @@ void nntp_authinfo_user(const char *username) cprintf("482 Already logged in\r\n"); return; case login_too_many_users: - cprintf("481 Too many users are already online (maximum is %d)\r\n", config.c_maxsessions); + cprintf("481 Too many users are already online (maximum is %d)\r\n", CtdlGetConfigInt("c_maxsessions")); return; case login_ok: cprintf("381 Password required for %s\r\n", CC->curr_user); @@ -1178,7 +1178,7 @@ CTDL_MODULE_INIT(nntp) { if (!threading) { - CtdlRegisterServiceHook(config.c_nntp_port, + CtdlRegisterServiceHook(CtdlGetConfigInt("c_nntp_port"), NULL, nntp_greeting, nntp_command_loop, @@ -1186,7 +1186,7 @@ CTDL_MODULE_INIT(nntp) CitadelServiceNNTP); #ifdef HAVE_OPENSSL - CtdlRegisterServiceHook(config.c_nntps_port, + CtdlRegisterServiceHook(CtdlGetConfigInt("c_nntps_port"), NULL, nntps_greeting, nntp_command_loop, -- 2.30.2