Mercurial > hg > webserver / changeset

--- a/src/server/admin/admin.c	Mon Aug 24 17:09:16 2020 +0200
+++ b/src/server/admin/admin.c	Mon Aug 24 19:19:56 2020 +0200
@@ -34,7 +34,6 @@
 #include "../util/pblock.h"
 
 #include "../config/conf.h"
-#include "../config/serverconf.h"
 #include "../config/objconf.h"
 
 static Page *root_page;

--- a/src/server/config/objs.mk	Mon Aug 24 17:09:16 2020 +0200
+++ b/src/server/config/objs.mk	Mon Aug 24 19:19:56 2020 +0200
@@ -33,11 +33,9 @@
 CONFOBJ = objconf.o
 CONFOBJ += conf.o
 CONFOBJ += initconf.o
-CONFOBJ += serverconf.o
 CONFOBJ += mimeconf.o
 CONFOBJ += acl.o
 CONFOBJ += keyfile.o
-
 CONFOBJ += serverconfig.o
 
 CONFOBJS = $(CONFOBJ:%=$(CONF_OBJPRE)%)

--- a/src/server/config/serverconf.c	Mon Aug 24 17:09:16 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/*
- * 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"
-
-ServerConfig2 *load_server_config(char *file) {
-    FILE *in = fopen(file, "r");
-    if(in == NULL) {
-        return NULL;
-    }
-
-    ServerConfig2 *conf = malloc(sizeof(ServerConfig2));
-    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(ServerConfig2 *conf) {
-    ucx_mempool_destroy(conf->parser.mp->pool);
-    free(conf);
-}
-
-int serverconf_parse(void *p, ConfigLine *begin, ConfigLine *end, sstr_t line){
-    ServerConfig2 *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;
-}
-
-

--- a/src/server/config/serverconf.h	Mon Aug 24 17:09:16 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef SERVERCONF_H
-#define	SERVERCONF_H
-
-#include "conf.h"
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-typedef struct _server_conf_obj {
-    ConfigLine   *begin;
-    ConfigLine   *end;
-
-    sstr_t       type;
-    UcxList     *directives;
-} ServerConfigObject;
-
-typedef struct _server_conf {
-    ConfigParser parser;
-    char         *file;
-    UcxMap       *objects;  // contains UcxList of ServerConfigObject
-    // parser temp vars
-    ServerConfigObject *obj;
-} ServerConfig2;
-
-
-
-/*
- * Loads and parses a server configuration file. The function only structures
- * the file content to configuration objects with directives. The semantics
- * of the objects and directives can be extracted with the srvcfg_* funcsions.
- */
-ServerConfig2 *load_server_config(char *file);
-
-/*
- * frees the ServerConfig object
- */
-void free_server_config(ServerConfig2 *conf);
-
-// private - parses a server.conf line
-int serverconf_parse(void *p, ConfigLine *begin, ConfigLine *end, sstr_t line);
-
-
-
-
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* SERVERCONF_H */
-

--- a/src/server/config/serverconfig.c	Mon Aug 24 17:09:16 2020 +0200
+++ b/src/server/config/serverconfig.c	Mon Aug 24 19:19:56 2020 +0200
@@ -134,7 +134,7 @@
     return token;
 }
 
-
+/*
 static void test_print_config(ConfigNode *parent) {
     UCX_FOREACH(elm, parent->children) {
         ConfigNode *node = elm->data;
@@ -154,6 +154,7 @@
         }
     }
 }
+*/
 
 ServerConfig* serverconfig_parse(scstr_t content) {
     UcxMempool *mp = ucx_mempool_new(512);

--- a/src/server/daemon/config.h	Mon Aug 24 17:09:16 2020 +0200
+++ b/src/server/daemon/config.h	Mon Aug 24 19:19:56 2020 +0200
@@ -35,7 +35,6 @@
 
 #include "../config/objconf.h"
 #include "../config/initconf.h"
-#include "../config/serverconf.h"
 #include "../config/mimeconf.h"
 #include "../config/acl.h"
 #include "../config/keyfile.h"

--- a/src/tools/wstool.c	Mon Aug 24 17:09:16 2020 +0200
+++ b/src/tools/wstool.c	Mon Aug 24 19:19:56 2020 +0200
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../server/config/serverconf.h"
+#include "../server/config/serverconfig.h"
 
 #include "srvctrlsocket.h"
 
@@ -61,8 +61,8 @@
 }
 
 int tool_get_tmpdir(char *configfile) {
-    ServerConfig2 *serverconf = load_server_config(configfile);
-    UcxList *list = ucx_map_sstr_get(serverconf->objects, sstrn("Runtime", 7));
+    ServerConfig *serverconf = serverconfig_load(configfile);
+    UcxList *list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("Runtime"));
     if(!list) {
         fprintf(stderr, "Error: No Runtime element in %s\n", configfile);
         return -1;
@@ -71,8 +71,11 @@
         fprintf(stderr, "Error: Multiple Runtime elements in %s\n", configfile);
         return -1;
     }
-    ServerConfigObject *runtime = list->data;
-    sstr_t tmp = cfg_directivelist_get_str(runtime->directives, sstr("Temp"));
+    ConfigNode *runtime = list->data;
+    scstr_t tmp = serverconfig_directive_value(runtime, SC("Temp"));
+    
+    ucx_list_free(list);
+    
     if(!tmp.ptr) {
         fprintf(stderr, "Error: No Temp directive in Runtime Object\n");
         return -1;