X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Ffilter.c;h=de6ba0398ec407d3acb7180142b3d0c6128505bf;hb=d39a00392903e1a3f029ec9533abf9f11835ffd3;hp=a067ef3b564699888186f64e93b605295e49c06d;hpb=4e8709f2fc6338d2774c24c9c353deca1990f600;p=apps%2Fpfixtools.git

diff --git a/postlicyd/filter.c b/postlicyd/filter.c
index a067ef3..de6ba03 100644
--- a/postlicyd/filter.c
+++ b/postlicyd/filter.c
@@ -56,8 +56,6 @@ 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_DEBUG, "filter type %s registered", type);
-
     runners[tok] = runner;
     constructors[tok] = constructor;
     destructors[tok] = destructor;
@@ -71,9 +69,6 @@ filter_result_t filter_hook_register(filter_type_t filter,
     CHECK_FILTER(filter);
     CHECK_HOOK(tok);
 
-    syslog(LOG_DEBUG, "hook %s registered for filter type %s", name,
-           ftokens[filter]);
-
     hooks[filter][tok] = true;
     return tok;
 }
@@ -85,9 +80,6 @@ filter_param_id_t filter_param_register(filter_type_t filter,
     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;
 }
@@ -129,35 +121,30 @@ bool filter_update_references(filter_t *filter, A(filter_t) *filter_list)
     return true;
 }
 
-static inline bool filter_check_loop(filter_t *filter, A(filter_t) *array, bool cleanup)
+static inline bool filter_check_loop(filter_t *filter, A(filter_t) *array, int level)
 {
-    if (cleanup) {
-        foreach (filter_t *filter2, *array) {
-            filter2->seen = false;
-        }}
-    } else if (filter->seen) {
-        return false;
-    }
-    if (filter->safe) {
+    if (filter->last_seen == level) {
         return true;
     }
-    filter->seen = true;
+    filter->last_seen = level;
     foreach (filter_hook_t *hook, filter->hooks) {
         if (hook->postfix) {
             continue;
         }
-        if (!filter_check_loop(array_ptr(*array, hook->filter_id), array, false)) {
+        if (hook->filter_id == level) {
+            return false;
+        }
+        if (!filter_check_loop(array_ptr(*array, hook->filter_id), array, level)) {
             return false;
         }
     }}
-    filter->safe = true;
     return true;
 }
 
 bool filter_check_safety(A(filter_t) *array)
 {
     foreach (filter_t *filter, *array) {
-        if (!filter_check_loop(filter, array, true)) {
+        if (!filter_check_loop(filter, array, __Ai)) {
             syslog(LOG_ERR, "the filter tree contains a loop");
             return false;
         }
@@ -209,9 +196,7 @@ const filter_hook_t *filter_run(const filter_t *filter, const query_t *query)
 
 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';
+    filter->name = p_dupstr(name, len);
 }
 
 bool filter_set_type(filter_t *filter, const char *type, ssize_t len)
@@ -234,7 +219,8 @@ bool filter_add_param(filter_t *filter, const char *name, ssize_t name_len,
                atokens[param.type], ftokens[filter->type]);
         return false;
     }
-    param.value = m_strdup(value);
+    param.value     = p_dupstr(value, value_len);
+    param.value_len = value_len;
     array_add(filter->params, param);
     return true;
 }