diff -r cee3e65e789c -r 137197831306 src/server/object.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/server/object.c Sun Oct 30 16:26:57 2011 +0100 @@ -0,0 +1,88 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2011 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 "nsapi.h" + +#include "object.h" + +#include "func.h" + + + +httpd_object* object_new(char *name) { + // TODO: Speicherverwaltung + httpd_object *obj = malloc(sizeof(httpd_object)); + obj->name = name; + + // create directive table + obj->dt = calloc(sizeof(struct dtable), NUM_NSAPI_TYPES - 1); + obj->nd = NUM_NSAPI_TYPES - 1; + + return obj; +} + +void object_free(httpd_object *obj) { + free(obj->name); + // TODO: free objects + free(obj->dt); +} + + +void object_add_directive(httpd_object *obj, directive *dir, int dt) { + dtable *l = object_get_dtable(obj, dt); + // allocate space for the new directive + l->directive = realloc(l->directive, (l->ndir+1)*sizeof(directive*)); + // add directive + l->directive[l->ndir] = dir; + l->ndir++; +} + + + + +httpd_objset* create_test_objset() { + httpd_objset *objset = malloc(sizeof(httpd_objset)); + objset->obj = calloc(1, sizeof(httpd_object*)); + + httpd_object *obj = object_new("default"); + objset->obj[0] = obj; + objset->pos = 1; + + directive *d1 = malloc(sizeof(directive)); + d1->func = get_function("test-nametrans"); + d1->param = NULL; + object_add_directive(obj, d1, NSAPINameTrans); + + directive *d2 = malloc(sizeof(directive)); + d2->func = get_function("test-service"); + d2->param = NULL; + object_add_directive(obj, d2, NSAPIService); + + return objset; +} +