summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/smtpd.h
diff options
context:
space:
mode:
authorEric Faurot <eric@cvs.openbsd.org>2013-11-20 09:22:43 +0000
committerEric Faurot <eric@cvs.openbsd.org>2013-11-20 09:22:43 +0000
commit8b99e878a37f7c221d3846f92a0392a8c1eccf7c (patch)
tree2b25c614e2116b49af93c48ed781f95ec7f027b0 /usr.sbin/smtpd/smtpd.h
parentaf572325dc2535179e84c6bd340fe689e35ce89f (diff)
Rework the mda and scheduler to use the holdq mechanism instead of
tempfail for limiting the number of pending deliveries to the same user. This allows to reach optimal delivery time even in case of burst, while keeping the number of inflight envelopes low.
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
-rw-r--r--usr.sbin/smtpd/smtpd.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index 38d5d1bf19a..a2278d417ae 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.435 2013/11/19 10:01:20 eric Exp $ */
+/* $OpenBSD: smtpd.h,v 1.436 2013/11/20 09:22:42 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -505,7 +505,14 @@ struct smtpd {
char *sc_queue_key;
size_t sc_queue_evpcache_size;
+ size_t sc_mda_max_session;
+ size_t sc_mda_max_user_session;
+ size_t sc_mda_task_hiwat;
+ size_t sc_mda_task_lowat;
+ size_t sc_mda_task_release;
+
size_t sc_scheduler_max_inflight;
+
int sc_qexpire;
#define MAX_BOUNCE_WARN 4
time_t sc_bounce_warn[MAX_BOUNCE_WARN];
@@ -798,7 +805,7 @@ struct scheduler_backend {
int (*update)(struct scheduler_info *);
int (*delete)(uint64_t);
int (*hold)(uint64_t, uint64_t);
- int (*release)(uint64_t, int);
+ int (*release)(int, uint64_t, int);
int (*batch)(int, struct scheduler_batch *);