Declare Array(void*).

[apps/pfixtools.git] / postlicyd / filter.c

diff --git a/postlicyd/filter.c b/postlicyd/filter.c
index 4bab4c9..dea4436 100644 (file)
--- a/postlicyd/filter.c
+++ b/postlicyd/filter.c
@@ -129,6 +129,42 @@ 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)
+{
+    if (cleanup) {
+        foreach (filter_t *filter2, *array) {
+            filter2->seen = false;
+        }}
+    } else if (filter->seen) {
+        return false;
+    }
+    if (filter->safe) {
+        return true;
+    }
+    filter->seen = true;
+    foreach (filter_hook_t *hook, filter->hooks) {
+        if (hook->postfix) {
+            continue;
+        }
+        if (!filter_check_loop(array_ptr(*array, hook->filter_id), array, false)) {
+            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)) {
+            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 +209,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 +232,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;
 }