diff options
| author |   gilles <gilles@poolp.org> | 2016-09-01 12:41:52 +0200 |
|---|---|---|
| committer | gilles <gilles@poolp.org> | 2016-09-01 12:41:52 +0200 |
| commit | 5d84737b42c5fdc38a572e69a6875a05b3e6d1de (patch) | |
| tree | d0ce61b31fb291edcfab8acd7dbe8e88186f2ee7 /smtpd/smtpd.h | |
| parent | bring back CVS/ in gitignore (diff) | |
| download | OpenSMTPD-5d84737b42c5fdc38a572e69a6875a05b3e6d1de.tar.xz OpenSMTPD-5d84737b42c5fdc38a572e69a6875a05b3e6d1de.zip | |
sync with OpenBSD
Diffstat (limited to 'smtpd/smtpd.h')
| -rw-r--r-- | smtpd/smtpd.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/smtpd/smtpd.h b/smtpd/smtpd.h index 943a998c..be15fe87 100644 --- a/smtpd/smtpd.h +++ b/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.520 2016/09/01 10:07:20 eric Exp $ */ +/* $OpenBSD: smtpd.h,v 1.519 2016/08/31 21:49:01 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -52,7 +52,7 @@ #define SMTPD_QUEUE_EXPIRY (4 * 24 * 60 * 60) #define SMTPD_SOCKET "/var/run/smtpd.sock" #define SMTPD_NAME "OpenSMTPD" -#define SMTPD_VERSION "master" +#define SMTPD_VERSION "6.0.0" #define SMTPD_SESSION_TIMEOUT 300 #define SMTPD_BACKLOG 5 @@ -395,6 +395,8 @@ struct rule { enum dest_type r_desttype; struct table *r_destination; + uint8_t r_wantauth; + enum action_type r_action; union rule_dest { char buffer[EXPAND_BUFFER]; @@ -633,6 +635,8 @@ struct smtpd { char sc_enqueue_filter[PATH_MAX]; char *sc_tls_ciphers; + + char *sc_subaddressing_delim; }; #define TRACE_DEBUG 0x0001 @@ -654,6 +658,7 @@ struct smtpd { #define PROFILE_TOSTAT 0x0001 #define PROFILE_IMSG 0x0002 #define PROFILE_QUEUE 0x0004 +#define PROFILE_BUFFERS 0x0008 struct forward_req { uint64_t id; @@ -1004,6 +1009,13 @@ struct mproc { short events; struct event ev; void *data; + + off_t msg_in; + off_t msg_out; + off_t bytes_in; + off_t bytes_out; + size_t bytes_queued; + size_t bytes_queued_max; }; struct msg { @@ -1329,7 +1341,6 @@ int cmdline_symset(char *); /* queue.c */ int queue(void); -void queue_flow_control(void); /* queue_backend.c */ |