X-Git-Url: http://git.madism.org/?p=apps%2Fpfixtools.git;a=blobdiff_plain;f=postlicyd%2Ffilter.c;h=7861af4f05c5db6b42ec07657727c80424d67818;hp=a150d6dbe97eb10451c43ecd5c33bafe92466c48;hb=6deab7a7086ccb592daa0c41e12759ec0b9c7aa0;hpb=ae0c2eb5d2ea501fd9e458fc138696c268a14569

diff --git a/postlicyd/filter.c b/postlicyd/filter.c
index a150d6d..7861af4 100644
--- a/postlicyd/filter.c
+++ b/postlicyd/filter.c
@@ -45,6 +45,7 @@ static bool                 params[FTK_count][ATK_count];
 
 static filter_context_constructor_t ctx_constructors[FTK_count];
 static filter_context_destructor_t  ctx_destructors[FTK_count];
+static filter_async_handler_t       async_handler = NULL;
 
 static const filter_hook_t default_hook = {
     .type      = 0,
@@ -101,6 +102,11 @@ filter_param_id_t filter_param_register(filter_type_t filter,
     return tok;
 }
 
+void filter_async_handler_register(filter_async_handler_t handler)
+{
+    async_handler = handler;
+}
+
 bool filter_build(filter_t *filter)
 {
     bool ret = true;
@@ -180,22 +186,16 @@ void filter_wipe(filter_t *filter)
     p_delete(&filter->name);
 }
 
-const filter_hook_t *filter_run(const filter_t *filter, const query_t *query,
-                                filter_context_t *context)
+static inline const filter_hook_t *filter_hook_for_result(const filter_t *filter,
+                                                          filter_result_t res)
 {
     int start = 0;
     int end   = filter->hooks.len;
-    debug("running filter %s (%s)", filter->name, ftokens[filter->type]);
-    filter_result_t res = runners[filter->type](filter, query, context);
 
-    context->current_filter = NULL;
-
-    debug("filter run, result is %s", htokens[res]);
     if (res == HTK_ABORT) {
         return NULL;
     }
     if (res == HTK_ASYNC) {
-        context->current_filter = filter;
         return &async_hook;
     }
 
@@ -216,6 +216,22 @@ const filter_hook_t *filter_run(const filter_t *filter, const query_t *query,
     return &default_hook;
 }
 
+const filter_hook_t *filter_run(const filter_t *filter, const query_t *query,
+                                filter_context_t *context)
+{
+    debug("running filter %s (%s)", filter->name, ftokens[filter->type]);
+    filter_result_t res = runners[filter->type](filter, query, context);
+
+    if (res == HTK_ASYNC) {
+        context->current_filter = filter;
+    } else {
+        context->current_filter = NULL;
+    }
+
+    debug("filter run, result is %s", htokens[res]);
+    return filter_hook_for_result(filter, res);
+}
+
 bool filter_test(const filter_t *filter, const query_t *query,
                  filter_context_t *context, filter_result_t result)
 {
@@ -294,3 +310,15 @@ void filter_context_wipe(filter_context_t *context)
         }
     }
 }
+
+void filter_post_async_result(filter_context_t *context, filter_result_t result)
+{
+    const filter_t *filter = context->current_filter;
+    const filter_hook_t *hook = NULL;
+
+    if (result == HTK_ASYNC) {
+        return;
+    }
+    hook = filter_hook_for_result(filter, result);
+    async_handler(context, hook);
+}