diff options
| author |   gilles <gilles@openbsd.org> | 2015-12-01 10:41:35 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2015-12-01 10:41:35 +0000 |
| commit | 2aa70c648ee78ea709ff31d3e5fec315d05af59d (patch) | |
| tree | d2328c2599dac8eb3c5c9f1ceb485a4ca034c5b7 | |
| parent | Do not wait when allocating a page in vcpu_init(). (diff) | |
| download | wireguard-openbsd-2aa70c648ee78ea709ff31d3e5fec315d05af59d.tar.xz wireguard-openbsd-2aa70c648ee78ea709ff31d3e5fec315d05af59d.zip | |
delay between retries when operating as a secondary MX increases too much,
reduce it to something saner. while at it cleanup some whitespaces and set
the relay task pointer to NULL before iterating over tasks
| -rw-r--r-- | usr.sbin/smtpd/mta.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c index 2bed1437527..b5fc8dabf09 100644 --- a/usr.sbin/smtpd/mta.c +++ b/usr.sbin/smtpd/mta.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mta.c,v 1.194 2015/11/30 12:49:35 gilles Exp $ */ +/* $OpenBSD: mta.c,v 1.195 2015/12/01 10:41:35 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -51,8 +51,8 @@ #define DELAY_CHECK_LIMIT 5 #define DELAY_QUADRATIC 1 -#define DELAY_ROUTE_BASE 200 -#define DELAY_ROUTE_MAX (3600 * 4) +#define DELAY_ROUTE_BASE 15 +#define DELAY_ROUTE_MAX 3600 #define RELAY_ONHOLD 0x01 #define RELAY_HOLDQ 0x02 @@ -232,6 +232,7 @@ mta_imsg(struct mproc *p, struct imsg *imsg) return; } + task = NULL; TAILQ_FOREACH(task, &relay->tasks, entry) if (task->msgid == evpid_to_msgid(evp.id)) break; @@ -413,7 +414,7 @@ mta_imsg(struct mproc *p, struct imsg *imsg) if (p->proc == PROC_CONTROL) { switch (imsg->hdr.type) { - + case IMSG_CTL_RESUME_ROUTE: u64 = *((uint64_t *)imsg->data); if (u64) @@ -667,7 +668,7 @@ mta_route_collect(struct mta_relay *relay, struct mta_route *route) /* First connection failed */ if (route->flags & ROUTE_NEW) - mta_route_disable(route, 2, ROUTE_DISABLED_NET); + mta_route_disable(route, 1, ROUTE_DISABLED_NET); c = mta_connector(relay, route->src); c->nconn -= 1; |