smtpd makes too many assumptions about the structure and layout of its

disk-based queue, it makes it near impossible to make changes to it without
editing twenty files... how am i going to implement mongodb support ? :-)

bring a new queue_backend API which hides the details of the disk-based
queue to smtpd. it is not "plugged in" yet and I'm filling the holes.

1 files changed, 123 insertions, 0 deletions

diff --git a/usr.sbin/smtpd/queue_backend.c b/usr.sbin/smtpd/queue_backend.c
new file mode 100644
index 00000000000..aa9847b929c
--- /dev/null
+++ b/usr.sbin/smtpd/queue_backend.c
@@ -0,0 +1,123 @@
+/*	$OpenBSD: queue_backend.c,v 1.5 2011/04/14 17:06:43 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/tree.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+
+#include <event.h>
+#include <imsg.h>
+#include <libgen.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "smtpd.h"
+#include "log.h"
+
+int	queue_fsqueue_message(struct smtpd *, enum queue_kind,
+    enum queue_op, char *);
+int	queue_fsqueue_envelope(struct smtpd *, enum queue_kind,
+    enum queue_op , struct message *);
+
+struct queue_backend queue_backends[] = {
+	{ QT_FS,
+	  queue_fsqueue_message,
+	  queue_fsqueue_envelope }
+};
+
+struct queue_backend *
+queue_backend_lookup(enum queue_type type)
+{
+	u_int8_t i;
+
+	for (i = 0; i < nitems(queue_backends); ++i)
+		if (queue_backends[i].type == type)
+			break;
+
+	if (i == nitems(queue_backends))
+		fatalx("invalid queue type");
+
+	return &queue_backends[i];
+}
+
+int
+queue_message_create(struct smtpd *env, enum queue_kind qkind, char *msgid)
+{
+	return env->sc_queue->message(env, qkind, QOP_CREATE, msgid);
+}
+
+int
+queue_message_delete(struct smtpd *env, enum queue_kind qkind, char *msgid)
+{
+	return env->sc_queue->message(env, qkind, QOP_DELETE, msgid);
+}
+
+int
+queue_message_commit(struct smtpd *env, enum queue_kind qkind, char *msgid)
+{
+	return env->sc_queue->message(env, qkind, QOP_COMMIT, msgid);
+}
+
+int
+queue_message_fd_r(struct smtpd *env, enum queue_kind qkind, char *msgid)
+{
+	return env->sc_queue->message(env, qkind, QOP_FD_R, msgid);
+}
+
+int
+queue_message_fd_rw(struct smtpd *env, enum queue_kind qkind, char *msgid)
+{
+	return env->sc_queue->message(env, qkind, QOP_FD_RW, msgid);
+}
+
+int
+queue_envelope_create(struct smtpd *env, enum queue_kind qkind,
+    struct message *envelope)
+{
+	return env->sc_queue->envelope(env, qkind, QOP_CREATE, envelope);
+}
+
+int
+queue_envelope_delete(struct smtpd *env, enum queue_kind qkind,
+    struct message *envelope)
+{
+	return env->sc_queue->envelope(env, qkind, QOP_DELETE, envelope);
+}
+
+int
+queue_envelope_load(struct smtpd *env, enum queue_kind qkind,
+    char *evpid, struct message *envelope)
+{
+	if (strlcpy(envelope->message_uid, evpid, sizeof(envelope->message_uid))
+	    >= sizeof(envelope->message_uid))
+		fatalx("queue_envelope_load: envelope ID truncation.");
+	return env->sc_queue->envelope(env, qkind, QOP_LOAD, envelope);
+}
+
+int
+queue_envelope_update(struct smtpd *env, enum queue_kind qkind,
+    struct message *envelope)
+{
+	return env->sc_queue->envelope(env, qkind, QOP_UPDATE, envelope);
+}