Sat, 14 Jan 2017 11:27:55 +0100
fixes server user init
/* * 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 <string.h> #include "serverconf.h" ServerConfig *load_server_config(char *file) { FILE *in = fopen(file, "r"); if(in == NULL) { return NULL; } ServerConfig *conf = malloc(sizeof(ServerConfig)); conf->parser.parse = serverconf_parse; conf->file = file; conf->obj = NULL; conf->objects = ucx_map_new(16); int r = cfg_parse_basic_file((ConfigParser*)conf, in); cfg_map_destr(conf->parser.mp->pool, conf->objects); if(r != 0) { // TODO: free return NULL; } fclose(in); return conf; } void free_server_config(ServerConfig *conf) { ucx_mempool_destroy(conf->parser.mp->pool); free(conf); } int serverconf_parse(void *p, ConfigLine *begin, ConfigLine *end, sstr_t line){ ServerConfig *conf = p; UcxAllocator *mp = conf->parser.mp; begin->type = cfg_get_line_type(line); switch(begin->type) { case LINE_BEGIN_TAG: { ConfigTag *tag = cfg_parse_begin_tag(line, conf->parser.mp); // create server config object ServerConfigObject *obj = OBJ_NEW( conf->parser.mp, ServerConfigObject); obj->type = tag->name; obj->begin = begin; obj->end = end; obj->directives = NULL; // add object to server config UcxList *list = ucx_map_sstr_get(conf->objects, obj->type); list = ucx_list_append_a(mp, list, obj); ucx_map_sstr_put(conf->objects, obj->type, list); conf->obj = obj; break; } case LINE_END_TAG: { sstr_t tag = cfg_get_end_tag_name(line); if(sstrcmp(tag, conf->obj->type) != 0) { log_ereport(LOG_FAILURE, "server.conf: syntax error: wrong close tag"); log_ereport(LOG_FAILURE, "open tag: %s close tag: %s", sstrdup(tag).ptr, sstrdup(conf->obj->type).ptr); exit(-1); } conf->obj = NULL; break; } case LINE_DIRECTIVE: { if(conf->obj == NULL) { log_ereport(LOG_FAILURE, "server.conf: directive outside of object"); exit(-1); } ConfigDirective *d = cfg_parse_directive(line, conf->parser.mp); d->begin = begin; d->end = end; //printf("%s.%s\n", conf->obj->type.ptr, d->directive_type.ptr); conf->obj->directives = ucx_list_append_a(mp, conf->obj->directives, d); } } return 0; } UcxList* srvcfg_get_listeners(ServerConfig *cfg, UcxAllocator *mp, int *error) { mp = mp ? mp : cfg->parser.mp; UcxList *list = ucx_map_sstr_get(cfg->objects, sstrn("Listener", 8)); UcxList *lslist = NULL; UCX_FOREACH(elm, list) { ServerConfigObject *ls = elm->data; sstr_t name = cfg_directivelist_get_str(ls->directives, sstr("Name")); sstr_t port = cfg_directivelist_get_str(ls->directives, sstr("Port")); sstr_t vs = cfg_directivelist_get_str( ls->directives, sstr("DefaultVS")); sstr_t threadpool = cfg_directivelist_get_str( ls->directives, sstr("Threadpool")); CfgListener *listener = OBJ_NEW_N(mp, CfgListener); // threadpool is optional, all other configs must be set if(!name.ptr || !port.ptr || !vs.ptr) { // TODO: log error *error = 1; listener->cfg_correct = 0; } else { listener->cfg_correct = 1; } if(name.ptr) { listener->name = sstrdup_a(mp, name); } if(port.ptr) { // don't expect that port is null terminated, sstrdup it to be sure sstr_t portdp = sstrdup(port); listener->port = atoi(portdp.ptr); free(portdp.ptr); } if(vs.ptr) { listener->vs = sstrdup_a(mp, vs); } if(threadpool.ptr) { listener->threadpool = sstrdup_a(mp, threadpool); } lslist = ucx_list_append_a(mp, lslist, listener); } return lslist; }