rename filter.c --> filter_api.c (to be consistent with upcoming changes)

prompted by and ok gilles@

3 files changed, 305 insertions, 326 deletions

diff --git a/usr.sbin/smtpd/filter.c b/usr.sbin/smtpd/filter.c
deleted file mode 100644
index d7c7c1d3b9c..00000000000
--- a/usr.sbin/smtpd/filter.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/*	$OpenBSD: filter.c,v 1.7 2012/06/14 21:56:13 gilles Exp $	*/
-
-/*
- * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/uio.h>
-
-#include <err.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "filter_api.h"
-
-static struct filter_internals {
-	struct event	ev;
-	struct imsgbuf	ibuf;
-
-	enum filter_status (*connect_cb)(u_int64_t, struct filter_connect *, void *);
-	void *connect_cb_arg;
-
-	enum filter_status (*helo_cb)(u_int64_t, struct filter_helo *, void *);
-	void *helo_cb_arg;
-
-	enum filter_status (*ehlo_cb)(u_int64_t, struct filter_helo *, void *);
-	void *ehlo_cb_arg;
-
-	enum filter_status (*mail_cb)(u_int64_t, struct filter_mail *, void *);
-	void *mail_cb_arg;
-
-	enum filter_status (*rcpt_cb)(u_int64_t, struct filter_rcpt *, void *);
-	void *rcpt_cb_arg;
-
-	enum filter_status (*dataline_cb)(u_int64_t, struct filter_dataline *, void *);
-	void *dataline_cb_arg;
-
-	enum filter_status (*quit_cb)(u_int64_t, void *);
-	void *quit_cb_arg;
-
-	enum filter_status (*close_cb)(u_int64_t, void *);
-	void *close_cb_arg;
-
-	enum filter_status (*rset_cb)(u_int64_t, void *);
-	void *rset_cb_arg;
-
-} fi;
-
-static void filter_handler(int, short, void *);
-static void filter_register_callback(enum filter_type, void *, void *);
-
-void
-filter_init(void)
-{
-	bzero(&fi, sizeof (fi));
-
-	imsg_init(&fi.ibuf, 0);
-
-	event_init();
-	event_set(&fi.ev, 0, EV_READ, filter_handler, (void *)&fi);
-	event_add(&fi.ev, NULL);
-}
-
-void
-filter_loop(void)
-{
-	if (event_dispatch() < 0)
-		errx(1, "event_dispatch");
-}
-
-void
-filter_register_connect_callback(enum filter_status (*cb)(u_int64_t, struct filter_connect *, void *), void *cb_arg)
-{
-	filter_register_callback(FILTER_CONNECT, cb, cb_arg);
-}
-
-void
-filter_register_helo_callback(enum filter_status (*cb)(u_int64_t, struct filter_helo *, void *), void *cb_arg)
-{
-	filter_register_callback(FILTER_HELO, cb, cb_arg);
-}
-
-void
-filter_register_ehlo_callback(enum filter_status (*cb)(u_int64_t, struct filter_helo *, void *), void *cb_arg)
-{
-	filter_register_callback(FILTER_EHLO, cb, cb_arg);
-}
-
-void
-filter_register_mail_callback(enum filter_status (*cb)(u_int64_t, struct filter_mail *, void *), void *cb_arg)
-{
-	filter_register_callback(FILTER_MAIL, cb, cb_arg);
-}
-
-void
-filter_register_rcpt_callback(enum filter_status (*cb)(u_int64_t, struct filter_rcpt *, void *), void *cb_arg)
-{
-	filter_register_callback(FILTER_RCPT, cb, cb_arg);
-}
-
-void
-filter_register_dataline_callback(enum filter_status (*cb)(u_int64_t, struct filter_dataline *, void *), void *cb_arg)
-{
-	filter_register_callback(FILTER_DATALINE, cb, cb_arg);
-}
-
-void
-filter_register_quit_callback(enum filter_status (*cb)(u_int64_t, void *), void *cb_arg)
-{
-	filter_register_callback(FILTER_QUIT, cb, cb_arg);
-}
-
-void
-filter_register_close_callback(enum filter_status (*cb)(u_int64_t, void *), void *cb_arg)
-{
-	filter_register_callback(FILTER_CLOSE, cb, cb_arg);
-}
-
-void
-filter_register_rset_callback(enum filter_status (*cb)(u_int64_t, void *), void *cb_arg)
-{
-	filter_register_callback(FILTER_RSET, cb, cb_arg);
-}
-
-static void
-filter_register_callback(enum filter_type type, void *cb, void *cb_arg)
-{
-	switch (type) {
-	case FILTER_CONNECT:
-		fi.connect_cb = cb;
-		fi.connect_cb_arg = cb_arg;
-		break;
-
-	case FILTER_HELO:
-		fi.helo_cb = cb;
-		fi.helo_cb_arg = cb_arg;
-		break;
-
-	case FILTER_EHLO:
-		fi.ehlo_cb = cb;
-		fi.ehlo_cb_arg = cb_arg;
-		break;
-
-	case FILTER_MAIL:
-		fi.mail_cb = cb;
-		fi.mail_cb_arg = cb_arg;
-		break;
-
-	case FILTER_RCPT:
-		fi.rcpt_cb = cb;
-		fi.rcpt_cb_arg = cb_arg;
-		break;
-
-	case FILTER_DATALINE:
-		fi.dataline_cb = cb;
-		fi.dataline_cb_arg = cb_arg;
-		break;
-
-	case FILTER_QUIT:
-		fi.quit_cb = cb;
-		fi.quit_cb_arg = cb_arg;
-		break;
-
-	case FILTER_CLOSE:
-		fi.close_cb = cb;
-		fi.close_cb_arg = cb_arg;
-		break;
-
-	case FILTER_RSET:
-		fi.rset_cb = cb;
-		fi.rset_cb_arg = cb_arg;
-		break;
-
-	default:
-		errx(1, "filter_register_callback: unknown filter type");
-	}
-}
-
-static void
-filter_handler(int fd, short event, void *p)
-{
-	struct imsg		imsg;
-	ssize_t			n;
-	short			evflags = EV_READ;
-	enum filter_status	ret;
-	struct filter_msg	fm;
-
-	if (event & EV_READ) {
-		n = imsg_read(&fi.ibuf);
-		if (n == -1)
-			err(1, "imsg_read");
-		if (n == 0) {
-			event_del(&fi.ev);
-			event_loopexit(NULL);
-			return;
-		}
-	}
-
-	if (event & EV_WRITE) {
-		if (msgbuf_write(&fi.ibuf.w) == -1)
-			err(1, "msgbuf_write");
-		if (fi.ibuf.w.queued)
-			evflags |= EV_WRITE;
-	}
-
-	for (;;) {
-		n = imsg_get(&fi.ibuf, &imsg);
-		if (n == -1)
-			errx(1, "imsg_get");
-		if (n == 0)
-			break;
-
-		if ((imsg.hdr.len - IMSG_HEADER_SIZE)
-		    != sizeof(fm))
-			errx(1, "corrupted imsg");
-
-		memcpy(&fm, imsg.data, sizeof (fm));
-		if (fm.version != FILTER_API_VERSION)
-			errx(1, "API version mismatch");
-
-		switch (imsg.hdr.type) {
-		case FILTER_CONNECT:
-			if (fi.connect_cb == NULL)
-				goto ignore;
-			ret = fi.connect_cb(fm.cl_id, &fm.u.connect,
-			    fi.connect_cb_arg);
-			break;
-		case FILTER_HELO:
-			if (fi.helo_cb == NULL)
-				goto ignore;
-			ret = fi.helo_cb(fm.cl_id, &fm.u.helo,
-			    fi.helo_cb_arg);
-			break;
-		case FILTER_EHLO:
-			if (fi.ehlo_cb == NULL)
-				goto ignore;
-			ret = fi.ehlo_cb(fm.cl_id, &fm.u.helo,
-			    fi.ehlo_cb_arg);
-			break;
-		case FILTER_MAIL:
-			if (fi.mail_cb == NULL)
-				goto ignore;
-			ret = fi.mail_cb(fm.cl_id, &fm.u.mail,
-			    fi.mail_cb_arg);
-			break;
-		case FILTER_RCPT:
-			if (fi.rcpt_cb == NULL)
-				goto ignore;
-			ret = fi.rcpt_cb(fm.cl_id, &fm.u.rcpt,
-			    fi.rcpt_cb_arg);
-			break;
-		case FILTER_DATALINE:
-			if (fi.dataline_cb == NULL)
-				goto ignore;
-			ret = fi.dataline_cb(fm.cl_id, &fm.u.dataline,
-			    fi.dataline_cb_arg);
-			break;
-		case FILTER_QUIT:
-			if (fi.quit_cb == NULL)
-				goto ignore;
-			ret = fi.quit_cb(fm.cl_id, fi.quit_cb_arg);
-			break;
-		case FILTER_CLOSE:
-			if (fi.close_cb == NULL)
-				goto ignore;
-			ret = fi.close_cb(fm.cl_id, fi.close_cb_arg);
-			break;
-		case FILTER_RSET:
-			if (fi.rset_cb == NULL)
-				goto ignore;
-			ret = fi.rset_cb(fm.cl_id, fi.rset_cb_arg);
- 			break;
-
-		default:
-			errx(1, "unsupported imsg");
-		}
-
-		switch (ret) {
-		case STATUS_ACCEPT:
-		case STATUS_REJECT:
-			fm.code = ret;
-			imsg_compose(&fi.ibuf, imsg.hdr.type, 0, 0, -1, &fm,
-			    sizeof fm);
-			evflags |= EV_WRITE;
-			break;
-		case STATUS_WAITING:
-			/* waiting for asynchronous call ... */
-			break;
-		}
-
-		imsg_free(&imsg);
-	}
-
-	event_set(&fi.ev, 0, evflags, filter_handler, &fi);
-	event_add(&fi.ev, NULL);
-	return;
-
-ignore:
-	imsg_free(&imsg);
-	fm.code = STATUS_IGNORE;
-	imsg_compose(&fi.ibuf, imsg.hdr.type, 0, 0, -1, &fm, sizeof fm);
-	evflags |= EV_WRITE;
-	event_set(&fi.ev, 0, evflags, filter_handler, &fi);
-	event_add(&fi.ev, NULL);
-}
diff --git a/usr.sbin/smtpd/filter_api.c b/usr.sbin/smtpd/filter_api.c
index 2b2504ce34e..b1015e5320d 100644
--- a/usr.sbin/smtpd/filter_api.c
+++ b/usr.sbin/smtpd/filter_api.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: filter_api.c,v 1.2 2012/06/14 21:56:13 gilles Exp $	*/
+/*	$OpenBSD: filter_api.c,v 1.3 2012/06/16 16:16:09 chl Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
@@ -17,5 +17,307 @@
  */
 
 #include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/uio.h>
+
+#include <err.h>
+#include <event.h>
+#include <fcntl.h>
+#include <imsg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "filter_api.h"
+
+static struct filter_internals {
+	struct event	ev;
+	struct imsgbuf	ibuf;
+
+	enum filter_status (*connect_cb)(u_int64_t, struct filter_connect *, void *);
+	void *connect_cb_arg;
+
+	enum filter_status (*helo_cb)(u_int64_t, struct filter_helo *, void *);
+	void *helo_cb_arg;
+
+	enum filter_status (*ehlo_cb)(u_int64_t, struct filter_helo *, void *);
+	void *ehlo_cb_arg;
+
+	enum filter_status (*mail_cb)(u_int64_t, struct filter_mail *, void *);
+	void *mail_cb_arg;
+
+	enum filter_status (*rcpt_cb)(u_int64_t, struct filter_rcpt *, void *);
+	void *rcpt_cb_arg;
+
+	enum filter_status (*dataline_cb)(u_int64_t, struct filter_dataline *, void *);
+	void *dataline_cb_arg;
+
+	enum filter_status (*quit_cb)(u_int64_t, void *);
+	void *quit_cb_arg;
+
+	enum filter_status (*close_cb)(u_int64_t, void *);
+	void *close_cb_arg;
+
+	enum filter_status (*rset_cb)(u_int64_t, void *);
+	void *rset_cb_arg;
+
+} fi;
+
+static void filter_handler(int, short, void *);
+static void filter_register_callback(enum filter_type, void *, void *);
+
+void
+filter_init(void)
+{
+	bzero(&fi, sizeof (fi));
+
+	imsg_init(&fi.ibuf, 0);
+
+	event_init();
+	event_set(&fi.ev, 0, EV_READ, filter_handler, (void *)&fi);
+	event_add(&fi.ev, NULL);
+}
+
+void
+filter_loop(void)
+{
+	if (event_dispatch() < 0)
+		errx(1, "event_dispatch");
+}
+
+void
+filter_register_connect_callback(enum filter_status (*cb)(u_int64_t, struct filter_connect *, void *), void *cb_arg)
+{
+	filter_register_callback(FILTER_CONNECT, cb, cb_arg);
+}
+
+void
+filter_register_helo_callback(enum filter_status (*cb)(u_int64_t, struct filter_helo *, void *), void *cb_arg)
+{
+	filter_register_callback(FILTER_HELO, cb, cb_arg);
+}
+
+void
+filter_register_ehlo_callback(enum filter_status (*cb)(u_int64_t, struct filter_helo *, void *), void *cb_arg)
+{
+	filter_register_callback(FILTER_EHLO, cb, cb_arg);
+}
+
+void
+filter_register_mail_callback(enum filter_status (*cb)(u_int64_t, struct filter_mail *, void *), void *cb_arg)
+{
+	filter_register_callback(FILTER_MAIL, cb, cb_arg);
+}
+
+void
+filter_register_rcpt_callback(enum filter_status (*cb)(u_int64_t, struct filter_rcpt *, void *), void *cb_arg)
+{
+	filter_register_callback(FILTER_RCPT, cb, cb_arg);
+}
+
+void
+filter_register_dataline_callback(enum filter_status (*cb)(u_int64_t, struct filter_dataline *, void *), void *cb_arg)
+{
+	filter_register_callback(FILTER_DATALINE, cb, cb_arg);
+}
+
+void
+filter_register_quit_callback(enum filter_status (*cb)(u_int64_t, void *), void *cb_arg)
+{
+	filter_register_callback(FILTER_QUIT, cb, cb_arg);
+}
+
+void
+filter_register_close_callback(enum filter_status (*cb)(u_int64_t, void *), void *cb_arg)
+{
+	filter_register_callback(FILTER_CLOSE, cb, cb_arg);
+}
+
+void
+filter_register_rset_callback(enum filter_status (*cb)(u_int64_t, void *), void *cb_arg)
+{
+	filter_register_callback(FILTER_RSET, cb, cb_arg);
+}
+
+static void
+filter_register_callback(enum filter_type type, void *cb, void *cb_arg)
+{
+	switch (type) {
+	case FILTER_CONNECT:
+		fi.connect_cb = cb;
+		fi.connect_cb_arg = cb_arg;
+		break;
+
+	case FILTER_HELO:
+		fi.helo_cb = cb;
+		fi.helo_cb_arg = cb_arg;
+		break;
+
+	case FILTER_EHLO:
+		fi.ehlo_cb = cb;
+		fi.ehlo_cb_arg = cb_arg;
+		break;
+
+	case FILTER_MAIL:
+		fi.mail_cb = cb;
+		fi.mail_cb_arg = cb_arg;
+		break;
+
+	case FILTER_RCPT:
+		fi.rcpt_cb = cb;
+		fi.rcpt_cb_arg = cb_arg;
+		break;
+
+	case FILTER_DATALINE:
+		fi.dataline_cb = cb;
+		fi.dataline_cb_arg = cb_arg;
+		break;
+
+	case FILTER_QUIT:
+		fi.quit_cb = cb;
+		fi.quit_cb_arg = cb_arg;
+		break;
+
+	case FILTER_CLOSE:
+		fi.close_cb = cb;
+		fi.close_cb_arg = cb_arg;
+		break;
+
+	case FILTER_RSET:
+		fi.rset_cb = cb;
+		fi.rset_cb_arg = cb_arg;
+		break;
+
+	default:
+		errx(1, "filter_register_callback: unknown filter type");
+	}
+}
+
+static void
+filter_handler(int fd, short event, void *p)
+{
+	struct imsg		imsg;
+	ssize_t			n;
+	short			evflags = EV_READ;
+	enum filter_status	ret;
+	struct filter_msg	fm;
+
+	if (event & EV_READ) {
+		n = imsg_read(&fi.ibuf);
+		if (n == -1)
+			err(1, "imsg_read");
+		if (n == 0) {
+			event_del(&fi.ev);
+			event_loopexit(NULL);
+			return;
+		}
+	}
+
+	if (event & EV_WRITE) {
+		if (msgbuf_write(&fi.ibuf.w) == -1)
+			err(1, "msgbuf_write");
+		if (fi.ibuf.w.queued)
+			evflags |= EV_WRITE;
+	}
+
+	for (;;) {
+		n = imsg_get(&fi.ibuf, &imsg);
+		if (n == -1)
+			errx(1, "imsg_get");
+		if (n == 0)
+			break;
+
+		if ((imsg.hdr.len - IMSG_HEADER_SIZE)
+		    != sizeof(fm))
+			errx(1, "corrupted imsg");
+
+		memcpy(&fm, imsg.data, sizeof (fm));
+		if (fm.version != FILTER_API_VERSION)
+			errx(1, "API version mismatch");
+
+		switch (imsg.hdr.type) {
+		case FILTER_CONNECT:
+			if (fi.connect_cb == NULL)
+				goto ignore;
+			ret = fi.connect_cb(fm.cl_id, &fm.u.connect,
+			    fi.connect_cb_arg);
+			break;
+		case FILTER_HELO:
+			if (fi.helo_cb == NULL)
+				goto ignore;
+			ret = fi.helo_cb(fm.cl_id, &fm.u.helo,
+			    fi.helo_cb_arg);
+			break;
+		case FILTER_EHLO:
+			if (fi.ehlo_cb == NULL)
+				goto ignore;
+			ret = fi.ehlo_cb(fm.cl_id, &fm.u.helo,
+			    fi.ehlo_cb_arg);
+			break;
+		case FILTER_MAIL:
+			if (fi.mail_cb == NULL)
+				goto ignore;
+			ret = fi.mail_cb(fm.cl_id, &fm.u.mail,
+			    fi.mail_cb_arg);
+			break;
+		case FILTER_RCPT:
+			if (fi.rcpt_cb == NULL)
+				goto ignore;
+			ret = fi.rcpt_cb(fm.cl_id, &fm.u.rcpt,
+			    fi.rcpt_cb_arg);
+			break;
+		case FILTER_DATALINE:
+			if (fi.dataline_cb == NULL)
+				goto ignore;
+			ret = fi.dataline_cb(fm.cl_id, &fm.u.dataline,
+			    fi.dataline_cb_arg);
+			break;
+		case FILTER_QUIT:
+			if (fi.quit_cb == NULL)
+				goto ignore;
+			ret = fi.quit_cb(fm.cl_id, fi.quit_cb_arg);
+			break;
+		case FILTER_CLOSE:
+			if (fi.close_cb == NULL)
+				goto ignore;
+			ret = fi.close_cb(fm.cl_id, fi.close_cb_arg);
+			break;
+		case FILTER_RSET:
+			if (fi.rset_cb == NULL)
+				goto ignore;
+			ret = fi.rset_cb(fm.cl_id, fi.rset_cb_arg);
+ 			break;
+
+		default:
+			errx(1, "unsupported imsg");
+		}
+
+		switch (ret) {
+		case STATUS_ACCEPT:
+		case STATUS_REJECT:
+			fm.code = ret;
+			imsg_compose(&fi.ibuf, imsg.hdr.type, 0, 0, -1, &fm,
+			    sizeof fm);
+			evflags |= EV_WRITE;
+			break;
+		case STATUS_WAITING:
+			/* waiting for asynchronous call ... */
+			break;
+		}
+
+		imsg_free(&imsg);
+	}
+
+	event_set(&fi.ev, 0, evflags, filter_handler, &fi);
+	event_add(&fi.ev, NULL);
+	return;
+
+ignore:
+	imsg_free(&imsg);
+	fm.code = STATUS_IGNORE;
+	imsg_compose(&fi.ibuf, imsg.hdr.type, 0, 0, -1, &fm, sizeof fm);
+	evflags |= EV_WRITE;
+	event_set(&fi.ev, 0, evflags, filter_handler, &fi);
+	event_add(&fi.ev, NULL);
+}
diff --git a/usr.sbin/smtpd/libsmtpdfilter/Makefile b/usr.sbin/smtpd/libsmtpdfilter/Makefile
index d90a68570ab..f21620d59bf 100644
--- a/usr.sbin/smtpd/libsmtpdfilter/Makefile
+++ b/usr.sbin/smtpd/libsmtpdfilter/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.1 2011/11/15 23:22:47 gilles Exp $
+#	$OpenBSD: Makefile,v 1.2 2012/06/16 16:16:09 chl Exp $
 
 .PATH:		${.CURDIR}/..
 
 LIB=	smtpdfilter
 WANTLINT=no
-SRCS=	filter.c filter_api.c
+SRCS=	filter_api.c
 DEBUGLIBS= no
 NOPROFILE= yes
 NOPIC=	yes