X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fconfig.c;h=871a71f649ba259b1b62fd295f809b72f432e0ae;hb=929bb1ca2452a5bc7410896fd4e5eea44901a0b7;hp=e165e811214f8e6ab04a72439bf89919ee215ace;hpb=b657c12aaba7e4d8504d646b30ce712742ab791d;p=apps%2Fpfixtools.git diff --git a/postlicyd/config.c b/postlicyd/config.c index e165e81..871a71f 100644 --- a/postlicyd/config.c +++ b/postlicyd/config.c @@ -38,10 +38,8 @@ #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; }; @@ -55,20 +53,42 @@ static inline config_t *config_new(void) 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; + const char *linep; char key[BUFSIZ]; char value[BUFSIZ]; @@ -79,45 +99,55 @@ config_t *config_read(const char *file) } config = config_new(); - p = map.map; + filter_init(&filter); + linep = p = map.map; #define READ_ERROR(Fmt, ...) \ - syslog(LOG_ERR, "config file %s:%d: " Fmt, file, line, ##__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 >= map.end) { \ - OnEOF; \ - } -#define READ_BLANK(OnEOF) \ - while (isblank(*p)) { \ + do { \ if (*p == '\n') { \ ++line; \ + linep = p + 1; \ } \ - READ_NEXT(OnEOF); \ - } + if (++p >= map.end) { \ + OnEOF; \ + } \ + } while (0) +#define READ_BLANK(OnEOF) \ + do { \ + bool in_comment = false; \ + while (in_comment || isspace(*p) || *p == '#') { \ + if (*p == '\n') { \ + in_comment = false; \ + } else if (*p == '#') { \ + in_comment = true; \ + } \ + READ_NEXT(OnEOF); \ + } \ + } while (0) #define READ_TOKEN(Name, Buffer, Len) \ do { \ (Len) = 0; \ (Buffer)[0] = '\0'; \ if (!isalpha(*p)) { \ READ_ERROR("invalid %s, unexpected character '%c'", Name, *p); \ - goto error; \ } \ do { \ ADD_IN_BUFFER(Buffer, Len, *p); \ - if ((Len) >= BUFSIZ - 1) { \ - READ_ERROR("unreasonnable long token"); \ - goto error; \ - } \ - (Buffer)[(Len)++] = *p; \ - READ_NEXT(goto badeof) \ + READ_NEXT(goto badeof); \ } while (isalnum(*p) || *p == '_'); \ } while (0) #define READ_STRING(Name, Buffer, Len, OnEOF) \ @@ -131,7 +161,6 @@ config_t *config_read(const char *file) 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; \ @@ -149,12 +178,10 @@ config_t *config_read(const char *file) } \ if (*p != ';') { \ READ_ERROR("%s must end with a ';'", Name); \ - goto error; \ } \ } else { \ bool escaped = false; \ - READ_NEXT(goto badeof); \ - while (*p != ';' && isascii(*p) && isprint(*p)) { \ + while (*p != ';' && isascii(*p) && (isprint(*p) || isspace(*p))) { \ if (escaped) { \ if (*p == '\r' || *p == '\n') { \ READ_BLANK(goto badeof); \ @@ -176,7 +203,7 @@ config_t *config_read(const char *file) ADD_IN_BUFFER(Buffer, Len, '\\'); \ } \ } \ - READ_NEXT(OnEOF) \ + READ_NEXT(OnEOF); \ } while(0) @@ -193,45 +220,77 @@ read_section: 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: 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: - /* 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); READ_BLANK(goto badeof); + if (*p != '=') { + READ_ERROR("invalid character '%c', expected '='", *p); + } + READ_NEXT(goto badeof); + READ_BLANK(goto badeof); READ_STRING("filter parameter value", value, value_len, goto badeof); - /* TODO: Insert parameter in the filter. - */ + READ_BLANK(goto badeof); + 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(;); + if (!filter_build(&filter)) { + READ_ERROR("invalid filter %s", filter.name); } - /* TODO: Check the filter. - */ + 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; }