src - OpenBSD base system

diff options


context:
space:
mode:

author	Jacek Masiulaniec <jacekm@cvs.openbsd.org>	2008-12-13 23:19:35 +0000
committer	Jacek Masiulaniec <jacekm@cvs.openbsd.org>	2008-12-13 23:19:35 +0000
commit	3c16c6cdae24e471b60bfc15cdec42fb7a9c3a8a (patch)
tree	60e9d79190439097f983e51638325b015821e86c
parent	caf1cfff6a85891992305e63b4a70b68f15f3a60 (diff)

IMSG_* namespace cleanup.

ok gilles@

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

usr.sbin/smtpd/queue.c

-rw-r--r--

usr.sbin/smtpd/runner.c

-rw-r--r--

usr.sbin/smtpd/smtp.c

-rw-r--r--

usr.sbin/smtpd/smtp_session.c

-rw-r--r--

usr.sbin/smtpd/smtpd.h

9 files changed, 86 insertions, 111 deletions

diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c
index a1b746c4130..7a16f1ad938 100644
--- a/usr.sbin/smtpd/lka.c
+++ b/usr.sbin/smtpd/lka.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: lka.c,v 1.6 2008/12/05 19:09:59 gilles Exp $ */

+/* $OpenBSD: lka.c,v 1.7 2008/12/13 23:19:33 jacekm Exp $ */

@@ -163,7 +163,7 @@ lka_dispatch_mfa(int sig, short event, void *p)

break;

switch (imsg.hdr.type) {

- case IMSG_LKA_LOOKUP_MAIL: {

+ case IMSG_LKA_MAIL: {

struct submit_status *ss;

ss = imsg.data;

@@ -175,12 +175,12 @@ lka_dispatch_mfa(int sig, short event, void *p)

if (lka_verify_mail(env, &ss->u.path))

ss->code = 250;

- imsg_compose(ibuf, IMSG_MFA_LOOKUP_MAIL, 0, 0, -1,

+ imsg_compose(ibuf, IMSG_LKA_MAIL, 0, 0, -1,

ss, sizeof(*ss));

break;

}

- case IMSG_LKA_LOOKUP_RCPT: {

+ case IMSG_LKA_RCPT: {

struct submit_status *ss;

ss = imsg.data;

@@ -189,7 +189,7 @@ lka_dispatch_mfa(int sig, short event, void *p)

if (lka_verify_rcpt(env, &ss->u.path, &ss->ss))

ss->code = 250;

- imsg_compose(ibuf, IMSG_MFA_LOOKUP_RCPT, 0, 0, -1,

+ imsg_compose(ibuf, IMSG_LKA_RCPT, 0, 0, -1,

ss, sizeof(*ss));

break;

@@ -240,7 +240,7 @@ lka_dispatch_smtp(int sig, short event, void *p)

break;

switch (imsg.hdr.type) {

- case IMSG_LKA_HOSTNAME_LOOKUP: {

+ case IMSG_LKA_HOST: {

struct sockaddr *sa = NULL;

socklen_t salen;

@@ -266,9 +266,10 @@ lka_dispatch_smtp(int sig, short event, void *p)

hints.ai_flags = AI_NUMERICHOST;

if (getaddrinfo(addr, "0", &hints, &res) == 0) {

freeaddrinfo(res);

- strlcpy(s->s_hostname, "<bogus>", MAXHOSTNAMELEN);

- imsg_compose(ibuf, IMSG_SMTP_HOSTNAME_ANSWER, 0, 0, -1,

- s, sizeof(struct session));

+ strlcpy(s->s_hostname, "<bogus>",

+ MAXHOSTNAMELEN);

+ imsg_compose(ibuf, IMSG_LKA_HOST, 0, 0,

+ -1, s, sizeof(struct session));

break;

}

} else {

@@ -276,7 +277,7 @@ lka_dispatch_smtp(int sig, short event, void *p)

NULL, 0, NI_NUMERICHOST);

}

strlcpy(s->s_hostname, addr, MAXHOSTNAMELEN);

- imsg_compose(ibuf, IMSG_SMTP_HOSTNAME_ANSWER, 0, 0, -1,

+ imsg_compose(ibuf, IMSG_LKA_HOST, 0, 0, -1,

s, sizeof(struct session));

break;

}

@@ -327,7 +328,7 @@ lka_dispatch_queue(int sig, short event, void *p)

switch (imsg.hdr.type) {

- case IMSG_LKA_ALIAS_LOOKUP: {

+ case IMSG_LKA_ALIAS: {

struct message *messagep;

struct alias *alias;

struct alias *remalias;

@@ -410,7 +411,7 @@ lka_dispatch_queue(int sig, short event, void *p)

TAILQ_FOREACH(alias, &aliases, entry) {

struct message message = *messagep;

lka_resolve_alias(env, ibuf, &message, alias);

- imsg_compose(ibuf, IMSG_LKA_ALIAS_RESULT, 0, 0, -1,

+ imsg_compose(ibuf, IMSG_LKA_ALIAS, 0, 0, -1,

&message, sizeof(struct message));

}

@@ -424,7 +425,7 @@ lka_dispatch_queue(int sig, short event, void *p)

break;

}

- case IMSG_LKA_FORWARD_LOOKUP: {

+ case IMSG_LKA_FORWARD: {

struct message *messagep;

struct aliaseslist aliases;

struct alias *alias;

@@ -444,9 +445,10 @@ lka_dispatch_queue(int sig, short event, void *p)

TAILQ_INIT(&aliases);

if (! forwards_get(&aliases, messagep->recipient.pw_name)) {

messagep->recipient.flags |= F_NOFORWARD;

- imsg_compose(ibuf, IMSG_LKA_FORWARD_LOOKUP, 0, 0, -1, messagep, sizeof(struct message));

- imsg_compose(ibuf, IMSG_QUEUE_REMOVE_SUBMISSION, 0, 0, -1, messagep,

- sizeof(struct message));

+ imsg_compose(ibuf, IMSG_LKA_FORWARD, 0, 0, -1,

+ messagep, sizeof(struct message));

+ imsg_compose(ibuf, IMSG_QUEUE_REMOVE_SUBMISSION,

+ 0, 0, -1, messagep, sizeof(struct message));

break;

}

@@ -457,10 +459,12 @@ lka_dispatch_queue(int sig, short event, void *p)

message.recipient.flags |= F_FORWARDED;

}

- imsg_compose(ibuf, IMSG_LKA_FORWARD_LOOKUP, 0, 0, -1, &message, sizeof(struct message));

+ imsg_compose(ibuf, IMSG_LKA_FORWARD, 0, 0, -1,

+ &message, sizeof(struct message));

}

- imsg_compose(ibuf, IMSG_QUEUE_REMOVE_SUBMISSION, 0, 0, -1, messagep, sizeof(struct message));

+ imsg_compose(ibuf, IMSG_QUEUE_REMOVE_SUBMISSION, 0, 0,

+ -1, messagep, sizeof(struct message));

while ((alias = TAILQ_FIRST(&aliases))) {

TAILQ_REMOVE(&aliases, alias, entry);

@@ -516,7 +520,7 @@ lka_dispatch_runner(int sig, short event, void *p)

break;

switch (imsg.hdr.type) {

- case IMSG_LKA_MX_LOOKUP: {

+ case IMSG_LKA_MX: {

struct batch *batchp;

struct addrinfo hints, *res, *resp;

char **mx = NULL;

@@ -584,7 +588,8 @@ lka_dispatch_runner(int sig, short event, void *p)

batchp->getaddrinfo_error = 0;

if (j == 0)

batchp->getaddrinfo_error = error;

- imsg_compose(ibuf, IMSG_LKA_MX_LOOKUP, 0, 0, -1, batchp, sizeof(*batchp));

+ imsg_compose(ibuf, IMSG_LKA_MX, 0, 0, -1, batchp,

+ sizeof(*batchp));

if (mx != lmx)

free(mx);

diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c
index eb1ce00313a..4bd6007c594 100644
--- a/usr.sbin/smtpd/mda.c
+++ b/usr.sbin/smtpd/mda.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: mda.c,v 1.4 2008/12/05 19:09:59 gilles Exp $ */

+/* $OpenBSD: mda.c,v 1.5 2008/12/13 23:19:34 jacekm Exp $ */

@@ -264,7 +264,7 @@ mda_dispatch_runner(int sig, short event, void *p)

break;

switch (imsg.hdr.type) {

- case IMSG_CREATE_BATCH: {

+ case IMSG_BATCH_CREATE: {

struct batch *batchp;

batchp = calloc(1, sizeof (struct batch));

diff --git a/usr.sbin/smtpd/mfa.c b/usr.sbin/smtpd/mfa.c
index aafacf26838..a6e53fa3ebd 100644
--- a/usr.sbin/smtpd/mfa.c
+++ b/usr.sbin/smtpd/mfa.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: mfa.c,v 1.2 2008/11/05 12:14:45 sobrado Exp $ */

+/* $OpenBSD: mfa.c,v 1.3 2008/12/13 23:19:34 jacekm Exp $ */

@@ -138,7 +138,7 @@ mfa_dispatch_smtp(int sig, short event, void *p)

break;

switch (imsg.hdr.type) {

- case IMSG_MFA_RPATH_SUBMIT: {

+ case IMSG_MFA_MAIL: {

struct message *m;

struct submit_status ss;

@@ -148,11 +148,11 @@ mfa_dispatch_smtp(int sig, short event, void *p)

ss.code = 250;

ss.u.path = m->sender;

- imsg_compose(env->sc_ibufs[PROC_LKA], IMSG_LKA_LOOKUP_MAIL, 0, 0, -1,

- &ss, sizeof(ss));

+ imsg_compose(env->sc_ibufs[PROC_LKA], IMSG_LKA_MAIL, 0,

+ 0, -1, &ss, sizeof(ss));

break;

}

- case IMSG_MFA_RCPT_SUBMIT: {

+ case IMSG_MFA_RCPT: {

struct message_recipient *mr;

struct submit_status ss;

@@ -163,12 +163,10 @@ mfa_dispatch_smtp(int sig, short event, void *p)

ss.u.path = mr->path;

ss.ss = mr->ss;

- imsg_compose(env->sc_ibufs[PROC_LKA], IMSG_LKA_LOOKUP_RCPT, 0, 0, -1,

- &ss, sizeof(ss));

+ imsg_compose(env->sc_ibufs[PROC_LKA], IMSG_LKA_RCPT, 0,

+ 0, -1, &ss, sizeof(ss));

break;

}

- case IMSG_MFA_DATA_SUBMIT:

- break;

default:

log_debug("mfa_dispatch_smtp: unexpected imsg %d",

imsg.hdr.type);

@@ -215,20 +213,20 @@ mfa_dispatch_lka(int sig, short event, void *p)

break;

switch (imsg.hdr.type) {

- case IMSG_MFA_LOOKUP_MAIL: {

+ case IMSG_LKA_MAIL: {

struct submit_status *ss;

ss = imsg.data;

- imsg_compose(env->sc_ibufs[PROC_SMTP], IMSG_MFA_RPATH_SUBMIT, 0, 0, -1,

- ss, sizeof(*ss));

+ imsg_compose(env->sc_ibufs[PROC_SMTP], IMSG_MFA_MAIL,

+ 0, 0, -1, ss, sizeof(*ss));

break;

}

- case IMSG_MFA_LOOKUP_RCPT: {

+ case IMSG_LKA_RCPT: {

struct submit_status *ss;

ss = imsg.data;

- imsg_compose(env->sc_ibufs[PROC_SMTP], IMSG_MFA_RCPT_SUBMIT, 0, 0, -1,

- ss, sizeof(*ss));

+ imsg_compose(env->sc_ibufs[PROC_SMTP], IMSG_MFA_RCPT,

+ 0, 0, -1, ss, sizeof(*ss));

break;

}

default:

diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c
index 284914d80e0..53959a29d87 100644
--- a/usr.sbin/smtpd/mta.c
+++ b/usr.sbin/smtpd/mta.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: mta.c,v 1.10 2008/12/06 02:43:58 jacekm Exp $ */

+/* $OpenBSD: mta.c,v 1.11 2008/12/13 23:19:34 jacekm Exp $ */

@@ -216,7 +216,7 @@ mta_dispatch_runner(int sig, short event, void *p)

break;

switch (imsg.hdr.type) {

- case IMSG_CREATE_BATCH: {

+ case IMSG_BATCH_CREATE: {

struct batch *batchp;

batchp = calloc(1, sizeof (struct batch));

diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c
index 1d3a34724e5..8d77eaefdfc 100644
--- a/usr.sbin/smtpd/queue.c
+++ b/usr.sbin/smtpd/queue.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: queue.c,v 1.24 2008/12/11 23:19:00 gilles Exp $ */

+/* $OpenBSD: queue.c,v 1.25 2008/12/13 23:19:34 jacekm Exp $ */

@@ -190,7 +190,7 @@ queue_dispatch_smtp(int sig, short event, void *p)

if (! queue_create_incoming_layout(ss.u.msgid))

ss.code = 421;

- imsg_compose(ibuf, IMSG_SMTP_MESSAGE_ID, 0, 0, -1,

+ imsg_compose(ibuf, IMSG_QUEUE_CREATE_MESSAGE, 0, 0, -1,

&ss, sizeof(ss));

break;

}

@@ -221,12 +221,12 @@ queue_dispatch_smtp(int sig, short event, void *p)

/* Write to disk */

if (! queue_record_incoming_envelope(messagep)) {

ss.code = 421;

- imsg_compose(ibuf, IMSG_SMTP_SUBMIT_ACK, 0, 0, -1,

- &ss, sizeof(ss));

+ imsg_compose(ibuf, IMSG_QUEUE_SUBMIT_ENVELOPE,

+ 0, 0, -1, &ss, sizeof(ss));

break;

}

- imsg_compose(ibuf, IMSG_SMTP_SUBMIT_ACK, 0, 0, -1,

+ imsg_compose(ibuf, IMSG_QUEUE_SUBMIT_ENVELOPE, 0, 0, -1,

&ss, sizeof(ss));

if (messagep->type & T_MTA_MESSAGE) {

@@ -235,17 +235,19 @@ queue_dispatch_smtp(int sig, short event, void *p)

if ((messagep->recipient.flags & (F_ALIAS|F_VIRTUAL)) == 0) {

/* not an alias, perform ~/.forward resolution */

- imsg_compose(env->sc_ibufs[PROC_LKA], IMSG_LKA_FORWARD_LOOKUP, 0, 0, -1,

- messagep, sizeof(struct message));

+ imsg_compose(env->sc_ibufs[PROC_LKA],

+ IMSG_LKA_FORWARD, 0, 0, -1, messagep,

+ sizeof(struct message));

break;

}

/* Recipient is an alias, proceed to resolving it.

- * ~/.forward will be handled by the IMSG_LKA_ALIAS_RESULT

+ * ~/.forward will be handled by the IMSG_LKA_ALIAS

* dispatch case.

- imsg_compose(env->sc_ibufs[PROC_LKA], IMSG_LKA_ALIAS_LOOKUP, 0, 0, -1,

- messagep, sizeof (struct message));

+ imsg_compose(env->sc_ibufs[PROC_LKA],

+ IMSG_LKA_ALIAS, 0, 0, -1, messagep,

+ sizeof (struct message));

break;

}

@@ -259,7 +261,7 @@ queue_dispatch_smtp(int sig, short event, void *p)

if (! queue_commit_incoming_message(messagep))

ss.code = 421;

- imsg_compose(ibuf, IMSG_SMTP_SUBMIT_ACK, 0, 0, -1,

+ imsg_compose(ibuf, IMSG_QUEUE_COMMIT_MESSAGE, 0, 0, -1,

&ss, sizeof(ss));

break;

@@ -276,7 +278,7 @@ queue_dispatch_smtp(int sig, short event, void *p)

if (fd == -1)

ss.code = 421;

- imsg_compose(ibuf, IMSG_SMTP_MESSAGE_FILE, 0, 0, fd,

+ imsg_compose(ibuf, IMSG_QUEUE_MESSAGE_FILE, 0, 0, fd,

&ss, sizeof(ss));

break;

}

@@ -506,7 +508,7 @@ queue_dispatch_lka(int sig, short event, void *p)

switch (imsg.hdr.type) {

- case IMSG_LKA_ALIAS_RESULT: {

+ case IMSG_LKA_ALIAS: {

struct message *messagep;

messagep = imsg.data;

@@ -515,13 +517,13 @@ queue_dispatch_lka(int sig, short event, void *p)

queue_record_incoming_envelope(messagep);

if (messagep->type & T_MDA_MESSAGE) {

- imsg_compose(ibuf, IMSG_LKA_FORWARD_LOOKUP, 0, 0, -1,

+ imsg_compose(ibuf, IMSG_LKA_FORWARD, 0, 0, -1,

messagep, sizeof(struct message));

}

break;

}

- case IMSG_LKA_FORWARD_LOOKUP: {

+ case IMSG_LKA_FORWARD: {

struct message *messagep;

messagep = (struct message *)imsg.data;

diff --git a/usr.sbin/smtpd/runner.c b/usr.sbin/smtpd/runner.c
index 969945e556a..372f0ffcbdc 100644
--- a/usr.sbin/smtpd/runner.c
+++ b/usr.sbin/smtpd/runner.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: runner.c,v 1.6 2008/12/11 22:59:14 gilles Exp $ */

+/* $OpenBSD: runner.c,v 1.7 2008/12/13 23:19:34 jacekm Exp $ */

@@ -309,7 +309,7 @@ runner_dispatch_lka(int sig, short event, void *p)

break;

switch (imsg.hdr.type) {

- case IMSG_LKA_MX_LOOKUP: {

+ case IMSG_LKA_MX: {

runner_batch_resolved(env, imsg.data);

break;

}

@@ -718,7 +718,7 @@ runner_batch_dispatch(struct smtpd *env, struct batch *batchp, time_t curtime)

else if (batchp->type & T_MTA_BATCH)

proctype = PROC_MTA;

- imsg_compose(env->sc_ibufs[proctype], IMSG_CREATE_BATCH, 0, 0, -1,

+ imsg_compose(env->sc_ibufs[proctype], IMSG_BATCH_CREATE, 0, 0, -1,

batchp, sizeof (struct batch));

while ((messagep = TAILQ_FIRST(&batchp->messages))) {

@@ -827,8 +827,8 @@ batch_record(struct smtpd *env, struct message *messagep)

}

else {

batchp->type |= T_MTA_BATCH;

- imsg_compose(env->sc_ibufs[PROC_LKA], IMSG_LKA_MX_LOOKUP, 0, 0, -1,

- batchp, sizeof(struct batch));

+ imsg_compose(env->sc_ibufs[PROC_LKA], IMSG_LKA_MX,

+ 0, 0, -1, batchp, sizeof(struct batch));

}

diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c
index a85baa45256..be44e27e14d 100644
--- a/usr.sbin/smtpd/smtp.c
+++ b/usr.sbin/smtpd/smtp.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: smtp.c,v 1.8 2008/12/03 17:58:00 gilles Exp $ */

+/* $OpenBSD: smtp.c,v 1.9 2008/12/13 23:19:34 jacekm Exp $ */

@@ -228,8 +228,8 @@ smtp_dispatch_mfa(int sig, short event, void *p)

break;

switch (imsg.hdr.type) {

- case IMSG_MFA_RCPT_SUBMIT:

- case IMSG_MFA_RPATH_SUBMIT: {

+ case IMSG_MFA_MAIL:

+ case IMSG_MFA_RCPT: {

struct submit_status *ss;

struct session *s;

struct session key;

@@ -294,7 +294,7 @@ smtp_dispatch_lka(int sig, short event, void *p)

break;

switch (imsg.hdr.type) {

- case IMSG_SMTP_HOSTNAME_ANSWER: {

+ case IMSG_LKA_HOST: {

struct session key;

struct session *s;

struct session *ss;

@@ -358,7 +358,7 @@ smtp_dispatch_queue(int sig, short event, void *p)

break;

switch (imsg.hdr.type) {

- case IMSG_SMTP_MESSAGE_ID: {

+ case IMSG_QUEUE_CREATE_MESSAGE: {

struct submit_status *ss;

struct session *s;

struct session key;

@@ -379,7 +379,7 @@ smtp_dispatch_queue(int sig, short event, void *p)

session_pickup(s, ss);

break;

}

- case IMSG_SMTP_MESSAGE_FILE: {

+ case IMSG_QUEUE_MESSAGE_FILE: {

struct submit_status *ss;

struct session *s;

struct session key;

@@ -410,7 +410,8 @@ smtp_dispatch_queue(int sig, short event, void *p)

break;

}

- case IMSG_SMTP_SUBMIT_ACK: {

+ case IMSG_QUEUE_SUBMIT_ENVELOPE:

+ case IMSG_QUEUE_COMMIT_MESSAGE: {

struct submit_status *ss;

struct session *s;

struct session key;

diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 4fe9993fc55..105feb28da6 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: smtp_session.c,v 1.26 2008/12/07 15:41:16 jacekm Exp $ */

+/* $OpenBSD: smtp_session.c,v 1.27 2008/12/13 23:19:34 jacekm Exp $ */

@@ -347,7 +347,7 @@ session_rfc5321_mail_handler(struct session *s, char *args)

log_debug("session_mail_handler: sending notification to mfa");

- imsg_compose(s->s_env->sc_ibufs[PROC_MFA], IMSG_MFA_RPATH_SUBMIT,

+ imsg_compose(s->s_env->sc_ibufs[PROC_MFA], IMSG_MFA_MAIL,

0, 0, -1, &s->s_msg, sizeof(s->s_msg));

bufferevent_disable(s->s_bev, EV_READ);

return 1;

@@ -386,7 +386,7 @@ session_rfc5321_rcpt_handler(struct session *s, char *args)

s->s_state = S_RCPTREQUEST;

mr.ss = s->s_ss;

- imsg_compose(s->s_env->sc_ibufs[PROC_MFA], IMSG_MFA_RCPT_SUBMIT,

+ imsg_compose(s->s_env->sc_ibufs[PROC_MFA], IMSG_MFA_RCPT,

0, 0, -1, &mr, sizeof(mr));

bufferevent_disable(s->s_bev, EV_READ);

return 1;

@@ -645,7 +645,7 @@ session_init(struct listener *l, struct session *s)

SPLAY_INSERT(sessiontree, &s->s_env->sc_sessions, s);

- imsg_compose(s->s_env->sc_ibufs[PROC_LKA], IMSG_LKA_HOSTNAME_LOOKUP,

+ imsg_compose(s->s_env->sc_ibufs[PROC_LKA], IMSG_LKA_HOST,

0, 0, -1, s, sizeof(struct session));

if ((s->s_bev = bufferevent_new(s->s_fd, session_read, session_write,

diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index a490bc11098..67376c5ca23 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h

@@ -1,4 +1,4 @@

-/* $OpenBSD: smtpd.h,v 1.26 2008/12/13 13:15:38 jacekm Exp $ */

+/* $OpenBSD: smtpd.h,v 1.27 2008/12/13 23:19:34 jacekm Exp $ */

@@ -156,28 +156,16 @@ enum imsg_type {

IMSG_CONF_OPTION,

IMSG_CONF_END,

IMSG_CONF_RELOAD,

- IMSG_LKA_LOOKUP_MAIL,

- IMSG_LKA_LOOKUP_RCPT,

- IMSG_LKA_ALIAS_LOOKUP,

- IMSG_LKA_VUSER_LOOKUP,

- IMSG_LKA_ALIAS_RESULT,

- IMSG_LKA_VUSER_RESULT,

- IMSG_LKA_ALIAS_RESULT_ACK,

- IMSG_LKA_ALIAS_SCHEDULE,

- IMSG_LKA_ALIAS_END,

- IMSG_LKA_NO_ALIAS,

- IMSG_LKA_MX_LOOKUP,

- IMSG_LKA_FORWARD_LOOKUP,

- IMSG_LKA_HOSTNAME_LOOKUP,

+ IMSG_LKA_MAIL,

+ IMSG_LKA_RCPT,

+ IMSG_LKA_ALIAS,

+ IMSG_LKA_MX,

+ IMSG_LKA_FORWARD,

+ IMSG_LKA_HOST,

IMSG_MDA_MAILBOX_FILE,

IMSG_MDA_MESSAGE_FILE,

- IMSG_MDA_MAILBOX_FILE_ERROR,

- IMSG_MDA_MESSAGE_FILE_ERROR,

- IMSG_MFA_RPATH_SUBMIT,

- IMSG_MFA_RCPT_SUBMIT,

- IMSG_MFA_DATA_SUBMIT,

- IMSG_MFA_LOOKUP_MAIL,

- IMSG_MFA_LOOKUP_RCPT,

+ IMSG_MFA_RCPT,

+ IMSG_MFA_MAIL,

IMSG_QUEUE_CREATE_MESSAGE,

IMSG_QUEUE_SUBMIT_ENVELOPE,

@@ -185,33 +173,14 @@ enum imsg_type {

IMSG_QUEUE_COMMIT_MESSAGE,

IMSG_QUEUE_REMOVE_SUBMISSION,

- IMSG_QUEUE_CREATE_MESSAGE_FILE,

- IMSG_QUEUE_DELETE_MESSAGE_FILE,

- IMSG_QUEUE_MESSAGE_SUBMIT,

IMSG_QUEUE_MESSAGE_UPDATE,

- IMSG_QUEUE_MESSAGE_COMPLETE,

- IMSG_QUEUE_MESSAGE_ACK,

- IMSG_QUEUE_BATCH_COMPLETE,

- IMSG_QUEUE_BATCH_CLOSE,

IMSG_QUEUE_MESSAGE_FD,

IMSG_QUEUE_MESSAGE_FILE,

- IMSG_QUEUE_ACCEPTED_CLOSE,

- IMSG_QUEUE_RETRY_CLOSE,

- IMSG_QUEUE_REJECTED_CLOSE,

- IMSG_QUEUE_RECIPIENT_ACCEPTED,

- IMSG_QUEUE_RECIPIENT_UPDATED,

- IMSG_CREATE_BATCH,

+ IMSG_BATCH_CREATE,

IMSG_BATCH_APPEND,

IMSG_BATCH_CLOSE,

- IMSG_SMTP_MESSAGE_ID,

- IMSG_SMTP_MESSAGE_FILE,

- IMSG_SMTP_SUBMIT_ACK,

- IMSG_SMTP_HOSTNAME_ANSWER,

IMSG_PARENT_MAILBOX_OPEN,

IMSG_PARENT_MESSAGE_OPEN,

IMSG_PARENT_MAILBOX_RENAME,