webserver: comparison src/server/daemon/config.c

-:279f343bbf6c
+:fac51f87def0
 InitConfig *cfg = load_init_config(file);
 if(cfg == NULL) {
 fprintf(stderr, "Cannot load init.conf\n");
 return 1;
 }
-UcxMempool *mp = cfg->parser.mp;
+UcxAllocator *mp = cfg->parser.mp;
 cfg_pool = pool_create(); // one pool for one Configuration
-UcxDlist *dirs = cfg->directives;
+UcxList *dirs = cfg->directives;
 while(dirs != NULL) {
 ConfigDirective *dir = dirs->data;
 /* create NSAPI directive */
 directive *d = malloc(sizeof(directive));
 // horrible error
 return NULL;
 }
 UcxList *list = ucx_map_sstr_get(serverconf->objects, sstrn("Runtime", 7));
-UCX_FOREACH(UcxList*, list, elm) {
+UCX_FOREACH(elm, list) {
 ServerConfigObject *scfgobj = elm->data;
 if(cfg_handle_runtime(serverconfig, scfgobj)) {
 // error
 return NULL;
 }
 }
 list = ucx_map_sstr_get(serverconf->objects, sstrn("Threadpool", 10));
-UCX_FOREACH(UcxList*, list, elm) {
+UCX_FOREACH(elm, list) {
 if(cfg_handle_threadpool(serverconfig, elm->data)) {
 return NULL;
 }
 }
 // check thread pool config
 /* critical error */
 return NULL;
 }
 list = ucx_map_sstr_get(serverconf->objects, sstrn("EventHandler", 12));
-UCX_FOREACH(UcxList*, list, elm) {
+UCX_FOREACH(elm, list) {
 if(cfg_handle_eventhandler(
 serverconfig, (ServerConfigObject*)elm->data)) {
 // error
 return NULL;
 }
 /* critical error */
 return NULL;
 }
 list = ucx_map_sstr_get(serverconf->objects, sstrn("AccessLog", 9));
-UCX_FOREACH(UcxList*, list, elm) {
+UCX_FOREACH(elm, list) {
 ServerConfigObject *scfgobj = elm->data;
 if(cfg_handle_accesslog(serverconfig, scfgobj)) {
 return NULL;
 }
 }
 list = ucx_map_sstr_get(serverconf->objects, sstrn("AuthDB", 6));
-UCX_FOREACH(UcxList*, list, elm) {
+UCX_FOREACH(elm, list) {
 ServerConfigObject *scfgobj = elm->data;
 if(cfg_handle_authdb(serverconfig, scfgobj)) {
 return NULL;
 }
 }
 list = ucx_map_sstr_get(serverconf->objects, sstrn("Listener", 8));
-UCX_FOREACH(UcxList*, list, elm) {
+UCX_FOREACH(elm, list) {
 ServerConfigObject *scfgobj = elm->data;
 if(cfg_handle_listener(serverconfig, scfgobj)) {
 return NULL;
 }
 }
 list = ucx_map_sstr_get(serverconf->objects, sstrn("VirtualServer", 13));
-UCX_FOREACH(UcxList*, list, elm) {
+UCX_FOREACH(elm, list) {
 ServerConfigObject *scfgobj = elm->data;
 if(cfg_handle_vs(serverconfig, scfgobj)) {
 return NULL;
 }
 }
 }
 int cfg_handle_runtime(ServerConfiguration *cfg, ServerConfigObject *obj) {
 sstr_t user = cfg_directivelist_get_str(obj->directives, sstr("User"));
 if(user.ptr) {
-cfg->user = sstrdup_pool(cfg->pool, user);
+//cfg->user = sstrdup_pool(cfg->pool, user);
 }
 sstr_t tmp = cfg_directivelist_get_str(obj->directives, sstr("Temp"));
 if(tmp.ptr) {
 cfg->tmp = sstrdup_pool(cfg->pool, tmp);
 } else {
 sstr_t base = sstr("config/");
 sstr_t file;
 file.length = base.length + mf.length;
 file.ptr = alloca(file.length + 1);
 file.ptr[file.length] = 0;
-file = sstrncat(2, file, base, mf);
+file = sstrncat(file, 2, base, mf);
 ConfigFile *f = cfgmgr_get_file(file);
 if(f == NULL) {
 f = malloc(sizeof(ConfigFile));
 f->data = NULL;
 sstr_t base = sstr("config/");
 sstr_t file;
 file.length = base.length + objfile.length + 1;
 file.ptr = alloca(file.length);
 file.ptr[file.length] = 0;
-file = sstrncat(2, file, base, objfile);
+file = sstrncat(file, 2, base, objfile);
 // the file is managed by the configuration manager
 ConfigFile *f = cfgmgr_get_file(file);
 if(f == NULL) {
 f = malloc(sizeof(ConfigFile));
 // load acl config file
 file.length = base.length + aclfile.length + 1;
 file.ptr = alloca(file.length);
 file.ptr[file.length] = 0;
-file = sstrncat(2, file, base, aclfile);
+file = sstrncat(file, 2, base, aclfile);
 ConfigFile *aclf = cfgmgr_get_file(file);
 if(aclf == NULL) {
 aclf = malloc(sizeof(ConfigFile));
 aclf->data = NULL;
 HTTPObjectConfig* load_obj_conf(char *file) {
 printf("load_obj_conf\n");
 // new conf function test
 ObjectConfig *cfg = load_object_config(file);
-UcxMempool   *mp = cfg->parser.mp;
+UcxAllocator *mp = cfg->parser.mp;
 if(cfg == NULL) {
 return NULL;
 }
 // create object config
 conf->pool = pool;
 // convert ObjectConfig to HTTPObjectConfig
 // add objects
-conf->nobj = ucx_dlist_size(cfg->objects);
+conf->nobj = ucx_list_size(cfg->objects);
 conf->objects = pool_calloc(pool, conf->nobj, sizeof(httpd_object*));
-UcxDlist *objlist = cfg->objects;
+UcxList *objlist = cfg->objects;
 int i = 0;
 while(objlist != NULL) {
 ConfigObject *cob = objlist->data;
 // get name and ppath
 conf->objects[i] = obj;
 // add directives
 for(int i=0;i<6;i++) {
-UcxDlist *dirs = cob->directives[i];
+UcxList *dirs = cob->directives[i];
 while(dirs != NULL) {
 ConfigDirective *cfgdir = dirs->data;
 directive *d = pool_malloc(pool, sizeof(directive));
 if(cfgdir->condition) {
 mimemap->ref = 1;
 UcxMap *map = ucx_map_new((mimecfg->ntypes * 3) / 2);
 mimemap->map = map;
 // add ext type pairs
-UCX_FOREACH(UcxList*, mimecfg->directives, md) {
+UCX_FOREACH(md, mimecfg->directives) {
 MimeDirective *d = md->data;
 // add the type for each extension to the map
-UCX_FOREACH(UcxList*, d->exts, xl) {
+UCX_FOREACH(xl, d->exts) {
 sstr_t ext = sstr(xl->data);
 sstr_t value = sstrdup(d->type);
 ucx_map_sstr_put(map, ext, value.ptr);
 }
 }
 int acl_conf_reload(ConfigFile *file, ServerConfiguration *cfg) {
 ACLFile *aclfile = load_acl_file(file->file.ptr);
 ACLData *acldata = acl_data_new();
-UCX_FOREACH(UcxList*, aclfile->namedACLs, elm) {
+UCX_FOREACH(elm, aclfile->namedACLs) {
 ACLConfig *ac = elm->data;
 ACLList *acl = acl_config_convert(cfg, ac);
 printf("put acl: %s\n", ac->id.ptr);
 ucx_map_sstr_put(acldata->namedACLs, ac->id, acl);
 }
 WSAce **eces = calloc(s, sizeof(WSAce*));
 int ai = 0;
 int ei = 0;
 // convert entries
-UCX_FOREACH(UcxList*, acl->entries, elm) {
+UCX_FOREACH(elm, acl->entries) {
 ACEConfig *acecfg = elm->data;
 // copy data
 WSAce *ace = malloc(sizeof(WSAce));
 ace->access_mask = acecfg->access_mask;
 return 1;
 }
 Keyfile *keyfile = keyfile_new();
-UCX_FOREACH(UcxList*, conf->users, elm) {
+UCX_FOREACH(elm, conf->users) {
 KeyfileEntry *user = elm->data;
 keyfile_add_user(
 keyfile,
 user->name,
 user->hashtype,

Mercurial > hg > webserver / file comparison

comparison: src/server/daemon/config.c

src/server/daemon/config.c