diff -r b7dcc9c4f270 -r f1d29785ad2d src/server/config/objconf.h --- a/src/server/config/objconf.h Mon Nov 07 17:59:44 2022 +0100 +++ b/src/server/config/objconf.h Mon Nov 07 22:30:12 2022 +0100 @@ -31,6 +31,9 @@ #include "conf.h" + +#include "serverconfig.h" + #ifdef __cplusplus extern "C" { #endif @@ -73,6 +76,24 @@ } ObjectConfig; +// TODO: rename to ObjectConfig after old ObjectConfig is removed +typedef struct ObjectConfig2 { + CxMempool *mp; + ConfigNode *root; +} ObjectConfig2; + +ObjectConfig2* objectconf_load(const char *file); + +void objectconf_free(ObjectConfig2 *objconf); + +int objectconf_validate_directive(ConfigParser2 *parser, ConfigNode *node); + +int objectconf_validate_objbegin(ConfigParser2 *parser, ConfigNode *node); + +int objectconf_validate_objend(ConfigParser2 *parser, ConfigNode *node); + + + ObjectConfig *load_object_config(char *file); void free_object_config(ObjectConfig *conf);