diff options
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
-rw-r--r-- | usr.sbin/smtpd/smtpd.h | 54 |
1 files changed, 1 insertions, 53 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 9dbe77e26e0..961b8a78ab4 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.421 2013/07/19 21:14:52 eric Exp $ */ +/* $OpenBSD: smtpd.h,v 1.422 2013/07/19 21:34:31 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -356,12 +356,6 @@ struct rule { time_t r_qexpire; }; -enum delivery_type { - D_MDA, - D_MTA, - D_BOUNCE, -}; - struct delivery_mda { enum action_type method; char usertable[SMTPD_MAXPATHLEN]; @@ -425,18 +419,6 @@ struct expand { struct expandnode *parent; }; -enum envelope_flags { - EF_AUTHENTICATED = 0x01, - EF_BOUNCE = 0x02, - EF_INTERNAL = 0x04, /* Internal expansion forward */ - - /* runstate, not saved on disk */ - - EF_PENDING = 0x10, - EF_INFLIGHT = 0x20, - EF_SUSPEND = 0x40, -}; - #define SMTPD_ENVELOPE_VERSION 1 struct envelope { TAILQ_ENTRY(envelope) entry; @@ -819,40 +801,6 @@ struct delivery_backend { void (*open)(struct deliver *); }; -struct evpstate { - uint64_t evpid; - uint16_t flags; - uint16_t retry; - time_t time; -}; - -struct scheduler_info { - uint64_t evpid; - enum delivery_type type; - uint16_t retry; - time_t creation; - time_t expire; - time_t lasttry; - time_t lastbounce; - time_t nexttry; - uint8_t penalty; -}; - -#define SCHED_NONE 0x00 -#define SCHED_DELAY 0x01 -#define SCHED_REMOVE 0x02 -#define SCHED_EXPIRE 0x04 -#define SCHED_BOUNCE 0x08 -#define SCHED_MDA 0x10 -#define SCHED_MTA 0x20 - -struct scheduler_batch { - int type; - time_t delay; - size_t evpcount; - uint64_t *evpids; -}; - struct scheduler_backend { int (*init)(void); |