commit - 57cbfccc70a86c36f9d4eb2a34af40008446f119
commit + eaefb262c259d05f8a5b1324c0605058e775c4b2
blob - 0de0555c3d53d804c464490c227553854d447b28
blob + ffd97ba6494ea278920c23cbffc8460c7ea13b8e
--- Makefile
+++ Makefile
@@ -4,4 +4,7 @@ PROG=	dnsbl
 BINDIR=	/usr/bin
 SRCS+=	main.c smtp_proc.c
 
+LDADD+=	-levent
+DPADD=	${LIBEVENT}
+
 .include <bsd.prog.mk>
blob - 4000129f96cc995befbc2ff68e0ad978b7feb60b
blob + 1e0ff61d3b5e74a3dd74646aa4f2800b42a3ed2a
--- smtp_proc.c
+++ smtp_proc.c
@@ -4,11 +4,14 @@
 #include <arpa/inet.h>
 #include <err.h>
 #include <errno.h>
+#include <event.h>
+#include <fcntl.h>
 #include <inttypes.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "smtp_proc.h"
 
@@ -20,8 +23,21 @@ typedef int (*smtp_cb)(char *, int, time_t, char *, ch
 struct smtp_callback;
 
 static int smtp_register(char *, char *, char *, smtp_cb);
+static void smtp_newline(int, short, void *);
 static void smtp_connect(struct smtp_callback *, int, time_t, uint64_t,
     uint64_t, char *);
+static void smtp_helo(struct smtp_callback *, int, time_t, uint64_t, uint64_t,
+    char *);
+static void smtp_ehlo(struct smtp_callback *, int, time_t, uint64_t, uint64_t,
+    char *);
+static void smtp_starttls(struct smtp_callback *, int, time_t, uint64_t,
+    uint64_t, char *);
+static void smtp_auth(struct smtp_callback *, int, time_t, uint64_t, uint64_t,
+    char *);
+static void smtp_mail_from(struct smtp_callback *, int, time_t, uint64_t,
+    uint64_t, char *);
+static void smtp_rcpt_to(struct smtp_callback *, int, time_t, uint64_t,
+    uint64_t, char *);
 static void smtp_data(struct smtp_callback *, int, time_t, uint64_t, uint64_t,
     char *);
 static void smtp_data_line(struct smtp_callback *, int, time_t, uint64_t,
@@ -38,8 +54,8 @@ static void smtp_wiz(struct smtp_callback *, int, time
     char *);
 static void smtp_commit(struct smtp_callback *, int, time_t, uint64_t, uint64_t,
     char *);
-static void smtp_handle(struct smtp_callback *, int, time_t, uint64_t, uint64_t,
-    void *);
+static void smtp_handle_filter(struct smtp_callback *, int, time_t, uint64_t,
+    uint64_t, void *);
 
 struct smtp_callback {
 	char *type;
@@ -49,15 +65,21 @@ struct smtp_callback {
 	    uint64_t, char *);
 	smtp_cb cb;
 } smtp_callbacks[] = {
-	{"filter", "connect", "smtp-in", smtp_connect, NULL},
-	{"filter", "data", "smtp-in", smtp_data, NULL},
-	{"filter", "data-line", "smtp-in", smtp_data_line, NULL},
-	{"filter", "rset", "smtp-in", smtp_rset, NULL},
-	{"filter", "quit", "smtp-in", smtp_quit, NULL},
-	{"filter", "noop", "smtp-in", smtp_noop, NULL},
-	{"filter", "help", "smtp-in", smtp_help, NULL},
-	{"filter", "wiz", "smtp-in", smtp_wiz, NULL},
-	{"filter", "commit", "smtp-in", smtp_commit, NULL}
+        {"filter", "connect", "smtp-in", smtp_connect, NULL},
+        {"filter", "helo", "smtp-in", smtp_helo, NULL},
+        {"filter", "ehlo", "smtp-in", smtp_ehlo, NULL},
+        {"filter", "starttls", "smtp-in", smtp_starttls, NULL},
+        {"filter", "auth", "smtp-in", smtp_auth, NULL},
+        {"filter", "mail-from", "smtp-in", smtp_mail_from, NULL},
+        {"filter", "rcpt-to", "smtp-in", smtp_rcpt_to, NULL},
+        {"filter", "data", "smtp-in", smtp_data, NULL},
+        {"filter", "data-line", "smtp-in", smtp_data_line, NULL},
+        {"filter", "rset", "smtp-in", smtp_rset, NULL},
+        {"filter", "quit", "smtp-in", smtp_quit, NULL},
+        {"filter", "noop", "smtp-in", smtp_noop, NULL},
+        {"filter", "help", "smtp-in", smtp_help, NULL},
+        {"filter", "wiz", "smtp-in", smtp_wiz, NULL},
+        {"filter", "commit", "smtp-in", smtp_commit, NULL}
 };
 
 static int ready = 0;
@@ -73,6 +95,26 @@ smtp_register_filter_connect(enum filter_decision (*cb
 void
 smtp_run(void)
 {
+	struct event stdinev;
+
+	printf("register|ready\n");
+	ready = 1;
+
+	event_init();
+	event_set(&stdinev, STDIN_FILENO, EV_READ | EV_PERSIST, smtp_newline,
+	    &stdinev);
+	event_add(&stdinev, NULL);
+
+	if (fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK) == -1)
+		err(1, "fcntl");
+
+	event_dispatch();
+}
+
+static void
+smtp_newline(int fd, short event, void *arg)
+{
+	struct event *stdinev = (struct event *)arg;
 	char *line = NULL;
 	size_t linesize = 0;
 	ssize_t linelen;
@@ -82,9 +124,6 @@ smtp_run(void)
 	uint64_t reqid, token;
 	int i;
 
-	printf("register|ready\n");
-	ready = 1;
-
 	while ((linelen = getline(&line, &linesize, stdin)) != -1) {
 		if (line[linelen - 1] != '\n')
 			errx(1, "Invalid line received: missing newline");
@@ -135,6 +174,8 @@ smtp_run(void)
 		smtp_callbacks[i].smtp_parse(&(smtp_callbacks[i]), version, tm,
 		    reqid, token, params);
 	}
+	if (feof(stdin) || (ferror(stdin) && errno != EAGAIN))
+		event_del(stdinev);
 }
 
 static void
@@ -163,9 +204,45 @@ smtp_connect(struct smtp_callback *cb, int version, ti
 	if (ret == -1)
 		err(1, "Couldn't convert address");
 
-	smtp_handle(cb, version, tm, reqid, token, (void *)(&sfconnect));
+	smtp_handle_filter(cb, version, tm, reqid, token, (void *)(&sfconnect));
 }
 
+static void
+smtp_helo(struct smtp_callback *cb, int version, time_t tm, uint64_t reqid,
+    uint64_t token, char *params)
+{
+}
+
+static void
+smtp_ehlo(struct smtp_callback *cb, int version, time_t tm, uint64_t reqid,
+    uint64_t token, char *params)
+{
+}
+
+static void
+smtp_starttls(struct smtp_callback *cb, int version, time_t tm, uint64_t reqid,
+    uint64_t token, char *params)
+{
+}
+
+static void
+smtp_auth(struct smtp_callback *cb, int version, time_t tm, uint64_t reqid,
+    uint64_t token, char *params)
+{
+}
+
+static void
+smtp_mail_from(struct smtp_callback *cb, int version, time_t tm, uint64_t reqid,
+    uint64_t token, char *params)
+{
+}
+
+static void
+smtp_rcpt_to(struct smtp_callback *cb, int version, time_t tm, uint64_t reqid,
+    uint64_t token, char *params)
+{
+}
+
 static void 
 smtp_data(struct smtp_callback *cb, int version, time_t tm, uint64_t reqid,
     uint64_t token, char *params)