diff options
| author | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-06-03 22:04:16 +0000 |
|---|---|---|
| committer | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-06-03 22:04:16 +0000 |
| commit | b96794b04ab20a0aba439e48813238555739661d (patch) | |
| tree | 5316484334804021fee90f1872290821f7eaee6d /usr.sbin/smtpd/smtpd.h | |
| parent | 92dea3ae2d2150056dc43e3e79a2a289ae8596ac (diff) | |
simplify struct batch; ok gilles@
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 4d6b7505fca..d46a07985f4 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.123 2009/06/03 18:16:29 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.124 2009/06/03 22:04:15 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -498,13 +498,6 @@ enum batch_type { T_DAEMON_BATCH = 0x4 }; -enum batch_flags { - F_BATCH_COMPLETE = 0x1, - F_BATCH_RESOLVED = 0x2, - F_BATCH_SCHEDULED = 0x4, - F_BATCH_EXPIRED = 0x8, -}; - enum child_type { CHILD_INVALID, CHILD_DAEMON, @@ -524,34 +517,23 @@ struct batch { SPLAY_ENTRY(batch) b_nodes; u_int64_t id; - u_int64_t session_id; enum batch_type type; - enum batch_flags flags; - - struct rule rule; - - struct smtpd *env; - - char message_id[MAX_ID_SIZE]; - char hostname[MAXHOSTNAMELEN]; - char errorline[MAX_LINE_SIZE]; + struct rule rule; - char session_helo[MAXHOSTNAMELEN]; - char session_hostname[MAXHOSTNAMELEN]; - struct sockaddr_storage session_ss; + struct smtpd *env; - time_t creation; - time_t lasttry; - u_int8_t retry; + char message_id[MAX_ID_SIZE]; + char hostname[MAXHOSTNAMELEN]; + char errorline[MAX_LINE_SIZE]; - struct session *sessionp; + struct session *sessionp; - struct message message; - struct message *messagep; - FILE *messagefp; - TAILQ_HEAD(messagelist, message) messages; + struct message message; + struct message *messagep; + FILE *messagefp; + TAILQ_HEAD(, message) messages; - enum batch_status status; + enum batch_status status; }; enum session_state { |