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_INFO, "filter type %s registered", type);
+ syslog(LOG_DEBUG, "filter type %s registered", type);
runners[tok] = runner;
constructors[tok] = constructor;
CHECK_FILTER(filter);
CHECK_HOOK(tok);
- syslog(LOG_INFO, "hook %s registered for filter type %s", name,
+ syslog(LOG_DEBUG, "hook %s registered for filter type %s", name,
ftokens[filter]);
hooks[filter][tok] = true;
p_delete(&filter->name);
}
-filter_result_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)
{
- return runners[filter->type](filter, query);
+ int start = 0;
+ int end = filter->hooks.len;
+ //syslog(LOG_DEBUG, "running filter %s (%s)",
+ // filter->name, ftokens[filter->type]);
+ filter_result_t res = runners[filter->type](filter, query);
+
+ 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);
+ return hook;
+ } else if (res < hook->type) {
+ end = mid;
+ } else {
+ start = mid + 1;
+ }
+ }
+ syslog(LOG_WARNING, "missing hook %s for filter %s",
+ htokens[res], filter->name);
+ return &default_hook;
}
void filter_set_name(filter_t *filter, const char *name, ssize_t len)
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;