remove struct relayhost from struct envelope.

ok gilles@

2 files changed, 38 insertions, 42 deletions

diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c
index 16460131da9..62beb50e9a8 100644
--- a/usr.sbin/smtpd/mta.c
+++ b/usr.sbin/smtpd/mta.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mta.c,v 1.214 2018/06/01 12:24:16 eric Exp $	*/
+/*	$OpenBSD: mta.c,v 1.215 2018/06/05 11:34:21 eric Exp $	*/
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -81,7 +81,7 @@ static void mta_log(const struct mta_envelope *, const char *, const char *,
     const char *, const char *);
 
 SPLAY_HEAD(mta_relay_tree, mta_relay);
-static struct mta_relay *mta_relay(struct envelope *);
+static struct mta_relay *mta_relay(struct envelope *, struct relayhost *);
 static void mta_relay_ref(struct mta_relay *);
 static void mta_relay_unref(struct mta_relay *);
 static void mta_relay_show(struct mta_relay *, struct mproc *, uint32_t, time_t);
@@ -629,6 +629,7 @@ mta_handle_envelope(struct envelope *evp, const char *smarthost)
 	struct mta_envelope	*e;
 	struct dispatcher	*dispatcher;
 	struct mailaddr		 maddr;
+	struct relayhost	 relayh;
 	char			 buf[LINE_MAX], *backupmx;
 
 	dispatcher = dict_xget(env->sc_dispatchers, evp->dispatcher);
@@ -637,37 +638,37 @@ mta_handle_envelope(struct envelope *evp, const char *smarthost)
 		return;
 	}
 
-	memset(&evp->agent.mta, 0, sizeof(evp->agent.mta));
+	memset(&relayh, 0, sizeof(relayh));
 
 	/* dispatcher init */
 	if (dispatcher->u.remote.pki)
-		strlcpy(evp->agent.mta.relay.pki_name, dispatcher->u.remote.pki,
-		    sizeof(evp->agent.mta.relay.pki_name));
+		strlcpy(relayh.pki_name, dispatcher->u.remote.pki,
+		    sizeof(relayh.pki_name));
 	if (dispatcher->u.remote.ca)
-		strlcpy(evp->agent.mta.relay.ca_name, dispatcher->u.remote.ca,
-		    sizeof(evp->agent.mta.relay.ca_name));
+		strlcpy(relayh.ca_name, dispatcher->u.remote.ca,
+		    sizeof(relayh.ca_name));
 	if (dispatcher->u.remote.auth)
-		strlcpy(evp->agent.mta.relay.authtable, dispatcher->u.remote.auth,
-		    sizeof(evp->agent.mta.relay.authtable));
+		strlcpy(relayh.authtable, dispatcher->u.remote.auth,
+		    sizeof(relayh.authtable));
 	if (dispatcher->u.remote.source)
-		strlcpy(evp->agent.mta.relay.sourcetable, dispatcher->u.remote.source,
-		    sizeof(evp->agent.mta.relay.sourcetable));
+		strlcpy(relayh.sourcetable, dispatcher->u.remote.source,
+		    sizeof(relayh.sourcetable));
 	if (dispatcher->u.remote.helo_source)
-		strlcpy(evp->agent.mta.relay.helotable, dispatcher->u.remote.helo_source,
-		    sizeof(evp->agent.mta.relay.helotable));
+		strlcpy(relayh.helotable, dispatcher->u.remote.helo_source,
+		    sizeof(relayh.helotable));
 	if (dispatcher->u.remote.helo)
-		strlcpy(evp->agent.mta.relay.heloname, dispatcher->u.remote.helo,
-		    sizeof(evp->agent.mta.relay.heloname));
+		strlcpy(relayh.heloname, dispatcher->u.remote.helo,
+		    sizeof(relayh.heloname));
 	if (dispatcher->u.remote.backup) {
-		evp->agent.mta.relay.flags |= RELAY_BACKUP;
+		relayh.flags |= RELAY_BACKUP;
 		backupmx = dispatcher->u.remote.backupmx;
 		if (backupmx == NULL)
 			backupmx = evp->smtpname;
-		strlcpy(evp->agent.mta.relay.hostname, backupmx,
-		    sizeof(evp->agent.mta.relay.hostname));
+		strlcpy(relayh.hostname, backupmx,
+		    sizeof(relayh.hostname));
 	}
 
-	if (smarthost && !text_to_relayhost(&evp->agent.mta.relay, smarthost)) {
+	if (smarthost && !text_to_relayhost(&relayh, smarthost)) {
 		log_warnx("warn: Failed to parse smarthost %s", smarthost);
 		m_create(p_queue, IMSG_MTA_DELIVERY_TEMPFAIL, 0, 0, -1);
 		m_add_evpid(p_queue, evp->id);
@@ -678,9 +679,9 @@ mta_handle_envelope(struct envelope *evp, const char *smarthost)
 	}
 
 	if (smarthost && dispatcher->u.remote.tls_noverify == 0)
-		evp->agent.mta.relay.flags |= F_TLS_VERIFY;
+		relayh.flags |= F_TLS_VERIFY;
 
-	relay = mta_relay(evp);
+	relay = mta_relay(evp, &relayh);
 	/* ignore if we don't know the limits yet */
 	if (relay->limits &&
 	    relay->ntask >= (size_t)relay->limits->task_hiwat) {
@@ -1727,45 +1728,45 @@ mta_log(const struct mta_envelope *evp, const char *prefix, const char *source,
 }
 
 static struct mta_relay *
-mta_relay(struct envelope *e)
+mta_relay(struct envelope *e, struct relayhost *relayh)
 {
 	struct mta_relay	 key, *r;
 
 	memset(&key, 0, sizeof key);
 
-	if (e->agent.mta.relay.flags & RELAY_BACKUP) {
+	if (relayh->flags & RELAY_BACKUP) {
 		key.domain = mta_domain(e->dest.domain, 0);
-		key.backupname = e->agent.mta.relay.hostname;
-	} else if (e->agent.mta.relay.hostname[0]) {
-		key.domain = mta_domain(e->agent.mta.relay.hostname, 1);
+		key.backupname = relayh->hostname;
+	} else if (relayh->hostname[0]) {
+		key.domain = mta_domain(relayh->hostname, 1);
 		key.flags |= RELAY_MX;
 	} else {
 		key.domain = mta_domain(e->dest.domain, 0);
-		if (!(e->agent.mta.relay.flags & RELAY_STARTTLS))
+		if (!(relayh->flags & RELAY_STARTTLS))
 			key.flags |= RELAY_TLS_OPTIONAL;
 	}
 
-	key.flags |= e->agent.mta.relay.flags;
-	key.port = e->agent.mta.relay.port;
-	key.pki_name = e->agent.mta.relay.pki_name;
+	key.flags |= relayh->flags;
+	key.port = relayh->port;
+	key.pki_name = relayh->pki_name;
 	if (!key.pki_name[0])
 		key.pki_name = NULL;
-	key.ca_name = e->agent.mta.relay.ca_name;
+	key.ca_name = relayh->ca_name;
 	if (!key.ca_name[0])
 		key.ca_name = NULL;
-	key.authtable = e->agent.mta.relay.authtable;
+	key.authtable = relayh->authtable;
 	if (!key.authtable[0])
 		key.authtable = NULL;
-	key.authlabel = e->agent.mta.relay.authlabel;
+	key.authlabel = relayh->authlabel;
 	if (!key.authlabel[0])
 		key.authlabel = NULL;
-	key.sourcetable = e->agent.mta.relay.sourcetable;
+	key.sourcetable = relayh->sourcetable;
 	if (!key.sourcetable[0])
 		key.sourcetable = NULL;
-	key.helotable = e->agent.mta.relay.helotable;
+	key.helotable = relayh->helotable;
 	if (!key.helotable[0])
 		key.helotable = NULL;
-	key.heloname = e->agent.mta.relay.heloname;
+	key.heloname = relayh->heloname;
 	if (!key.heloname[0])
 		key.heloname = NULL;
 
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index 4c60441ac71..84729a33a41 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.h,v 1.549 2018/06/04 15:57:46 gilles Exp $	*/
+/*	$OpenBSD: smtpd.h,v 1.550 2018/06/05 11:34:21 eric Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -357,10 +357,6 @@ struct table_backend {
 };
 
 
-struct delivery_mta {
-	struct relayhost	relay;
-};
-
 enum bounce_type {
 	B_ERROR,
 	B_WARNING,
@@ -462,7 +458,6 @@ struct envelope {
 
 	enum delivery_type		type;
 	union {
-		struct delivery_mta	mta;
 		struct delivery_bounce	bounce;
 	}				agent;