X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Ffilter.c;h=aadc58c2c4f1e195578fe5b750e34ca075360842;hb=86bf8f7a016cfd8475ffc363a4cac0a29a4aacfd;hp=a98d29dae8f8465193cf8d3f21c9ebdb9edbdf46;hpb=9b993811fe1fd208afd954e86c0bfc81a78af04f;p=apps%2Fpfixtools.git

diff --git a/postlicyd/filter.c b/postlicyd/filter.c
index a98d29d..aadc58c 100644
--- a/postlicyd/filter.c
+++ b/postlicyd/filter.c
@@ -40,23 +40,85 @@
 static filter_runner_t      runners[FTK_count];
 static filter_constructor_t constructors[FTK_count];
 static filter_destructor_t  destructors[FTK_count];
+static bool                 hooks[FTK_count][HTK_count];
+static bool                 params[FTK_count][ATK_count];
 
-void 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)
 {
     filter_token tok = filter_tokenize(type, m_strlen(type));
-    assert(tok != FTK_UNKNOWN && "Unknown filter type");
+    CHECK_FILTER(tok);
+
+    syslog(LOG_INFO, "filter type %s registered", type);
+
     runners[tok] = runner;
     constructors[tok] = constructor;
     destructors[tok] = destructor;
+    return tok;
+}
+
+filter_result_t filter_hook_register(filter_type_t filter,
+                                     const char *name)
+{
+    filter_result_t tok = hook_tokenize(name, m_strlen(name));
+    CHECK_FILTER(filter);
+    CHECK_HOOK(tok);
+
+    syslog(LOG_INFO, "hook %s registered for filter type %s", name,
+           ftokens[filter]);
+
+    hooks[filter][tok] = true;
+    return tok;
+}
+
+filter_param_id_t filter_param_register(filter_type_t filter,
+                                        const char *name)
+{
+    filter_param_id_t tok = param_tokenize(name, m_strlen(name));
+    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;
 }
 
 bool filter_build(filter_t *filter)
 {
+    bool ret = true;
+    if (filter->type == FTK_UNKNOWN || filter->name == NULL) {
+        return false;
+    }
+    if (filter->hooks.len > 0) {
+#       define QSORT_TYPE filter_hook_t
+#       define QSORT_BASE filter->hooks.data
+#       define QSORT_NELT filter->hooks.len
+#       define QSORT_LT(a,b) a->type < b->type
+#       include "qsort.c"
+    }
     filter_constructor_t constructor = constructors[filter->type];
     if (constructor) {
-        return constructor(filter);
+        ret = constructor(filter);
     }
+    array_deep_wipe(filter->params, filter_params_wipe);
+    return ret;
+}
+
+bool filter_update_references(filter_t *filter, A(filter_t) *filter_list)
+{
+    foreach (filter_hook_t *hook, filter->hooks) {
+        if (!hook->postfix) {
+            hook->filter_id = filter_find_with_name(filter_list, hook->value);
+            if (hook->filter_id == -1) {
+                syslog(LOG_ERR, "invalid filter name %s for hook %s",
+                       hook->value, htokens[hook->type]);
+                return false;
+            }
+            p_delete(&hook->value);
+        }
+    }}
     return true;
 }
 
@@ -66,22 +128,38 @@ void filter_wipe(filter_t *filter)
     if (destructor) {
         destructor(filter);
     }
-    p_delete(&filter->hooks);
-    p_delete(&filter->params);
+    array_deep_wipe(filter->hooks, filter_hook_wipe);
+    array_deep_wipe(filter->params, filter_params_wipe);
     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;
+    filter_result_t res = runners[filter->type](filter, query);
+
+    while (start < end) {
+        int mid = (start + end) / 2;
+        filter_hook_t *hook = array_ptr(filter->hooks, mid);
+        if (hook->type == res) {
+            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;
 }
 
-bool 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)
 {
     filter->name = p_new(char, len + 1);
     memcpy(filter->name, name, len);
     filter->name[len] = '\0';
-    return true;
 }
 
 bool filter_set_type(filter_t *filter, const char *type, ssize_t len)
@@ -93,11 +171,39 @@ bool filter_set_type(filter_t *filter, const char *type, 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_param_t param;
+    param.type = param_tokenize(name, name_len);
+    if (param.type == ATK_UNKNOWN) {
+        syslog(LOG_ERR, "unknown parameter %.*s", name_len, name);
+        return false;
+    }
+    if (!params[filter->type][param.type]) {
+        syslog(LOG_ERR, "hook %s is not valid for filter %s",
+               atokens[param.type], ftokens[filter->type]);
+        return false;
+    }
+    param.value = m_strdup(value);
+    array_add(filter->params, param);
     return true;
 }
 
 bool filter_add_hook(filter_t *filter, const char *name, ssize_t name_len,
                      const char *value, ssize_t value_len)
 {
+    filter_hook_t hook;
+    hook.type  = hook_tokenize(name, name_len);
+    if (hook.type == HTK_UNKNOWN) {
+        syslog(LOG_ERR, "unknown hook type %.*s", name_len, name);
+        return false;
+    }
+    if (!hooks[filter->type][hook.type]) {
+        syslog(LOG_ERR, "hook %s not is valid for filter %s",
+               htokens[hook.type], ftokens[filter->type]);
+        return false;
+    }
+    hook.postfix = (strncmp(value, "postfix:", 8) == 0);
+    hook.value = m_strdup(hook.postfix ? value + 8 : value);
+    hook.filter_id = -1;
+    array_add(filter->hooks, hook);
     return true;
 }