X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fmain-postlicyd.c;h=d6c5cc4c383f4deae5fd8111ac2823a5aa644096;hb=6154a392a1f0d96d4599a45f1c37d84dbe5bfa4d;hp=a4241ffffb65c38806fdc1c8f4933a4467954450;hpb=fa576db63fb43d41bd1fa17fb58afa2a99e45f05;p=apps%2Fpfixtools.git

diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c
index a4241ff..d6c5cc4 100644
--- a/postlicyd/main-postlicyd.c
+++ b/postlicyd/main-postlicyd.c
@@ -67,6 +67,7 @@ static int postfix_parsejob(query_t *query, char *p)
     } while (0)
 
     p_clear(query, 1);
+    query->state = SMTP_UNKNOWN;
     while (*p != '\n') {
         char *k, *v;
         int klen, vlen, vtk;
@@ -87,7 +88,7 @@ static int postfix_parsejob(query_t *query, char *p)
 
         vtk = policy_tokenize(v, vlen);
         switch (policy_tokenize(k, klen)) {
-#define CASE(up, low)  case PTK_##up: query->low = v; v[vlen] = '\0'; break;
+#define CASE(up, low)  case PTK_##up: query->low = v; v[vlen] = '\0'; syslog(LOG_DEBUG, "%s = %s", ptokens[PTK_##up], query->low); break;
             CASE(HELO_NAME,           helo_name);
             CASE(QUEUE_ID,            queue_id);
             CASE(SENDER,              sender);
@@ -166,18 +167,23 @@ static void policy_answer(server_t *pcy, const char *fmt, ...)
     epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy);
 }
 
-static void policy_process(server_t *pcy, config_t *config)
+static bool policy_process(server_t *pcy, const config_t *config)
 {
     const query_t* query = pcy->data;
-    filter_t *filter = array_ptr(config->filters, config->entry_point);
+    const filter_t *filter;
+    if (config->entry_points[query->state] == -1) {
+        syslog(LOG_WARNING, "no filter defined for current protocol_state (%d)", query->state);
+        return false;
+    }
+    filter = array_ptr(config->filters, config->entry_points[query->state]);
     while (true) {
-        filter_hook_t *hook = filter_run(filter, query);
+        const filter_hook_t *hook = filter_run(filter, query);
         if (hook == NULL) {
-            policy_answer(pcy, "DUNNO");
-            return;
+            syslog(LOG_WARNING, "request aborted");
+            return false;
         } else if (hook->postfix) {
             policy_answer(pcy, "%s", hook->value);
-            return;
+            return true;
         } else {
             filter = array_ptr(config->filters, hook->filter_id);
         }
@@ -190,7 +196,7 @@ static int policy_run(server_t *pcy, void* vconfig)
     int nb = buffer_read(&pcy->ibuf, pcy->fd, -1);
     const char *eoq;
     query_t  *query  = pcy->data;
-    config_t *config = vconfig;
+    const config_t *config = vconfig;
 
     if (nb < 0) {
         if (errno == EAGAIN || errno == EINTR)
@@ -211,8 +217,7 @@ static int policy_run(server_t *pcy, void* vconfig)
         return -1;
     query->eoq = eoq + strlen("\n\n");
     epoll_modify(pcy->fd, 0, pcy);
-    policy_process(pcy, config);
-    return 0;
+    return policy_process(pcy, config) ? 0 : -1;
 }
 
 int start_listener(int port)