Refactor, prepare gperf things needed for the parse.

[apps/pfixtools.git] / postfix.c

diff --git a/postfix.c b/postfix.c
index 5155471..f88feba 100644 (file)
--- a/postfix.c
+++ b/postfix.c
@@ -35,56 +35,77 @@
 
 #include <errno.h>
 #include <stdbool.h>
+#include <syslog.h>
 #include <unistd.h>
 
 #include "job.h"
 #include "postfix.h"
+#include "buffer.h"
 
 struct jpriv_t {
     buffer_t ibuf;
     buffer_t obuf;
 };
 
-struct tpriv_t {
-    job_t *jobs;
-};
-
-void postfix_start(job_t *job, query_t *query)
+static jpriv_t *postfix_jpriv_init(jpriv_t *jp)
 {
+    buffer_init(&jp->ibuf);
+    buffer_init(&jp->obuf);
+    return jp;
 }
+static void postfix_jpriv_wipe(jpriv_t *jp)
+{
+    buffer_wipe(&jp->ibuf);
+    buffer_wipe(&jp->obuf);
+}
+DO_NEW(jpriv_t, postfix_jpriv);
+DO_DELETE(jpriv_t, postfix_jpriv);
 
-void postfix_stop(job_t *job)
+static void postfix_stop(job_t *job)
 {
+    postfix_jpriv_delete(&job->jdata);
 }
 
-void postfix_process(job_t *job)
+static void postfix_process(job_t *job)
 {
-    if (job->state & JOB_LISTEN) {
-        /* TODO check return code */
-        job_accept(job, JOB_READ);
-    }
+    int nb;
 
-    if (job->state & JOB_WRITE) {
-        int nbwritten;
+    switch (job->mode) {
+      case JOB_LISTEN:
+        if ((job = job_accept(job, JOB_READ))) {
+            job->jdata   = postfix_jpriv_new();
+            job->process = &postfix_process;
+            job->stop    = &postfix_stop;
+        }
+        return;
 
-        nbwritten = write(job->fd, job->jdata->obuf.data, job->jdata->obuf.len);
-        if (nbwritten < 0) {
-            job->error = errno != EINTR && errno != EAGAIN;
+      case JOB_WRITE:
+        nb = write(job->fd, job->jdata->obuf.data, job->jdata->obuf.len);
+        if (nb < 0) {
+            if ((job->error = errno != EINTR && errno != EAGAIN)) {
+                syslog(LOG_ERR, "unexpected problem on the socket: %m");
+            }
             return;
         }
 
-        buffer_consume(&job->jdata->obuf, nbwritten);
-    }
+        buffer_consume(&job->jdata->obuf, nb);
+        if (job->jdata->obuf.len)
+            return;
 
-    if (job->state & JOB_READ) {
-        int nbread;
+        job_update_mode(job, JOB_READ);
 
-        nbread = buffer_read(&job->jdata->ibuf, job->fd, -1);
-        if (nbread < 0) {
-            job->error = errno != EINTR && errno != EAGAIN;
+        /* fall through */
+
+      case JOB_READ:
+        nb = buffer_read(&job->jdata->ibuf, job->fd, -1);
+        if (nb < 0) {
+            if ((job->error = errno != EINTR && errno != EAGAIN)) {
+                syslog(LOG_ERR, "unexpected problem on the socket: %m");
+            }
             return;
         }
-        if (nbread == 0) {
+        if (nb == 0) {
+            syslog(LOG_ERR, "unexpected eof");
             job->error = true;
             return;
         }
@@ -93,5 +114,11 @@ void postfix_process(job_t *job)
             return;
 
         /* TODO: do the parse */
+        job_update_mode(job, JOB_IDLE);
+        return;
+
+      default:
+        job->error = true;
+        return;
     }
 }