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)
+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);
+ //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 NULL;
}
void filter_set_name(filter_t *filter, const char *name, ssize_t len)
bool filter_add_param(filter_t *filter, const char *name, ssize_t name_len,
const char *value, ssize_t value_len)
{
- filter_params_t param;
+ filter_param_t param;
param.type = param_tokenize(name, name_len);
if (param.type == ATK_UNKNOWN) {
syslog(LOG_ERR, "unknown parameter %.*s", name_len, name);