From: Art Cancro Date: Wed, 29 Apr 2015 15:02:07 +0000 (-0400) Subject: Converted serv_extensions.c to the new config format X-Git-Tag: Release_902~167^2~26 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=1ded7b8b362c8866236656870793d98ef3a1c40a Converted serv_extensions.c to the new config format --- diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c index 4b4e44c08..568d9a3ae 100644 --- a/citadel/serv_extensions.c +++ b/citadel/serv_extensions.c @@ -1,8 +1,8 @@ /* - * Citadel Dynamic Loading Module + * Citadel Extension Loader * Written by Brian Costello * - * Copyright (c) 1987-2011 by the citadel.org team + * Copyright (c) 1987-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. @@ -21,6 +21,7 @@ #include "serv_extensions.h" #include "ctdl_module.h" +#include "config.h" int DebugModules = 0; @@ -1131,7 +1132,7 @@ void CtdlRegisterServiceHook(int tcp_port, newfcn->ServiceName = ServiceName; if (sockpath != NULL) { - newfcn->msock = ctdl_uds_server(sockpath, config.c_maxsessions, error); + newfcn->msock = ctdl_uds_server(sockpath, CtdlGetConfigInt("c_maxsessions"), error); snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath); } else if (tcp_port <= 0) { /* port -1 to disable */ @@ -1141,12 +1142,12 @@ void CtdlRegisterServiceHook(int tcp_port, return; } else { - newfcn->msock = ctdl_tcp_server(config.c_ip_addr, + newfcn->msock = ctdl_tcp_server(CtdlGetConfigStr("c_ip_addr"), tcp_port, - config.c_maxsessions, + CtdlGetConfigInt("c_maxsessions"), error); snprintf(message, SIZ, "TCP port %s:%d: (%s) ", - config.c_ip_addr, tcp_port, ServiceName); + CtdlGetConfigStr("c_ip_addr"), tcp_port, ServiceName); } if (newfcn->msock > 0) {