X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Ffilter.c;h=de6ba0398ec407d3acb7180142b3d0c6128505bf;hb=61c6b37fbe6a5701a77407537a98cd2f319b1504;hp=4bab4c90e8a1e800d07d7b71fdb703408538ce60;hpb=6154a392a1f0d96d4599a45f1c37d84dbe5bfa4d;p=apps%2Fpfixtools.git

diff --git a/postlicyd/filter.c b/postlicyd/filter.c
index 4bab4c9..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,6 +121,37 @@ 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, int level)
+{
+    if (filter->last_seen == level) {
+        return true;
+    }
+    filter->last_seen = level;
+    foreach (filter_hook_t *hook, filter->hooks) {
+        if (hook->postfix) {
+            continue;
+        }
+        if (hook->filter_id == level) {
+            return false;
+        }
+        if (!filter_check_loop(array_ptr(*array, hook->filter_id), array, level)) {
+            return false;
+        }
+    }}
+    return true;
+}
+
+bool filter_check_safety(A(filter_t) *array)
+{
+    foreach (filter_t *filter, *array) {
+        if (!filter_check_loop(filter, array, __Ai)) {
+            syslog(LOG_ERR, "the filter tree contains a loop");
+            return false;
+        }
+    }}
+    return true;
+}
+
 void filter_wipe(filter_t *filter)
 {
     filter_destructor_t destructor = destructors[filter->type];
@@ -173,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)
@@ -198,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;
 }