diff options
| -rw-r--r-- | usr.sbin/smtpd/mda.c | 21 | ||||
| -rw-r--r-- | usr.sbin/smtpd/mfa.c | 21 | ||||
| -rw-r--r-- | usr.sbin/smtpd/mta.c | 21 |
3 files changed, 3 insertions, 60 deletions
diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c index 8818bdfc61c..d0ed665bc6f 100644 --- a/usr.sbin/smtpd/mda.c +++ b/usr.sbin/smtpd/mda.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mda.c,v 1.14 2009/04/21 14:37:32 eric Exp $ */ +/* $OpenBSD: mda.c,v 1.15 2009/04/28 21:27:25 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -40,7 +40,6 @@ void mda_dispatch_queue(int, short, void *); void mda_dispatch_runner(int, short, void *); void mda_setup_events(struct smtpd *); void mda_disable_events(struct smtpd *); -void mda_timeout(int, short, void *); void mda_remove_message(struct smtpd *, struct batch *, struct message *x); void @@ -365,29 +364,11 @@ mda_shutdown(void) void mda_setup_events(struct smtpd *env) { - struct timeval tv; - - evtimer_set(&env->sc_ev, mda_timeout, env); - tv.tv_sec = 3; - tv.tv_usec = 0; - evtimer_add(&env->sc_ev, &tv); } void mda_disable_events(struct smtpd *env) { - evtimer_del(&env->sc_ev); -} - -void -mda_timeout(int fd, short event, void *p) -{ - struct smtpd *env = p; - struct timeval tv; - - tv.tv_sec = 3; - tv.tv_usec = 0; - evtimer_add(&env->sc_ev, &tv); } pid_t diff --git a/usr.sbin/smtpd/mfa.c b/usr.sbin/smtpd/mfa.c index d6158e0341c..5c1ba121714 100644 --- a/usr.sbin/smtpd/mfa.c +++ b/usr.sbin/smtpd/mfa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfa.c,v 1.22 2009/04/27 16:15:21 jacekm Exp $ */ +/* $OpenBSD: mfa.c,v 1.23 2009/04/28 21:27:25 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -45,7 +45,6 @@ void mfa_dispatch_lka(int, short, void *); void mfa_dispatch_control(int, short, void *); void mfa_setup_events(struct smtpd *); void mfa_disable_events(struct smtpd *); -void mfa_timeout(int, short, void *); void mfa_test_mail(struct smtpd *, struct message *); void mfa_test_rcpt(struct smtpd *, struct message *); @@ -284,29 +283,11 @@ mfa_shutdown(void) void mfa_setup_events(struct smtpd *env) { - struct timeval tv; - - evtimer_set(&env->sc_ev, mfa_timeout, env); - tv.tv_sec = 3; - tv.tv_usec = 0; - evtimer_add(&env->sc_ev, &tv); } void mfa_disable_events(struct smtpd *env) { - evtimer_del(&env->sc_ev); -} - -void -mfa_timeout(int fd, short event, void *p) -{ - struct smtpd *env = p; - struct timeval tv; - - tv.tv_sec = 3; - tv.tv_usec = 0; - evtimer_add(&env->sc_ev, &tv); } pid_t diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c index ade8e0bd09a..af21dd807c0 100644 --- a/usr.sbin/smtpd/mta.c +++ b/usr.sbin/smtpd/mta.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mta.c,v 1.42 2009/04/21 14:37:32 eric Exp $ */ +/* $OpenBSD: mta.c,v 1.43 2009/04/28 21:27:25 jacekm Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -47,7 +47,6 @@ void mta_dispatch_runner(int, short, void *); void mta_dispatch_lka(int, short, void *); void mta_setup_events(struct smtpd *); void mta_disable_events(struct smtpd *); -void mta_timeout(int, short, void *); void mta_write(int, short, void *); int mta_connect(struct session *); void mta_read_handler(struct bufferevent *, void *); @@ -408,29 +407,11 @@ mta_shutdown(void) void mta_setup_events(struct smtpd *env) { - struct timeval tv; - - evtimer_set(&env->sc_ev, mta_timeout, env); - tv.tv_sec = 3; - tv.tv_usec = 0; - evtimer_add(&env->sc_ev, &tv); } void mta_disable_events(struct smtpd *env) { - evtimer_del(&env->sc_ev); -} - -void -mta_timeout(int fd, short event, void *p) -{ - struct smtpd *env = p; - struct timeval tv; - - tv.tv_sec = 3; - tv.tv_usec = 0; - evtimer_add(&env->sc_ev, &tv); } pid_t |