diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-03-08 19:11:23 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-03-08 19:11:23 +0000 |
| commit | 6ed5df817e31046b1bd269b6517373fb1e1c461d (patch) | |
| tree | e73453d93b50b8cb7b46d79a85de88af14738d4c /usr.sbin/smtpd/smtpd.h | |
| parent | 0d7903fa953304a8193884b221242d4de81f8fdf (diff) | |
shrink struct message a bit by removing a couple fields which are no longer
used and by moving the rcpt count in struct session where it really belongs
while at it, remove some unused splay tree generation in mfa
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 23ad369074f..fcffac6333b 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.84 2009/03/08 17:54:20 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.85 2009/03/08 19:11:22 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -424,7 +424,6 @@ enum message_flags { }; struct message { - SPLAY_ENTRY(message) nodes; TAILQ_ENTRY(message) entry; enum message_type type; @@ -444,15 +443,13 @@ struct message { struct path sender; struct path recipient; - TAILQ_HEAD(pathlist,path) recipients; - - u_int16_t rcptcount; time_t creation; time_t lasttry; u_int8_t retry; enum message_flags flags; enum message_status status; + FILE *datafp; int mboxfd; int messagefd; @@ -609,6 +606,7 @@ struct session { int s_buflen; struct timeval s_tv; struct message s_msg; + u_int32_t rcptcount; struct session_auth_req s_auth; @@ -808,7 +806,6 @@ SPLAY_PROTOTYPE(lkatree, lkasession, nodes, lkasession_cmp); /* mfa.c */ pid_t mfa(struct smtpd *); int msg_cmp(struct message *, struct message *); -SPLAY_PROTOTYPE(msgtree, message, nodes, msg_cmp); /* queue.c */ pid_t queue(struct smtpd *); |