Thu, 29 Dec 2016 10:15:43 +0100
fixes missing FuncStruct initialization in load_modules
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2013 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include <stdio.h> #include <stdlib.h> #include "../public/nsapi.h" #include <ucx/string.h> #include "httplistener.h" #include "log.h" #include "configmanager.h" static ServerConfiguration *current_config = NULL; static time_t sc_last_modified = 0; static UcxMap *config_files; static conf_global_vars_s global_vars; void init_configuration_manager() { /* init parser */ init_server_config_parser(); config_files = ucx_map_new(16); } NSAPI_PUBLIC conf_global_vars_s* conf_getglobals() { return &global_vars; } void cfgmgr_attach_file(ConfigFile *cf) { ucx_map_sstr_put(config_files, cf->file, cf); } ConfigFile* cfgmgr_get_file(sstr_t name) { return ucx_map_sstr_get(config_files, name); } int cfgmgr_reload_file(ConfigFile *f, ServerConfiguration *conf, int *reload) { struct stat s; if(stat(f->file.ptr, &s) != 0) { fprintf( stderr, "Error: Cannot get stat of file %s\n", f->file.ptr); perror("cfgmgr_load_config: stat"); return -1; } //printf("1 time: %d - %d\n", f->last_modified, s.st_mtim.tv_sec); if(f->last_modified != s.st_mtime) { /* reload the file */ if(f->last_modified != 0) { log_ereport( LOG_INFORM, "reload configuration file: %s", f->file.ptr); } if(f->reload(f, conf)) { return -1; } f->last_modified = s.st_mtime; if(reload) { *reload = 1; } } return 0; } int cfgmgr_load_config(ServerConfiguration **set_cfg) { int cfgreload = 0; /* check config files */ UcxMapIterator iter = ucx_map_iterator(config_files); ConfigFile *f; UCX_MAP_FOREACH(key, f, iter) { if(cfgmgr_reload_file(f, current_config, &cfgreload) == -1) { return -1; } } struct stat s; if(stat("config/server.conf", &s) != 0) { perror("stat(\"config/server.conf\")"); return -1; } ServerConfiguration *config; if(cfgreload || !current_config || sc_last_modified != s.st_mtime) { config = load_server_conf( current_config, "config/server.conf"); if(config == NULL) { return -1; } sc_last_modified = s.st_mtime; } else { log_ereport(LOG_VERBOSE, "no reconfig required"); config = current_config; } if(set_cfg) { *set_cfg = config; } ServerConfiguration *old_conf = NULL; if(current_config != config) { old_conf = current_config; } current_config = config; if(old_conf) { cfg_unref(old_conf); } return 0; } ServerConfiguration *cfgmgr_get_server_config() { //cfg_ref(current_config); return current_config; }