--- a/src/server/daemon/vserver.h Wed Nov 02 19:19:01 2022 +0100 +++ b/src/server/daemon/vserver.h Sun Nov 06 15:53:32 2022 +0100 @@ -29,7 +29,7 @@ #ifndef VSERVER_H #define VSERVER_H -#include <ucx/string.h> +#include <cx/string.h> #include "../util/object.h" #include "../public/nsapi.h" @@ -41,19 +41,32 @@ extern "C" { #endif +typedef struct VSLocation VSLocation; + +struct VSLocation { + VSLocation *child_begin; + VSLocation *child_end; + + VSLocation *next; +}; + struct VirtualServer { - sstr_t name; - sstr_t host; + cxmutstr name; + cxmutstr host; // TODO: list of listeners, check listener of vs - sstr_t objectfile; + cxmutstr objectfile; HTTPObjectConfig *objects; - sstr_t document_root; + cxmutstr document_root; ACLData *acls; AccessLog *log; + VSLocation *locations_begin; + VSLocation *locations_end; + + uint32_t ref; // reference counter };