#include "config.h"
struct config_t {
- filter_t *filters;
- int filters_len;
- int filters_size;
-
+ A(filter_t) filters;
+ A(filter_params_t) params;
int entry_point;
};
void config_delete(config_t **config)
{
if (*config) {
- for (int i = 0 ; i < (*config)->filters_len ; ++i) {
- filter_wipe((*config)->filters + i);
- }
- p_delete(&(*config)->filters);
+ array_deep_wipe((*config)->filters, filter_wipe);
+ array_deep_wipe((*config)->params, filter_params_wipe);
+ p_delete(config);
}
}
+
+static bool config_second_pass(config_t *config)
+{
+ bool ok = true;
+ if (config->filters.len > 0) {
+# define QSORT_TYPE filter_t
+# define QSORT_BASE config->filters.data
+# define QSORT_NELT config->filters.len
+# define QSORT_LT(a,b) strcmp(a->name, b->name) < 0
+# include "qsort.c"
+ }
+
+ foreach (filter_t *filter, config->filters) {
+ if (!filter_update_references(filter, &config->filters)) {
+ ok = false;
+ break;
+ }
+ }}
+
+ return ok;
+}
+
config_t *config_read(const char *file)
{
config_t *config;
- //filter_t *filter = NULL;
+ filter_t filter;
file_map_t map;
const char *p;
int line = 0;
}
config = config_new();
+ filter_init(&filter);
linep = p = map.map;
#define READ_ERROR(Fmt, ...) \
- syslog(LOG_ERR, "config file %s:%d:%d: " Fmt, file, line + 1, \
- p - linep + 1, ##__VA_ARGS__)
-#define ADD_IN_BUFFER(Buffer, Len, Char) \
- if ((Len) >= BUFSIZ - 1) { \
- READ_ERROR("unreasonnable long line"); \
+ do { \
+ syslog(LOG_ERR, "config file %s:%d:%d: " Fmt, file, line + 1, \
+ p - linep + 1, ##__VA_ARGS__); \
goto error; \
- } \
- (Buffer)[(Len)++] = (Char); \
- (Buffer)[(Len)] = '\0';
-
+ } while (0)
+#define ADD_IN_BUFFER(Buffer, Len, Char) \
+ do { \
+ if ((Len) >= BUFSIZ - 1) { \
+ READ_ERROR("unreasonnable long line"); \
+ } \
+ (Buffer)[(Len)++] = (Char); \
+ (Buffer)[(Len)] = '\0'; \
+ } while (0)
#define READ_NEXT(OnEOF) \
- if (*p == '\n') { \
- ++line; \
- linep = p + 1; \
- } \
- if (++p >= map.end) { \
- OnEOF; \
- } \
- syslog(LOG_ERR, "Read char '%c' at %d", *p, __LINE__);
+ do { \
+ if (*p == '\n') { \
+ ++line; \
+ linep = p + 1; \
+ } \
+ if (++p >= map.end) { \
+ OnEOF; \
+ } \
+ } while (0)
#define READ_BLANK(OnEOF) \
do { \
bool in_comment = false; \
(Buffer)[0] = '\0'; \
if (!isalpha(*p)) { \
READ_ERROR("invalid %s, unexpected character '%c'", Name, *p); \
- goto error; \
} \
do { \
ADD_IN_BUFFER(Buffer, Len, *p); \
- READ_NEXT(goto badeof) \
+ READ_NEXT(goto badeof); \
} while (isalnum(*p) || *p == '_'); \
} while (0)
#define READ_STRING(Name, Buffer, Len, OnEOF) \
while (true) { \
if (*p == '\n') { \
READ_ERROR("string must not contain EOL"); \
- goto error; \
} else if (escaped) { \
ADD_IN_BUFFER(Buffer, Len, *p); \
escaped = false; \
} \
if (*p != ';') { \
READ_ERROR("%s must end with a ';'", Name); \
- goto error; \
} \
} else { \
bool escaped = false; \
ADD_IN_BUFFER(Buffer, Len, '\\'); \
} \
} \
- READ_NEXT(OnEOF) \
- syslog(LOG_ERR, "string read: %s", Buffer); \
+ READ_NEXT(OnEOF); \
} while(0)
read_section:
- syslog(LOG_ERR, "read_section");
if (p >= map.end) {
goto ok;
}
READ_BLANK(goto badeof);
switch (*p) {
case '=':
- READ_NEXT(goto badeof)
+ READ_NEXT(goto badeof);
goto read_param_value;
case '{':
- READ_NEXT(goto badeof)
+ READ_NEXT(goto badeof);
goto read_filter;
default:
READ_ERROR("invalid character '%c', expected '=' or '{'", *p);
- goto error;
}
read_param_value:
- syslog(LOG_ERR, "read_param_value: key=%s", key);
READ_BLANK(goto badeof);
READ_STRING("parameter value", value, value_len, ;);
- /* TODO: Insert parameter in the configuration.
- */
+ {
+ filter_params_t param;
+ param.name = strdup(key);
+ param.value = strdup(value);
+ array_add(config->params, param);
+ }
goto read_section;
read_filter:
- syslog(LOG_ERR, "read_filter: key=%s", key);
- /* TODO: Create a filter with the given name.
- */
+ filter_set_name(&filter, key, key_len);
READ_BLANK(goto badeof);
while (*p != '}') {
READ_TOKEN("filter parameter name", key, key_len);
- syslog(LOG_ERR, "read parameter: key=%s", key);
READ_BLANK(goto badeof);
if (*p != '=') {
READ_ERROR("invalid character '%c', expected '='", *p);
- goto error;
}
READ_NEXT(goto badeof);
READ_BLANK(goto badeof);
READ_STRING("filter parameter value", value, value_len, goto badeof);
READ_BLANK(goto badeof);
- /* TODO: Insert parameter in the filter.
- */
+ if (strcmp(key, "type") == 0) {
+ if (!filter_set_type(&filter, value, value_len)) {
+ READ_ERROR("unknow filter type (%s) for filter %s",
+ value, filter.name);
+ }
+ } else if (key_len > 3 && strncmp(key, "on_", 3) == 0) {
+ if (!filter_add_hook(&filter, key + 3, key_len - 3,
+ value, value_len)) {
+ READ_ERROR("hook %s not supported by filter %s",
+ key + 3, filter.name);
+ }
+ } else {
+ if (!filter_add_param(&filter, key, key_len, value, value_len)) {
+ goto error;
+ }
+ }
}
- READ_NEXT(;)
- /* TODO: Check the filter.
- */
+ READ_NEXT(;);
+ if (!filter_build(&filter)) {
+ READ_ERROR("invalid filter %s", filter.name);
+ }
+ array_add(config->filters, filter);
+ filter_init(&filter);
goto read_section;
ok:
+ if (!config_second_pass(config)) {
+ goto error;
+ }
+ file_map_close(&map);
return config;
badeof:
syslog(LOG_ERR, "Unexpected end of file");
error:
+ filter_wipe(&filter);
config_delete(&config);
+ file_map_close(&map);
return NULL;
}