X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Ffilter.c;h=b7e2334f8a41b5bcf8bfd5cb7bd218dbf701ed9f;hb=9fc48ba2176a71585c13cd346968bdba499e80de;hp=e5b8f35f14ab38e80c672fe0d55e48dae9857e1a;hpb=d8b00b7c6eb72ef123eeb85016649742932c38d9;p=apps%2Fpfixtools.git

diff --git a/postlicyd/filter.c b/postlicyd/filter.c
index e5b8f35..b7e2334 100644
--- a/postlicyd/filter.c
+++ b/postlicyd/filter.c
@@ -41,6 +41,7 @@ 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];
 
 filter_type_t filter_register(const char *type, filter_constructor_t constructor,
                               filter_destructor_t destructor, filter_runner_t runner)
@@ -48,7 +49,7 @@ filter_type_t filter_register(const char *type, filter_constructor_t constructor
     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;
@@ -63,13 +64,27 @@ filter_result_t filter_hook_register(filter_type_t filter,
     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;
     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;
@@ -118,9 +133,31 @@ void filter_wipe(filter_t *filter)
     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)
@@ -139,8 +176,17 @@ 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_params_t param;
-    param.name = m_strdup(name);
+    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;
@@ -156,7 +202,7 @@ bool filter_add_hook(filter_t *filter, const char *name, ssize_t name_len,
         return false;
     }
     if (!hooks[filter->type][hook.type]) {
-        syslog(LOG_ERR, "hook %s is valid for filter %s",
+        syslog(LOG_ERR, "hook %s not is valid for filter %s",
                htokens[hook.type], ftokens[filter->type]);
         return false;
     }