static bool hooks[FTK_count][HTK_count];
static bool params[FTK_count][ATK_count];
+static const filter_hook_t default_hook = {
+ .type = 0,
+ .value = (char*)"DUNNO",
+ .postfix = true,
+ .filter_id = 0
+};
+
filter_type_t filter_register(const char *type, filter_constructor_t constructor,
filter_destructor_t destructor, filter_runner_t runner)
{
filter_token tok = filter_tokenize(type, m_strlen(type));
CHECK_FILTER(tok);
- syslog(LOG_DEBUG, "filter type %s registered", type);
-
runners[tok] = runner;
constructors[tok] = constructor;
destructors[tok] = destructor;
CHECK_FILTER(filter);
CHECK_HOOK(tok);
- syslog(LOG_DEBUG, "hook %s registered for filter type %s", name,
- ftokens[filter]);
-
hooks[filter][tok] = true;
return tok;
}
CHECK_FILTER(filter);
CHECK_PARAM(tok);
- syslog(LOG_INFO, "param %s registered for filter type %s", name,
- ftokens[filter]);
-
params[filter][tok] = true;
return tok;
}
return true;
}
+static inline bool filter_check_loop(filter_t *filter, A(filter_t) *array, int level)
+{
+ if (filter->last_seen == level) {
+ return true;
+ }
+ filter->last_seen = level;
+ foreach (filter_hook_t *hook, filter->hooks) {
+ if (hook->postfix) {
+ continue;
+ }
+ if (hook->filter_id == level) {
+ return false;
+ }
+ if (!filter_check_loop(array_ptr(*array, hook->filter_id), array, level)) {
+ return false;
+ }
+ }}
+ return true;
+}
+
+bool filter_check_safety(A(filter_t) *array)
+{
+ foreach (filter_t *filter, *array) {
+ if (!filter_check_loop(filter, array, __Ai)) {
+ syslog(LOG_ERR, "the filter tree contains a loop");
+ return false;
+ }
+ }}
+ return true;
+}
+
void filter_wipe(filter_t *filter)
{
filter_destructor_t destructor = destructors[filter->type];
p_delete(&filter->name);
}
-filter_hook_t *filter_run(const filter_t *filter, const query_t *query)
+const filter_hook_t *filter_run(const filter_t *filter, const query_t *query)
{
int start = 0;
int end = filter->hooks.len;
- syslog(LOG_DEBUG, "running filter %s (%s)",
- filter->name, ftokens[filter->type]);
+ //syslog(LOG_DEBUG, "running filter %s (%s)",
+ // filter->name, ftokens[filter->type]);
filter_result_t res = runners[filter->type](filter, query);
- syslog(LOG_DEBUG, "filter run, result is %s", htokens[res]);
+
+ if (res == HTK_ABORT) {
+ return NULL;
+ }
+ //syslog(LOG_DEBUG, "filter run, result is %s", htokens[res]);
while (start < end) {
int mid = (start + end) / 2;
filter_hook_t *hook = array_ptr(filter->hooks, mid);
if (hook->type == res) {
- syslog(LOG_DEBUG, "return hook of type %s, value %s",
- htokens[hook->type], hook->value);
+ //syslog(LOG_DEBUG, "return hook of type %s, value %s",
+ // htokens[hook->type], hook->value);
return hook;
} else if (res < hook->type) {
end = mid;
}
syslog(LOG_WARNING, "missing hook %s for filter %s",
htokens[res], filter->name);
- return NULL;
+ return &default_hook;
+}
+
+bool filter_test(const filter_t *filter, const query_t *query, filter_result_t result)
+{
+ return !!(runners[filter->type](filter, query) == result);
}
void filter_set_name(filter_t *filter, const char *name, ssize_t len)
{
- filter->name = p_new(char, len + 1);
- memcpy(filter->name, name, len);
- filter->name[len] = '\0';
+ filter->name = p_dupstr(name, len);
}
bool filter_set_type(filter_t *filter, const char *type, ssize_t len)
atokens[param.type], ftokens[filter->type]);
return false;
}
- param.value = m_strdup(value);
+ param.value = p_dupstr(value, value_len);
+ param.value_len = value_len;
array_add(filter->params, param);
return true;
}
syslog(LOG_ERR, "unknown hook type %.*s", name_len, name);
return false;
}
- if (!hooks[filter->type][hook.type]) {
+ if (!hooks[filter->type][hook.type] || hook.type == HTK_ABORT) {
syslog(LOG_ERR, "hook %s not is valid for filter %s",
htokens[hook.type], ftokens[filter->type]);
return false;