projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a "special" return value: abort.
[apps/pfixtools.git]
/
postlicyd
/
filter.c
diff --git
a/postlicyd/filter.c
b/postlicyd/filter.c
index
6556422
..
4bab4c9
100644
(file)
--- a/
postlicyd/filter.c
+++ b/
postlicyd/filter.c
@@
-43,6
+43,13
@@
static filter_destructor_t destructors[FTK_count];
static bool hooks[FTK_count][HTK_count];
static bool params[FTK_count][ATK_count];
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_type_t filter_register(const char *type, filter_constructor_t constructor,
filter_destructor_t destructor, filter_runner_t runner)
{
@@
-133,21
+140,25
@@
void filter_wipe(filter_t *filter)
p_delete(&filter->name);
}
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;
{
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);
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) {
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;
return hook;
} else if (res < hook->type) {
end = mid;
@@
-157,7
+168,7
@@
filter_hook_t *filter_run(const filter_t *filter, const query_t *query)
}
syslog(LOG_WARNING, "missing hook %s for filter %s",
htokens[res], filter->name);
}
syslog(LOG_WARNING, "missing hook %s for filter %s",
htokens[res], filter->name);
- return
NULL
;
+ return
&default_hook
;
}
void filter_set_name(filter_t *filter, const char *name, ssize_t len)
}
void filter_set_name(filter_t *filter, const char *name, ssize_t len)
@@
-201,7
+212,7
@@
bool filter_add_hook(filter_t *filter, const char *name, ssize_t name_len,
syslog(LOG_ERR, "unknown hook type %.*s", name_len, name);
return false;
}
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;
syslog(LOG_ERR, "hook %s not is valid for filter %s",
htokens[hook.type], ftokens[filter->type]);
return false;