diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-08-06 13:40:46 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-08-06 13:40:46 +0000 |
| commit | 2ae4b5918b8e7e071b3421e081923a1f8d357c56 (patch) | |
| tree | a9345247824966cb257b493c0a151b01bb024bfa /usr.sbin/smtpd/smtpd.h | |
| parent | 939e6d47367841cb1f3ca05dbfb46c0f17c07331 (diff) | |
This commit reworks the entire mailer daemon support to actually make it
work for real. As an added bonus, it simplifies it, makes it follow the
same code path as regular messages and kills quite some code from mta,
mda and store. There's still some work needed but the most painful part
is behind us now ;)
ok jacekm@
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 1df044dc33e..675efbb996b 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.130 2009/07/28 22:03:55 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.131 2009/08/06 13:40:45 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -76,7 +76,7 @@ #define PATH_RUNQUEUELOW "/runqueue-low" #define PATH_OFFLINE "/offline" -#define PATH_DAEMON "/daemon" +#define PATH_BOUNCE "/bounce" /* number of MX records to lookup */ #define MAX_MX_COUNT 10 @@ -606,7 +606,7 @@ struct smtpd { u_int32_t sc_maxconn; struct event sc_ev; int *sc_pipes[PROC_COUNT] - [PROC_COUNT]; + [PROC_COUNT]; struct imsgev *sc_ievs[PROC_COUNT]; int sc_instances[PROC_COUNT]; int sc_instance; @@ -740,6 +740,11 @@ int aliases_virtual_exist(struct smtpd *, struct path *); int aliases_virtual_get(struct smtpd *, struct aliaseslist *, struct path *); int alias_parse(struct alias *, char *); +/* bounce.c */ +void bounce_process(struct smtpd *, struct message *); +int bounce_session(struct smtpd *, int, struct message *); +int bounce_session_switch(struct smtpd *, FILE *, enum session_state *, char *, + struct message *); /* log.c */ void log_init(int); @@ -809,12 +814,12 @@ int enqueue_record_envelope(struct message *); int enqueue_remove_envelope(struct message *); int enqueue_commit_message(struct message *); int enqueue_open_messagefile(struct message *); -int daemon_create_layout(char *, struct message *); -void daemon_delete_message(char *); -int daemon_record_envelope(struct message *); -int daemon_remove_envelope(struct message *); -int daemon_commit_message(struct message *); -int daemon_record_message(struct message *); +int bounce_create_layout(char *, struct message *); +void bounce_delete_message(char *); +int bounce_record_envelope(struct message *); +int bounce_remove_envelope(struct message *); +int bounce_commit_message(struct message *); +int bounce_record_message(struct message *); int queue_create_incoming_layout(char *); void queue_delete_incoming_message(char *); int queue_record_incoming_envelope(struct message *); @@ -868,11 +873,12 @@ void session_bufferevent_new(struct session *); SPLAY_PROTOTYPE(sessiontree, session, s_nodes, session_cmp); /* store.c */ +int +file_copy_session(struct smtpd *, FILE *, FILE *); int store_write_header(struct batch *, struct message *, FILE *, int); int store_write_message(struct batch *, struct message *); int store_write_daemon(struct batch *, struct message *); -int store_message(struct batch *, struct message *, - int (*)(struct batch *, struct message *)); +int store_message(struct batch *, struct message *); /* config.c */ #define PURGE_LISTENERS 0x01 |