further work on data parsing.

[apps/pfixtools.git] / postfix.c

diff --git a/postfix.c b/postfix.c
index 533955e..46d2708 100644 (file)
--- a/postfix.c
+++ b/postfix.c
@@ -34,25 +34,28 @@
  */
 
 #include <errno.h>
+#include <limits.h>
 #include <stdbool.h>
+#include <syslog.h>
 #include <unistd.h>
 
 #include "job.h"
 #include "postfix.h"
 #include "buffer.h"
+#include "tokens.h"
 
 struct jpriv_t {
     buffer_t ibuf;
     buffer_t obuf;
 };
 
-jpriv_t *postfix_jpriv_init(jpriv_t *jp)
+static jpriv_t *postfix_jpriv_init(jpriv_t *jp)
 {
     buffer_init(&jp->ibuf);
     buffer_init(&jp->obuf);
     return jp;
 }
-void postfix_jpriv_wipe(jpriv_t *jp)
+static void postfix_jpriv_wipe(jpriv_t *jp)
 {
     buffer_wipe(&jp->ibuf);
     buffer_wipe(&jp->obuf);
@@ -60,35 +63,64 @@ void postfix_jpriv_wipe(jpriv_t *jp)
 DO_NEW(jpriv_t, postfix_jpriv);
 DO_DELETE(jpriv_t, postfix_jpriv);
 
-
-void postfix_start(job_t *listener)
+static void postfix_stop(job_t *job)
 {
-    job_t *job;
-
-    job = job_accept(listener, JOB_READ);
-    if (!job)
-        return;
-
-    job->jdata = postfix_jpriv_new();
+    postfix_jpriv_delete(&job->jdata);
 }
 
-void postfix_stop(job_t *job)
+static int postfix_parsejob(job_t *job)
 {
-    postfix_jpriv_delete(&job->jdata);
+    const char *p = skipspaces(job->jdata->ibuf.data);
+
+    for (;;) {
+        const char *k, *v;
+        int klen, vlen;
+
+        while (*p == ' ' || *p == '\t')
+            p++;
+        p = strchrnul(k = p, '=');
+        if (!*p)
+            return -1;
+        for (klen = p - k; k[klen] == ' ' || k[klen] == '\t'; klen--);
+        p += 1; /* skip = */
+
+        while (*p == ' ' || *p == '\t')
+            p++;
+        p = strstr(v = p, "\r\n");
+        if (!p)
+            return -1;
+        for (vlen = p - v; v[vlen] == ' ' || v[vlen] == '\t'; vlen--);
+        p += 2; /* skip \r\n */
+
+        /* do sth with (k,v) */
+
+        assert (p[0] && p[1]);
+        if (p[0] == '\r' && p[1] == '\n')
+            break;
+    }
+
+    return -1;
 }
 
-void postfix_process(job_t *job)
+static void postfix_process(job_t *job)
 {
     int nb;
 
-    switch (job->state) {
+    switch (job->mode) {
       case JOB_LISTEN:
-        return postfix_start(job);
+        if ((job = job_accept(job, JOB_READ))) {
+            job->jdata   = postfix_jpriv_new();
+            job->process = &postfix_process;
+            job->stop    = &postfix_stop;
+        }
+        return;
 
       case JOB_WRITE:
         nb = write(job->fd, job->jdata->obuf.data, job->jdata->obuf.len);
         if (nb < 0) {
-            job->error = errno != EINTR && errno != EAGAIN;
+            if ((job->error = errno != EINTR && errno != EAGAIN)) {
+                syslog(LOG_ERR, "unexpected problem on the socket: %m");
+            }
             return;
         }
 
@@ -96,26 +128,41 @@ void postfix_process(job_t *job)
         if (job->jdata->obuf.len)
             return;
 
-        job_update_state(job, JOB_READ);
+        job_update_mode(job, JOB_READ);
 
         /* fall through */
 
       case JOB_READ:
         nb = buffer_read(&job->jdata->ibuf, job->fd, -1);
         if (nb < 0) {
-            job->error = errno != EINTR && errno != EAGAIN;
+            if ((job->error = errno != EINTR && errno != EAGAIN)) {
+                syslog(LOG_ERR, "unexpected problem on the socket: %m");
+            }
             return;
         }
         if (nb == 0) {
+            syslog(LOG_ERR, "unexpected eof");
             job->error = true;
             return;
         }
 
-        if (!strstr(job->jdata->ibuf.data, "\r\n\r\n"))
+        if (!strstr(skipspaces(job->jdata->ibuf.data), "\r\n\r\n")) {
+            if (job->jdata->ibuf.len > SHRT_MAX) {
+                syslog(LOG_ERR, "too much data without CRLFCRLF");
+                job->error = true;
+            }
+            return;
+        }
+
+        if (postfix_parsejob(job) < 0) {
+            syslog(LOG_ERR, "could not parse postfix request");
+            job->error = true;
             return;
+        }
+
+        job_update_mode(job, JOB_IDLE);
 
-        /* TODO: do the parse */
-        job_update_state(job, JOB_IDLE);
+        /* TODO: run the scenario */
         return;
 
       default: