commit 43f97b7c420dd7281de55b19f215a7221e41c3b9
from: Martijn van Duren <martijn@openbsd.org>
date: Mon Jun 24 15:49:48 2019 UTC

Remove timeout code. It hinders more than it helps

commit - ed005105533320c10c63f61686a3aee3b564904d
commit + 43f97b7c420dd7281de55b19f215a7221e41c3b9
blob - 2550621eb35fce6633bedea3301b8734092ca004
blob + 346f9822741ed8a6ce7cafbef358d69fc628be58
--- main.c
+++ main.c
@@ -37,7 +37,6 @@ struct dnsbl_session;
 struct dnsbl_query {
 	struct asr_query *query;
 	struct event_asr *event;
-	struct event timeout;
 	int resolved;
 	int blacklist;
 	struct dnsbl_session *session;
@@ -70,7 +69,6 @@ void dnsbl_dataline(char *, int, struct timespec *, ch
     uint64_t, char *);
 void dnsbl_disconnect(char *, int, struct timespec *, char *, char *, uint64_t);
 void dnsbl_resolve(struct asr_result *, void *);
-void dnsbl_timeout(int, short, void *);
 void dnsbl_session_query_done(struct dnsbl_session *);
 void dnsbl_session_free(struct dnsbl_session *);
 int dnsbl_session_cmp(struct dnsbl_session *, struct dnsbl_session *);
@@ -124,7 +122,6 @@ dnsbl_connect(char *type, int version, struct timespec
     struct inx_addr *xaddr)
 {
 	struct dnsbl_session *session;
-	struct timeval timeout = {1, 0};
 	char query[255];
 	u_char *addr;
 	int i, try;
@@ -187,9 +184,6 @@ dnsbl_connect(char *type, int version, struct timespec
 		    dnsbl_resolve, &(session->query[i]));
 		session->query[i].blacklist = i;
 		session->query[i].session = session;
-		evtimer_set(&(session->query[i].timeout), dnsbl_timeout,
-		    &(session->query[i]));
-		evtimer_add(&(session->query[i].timeout), &timeout);
 	}
 }
 
@@ -203,7 +197,6 @@ dnsbl_resolve(struct asr_result *result, void *arg)
 	query->resolved = 1;
 	query->event = NULL;
 	query->query = NULL;
-	evtimer_del(&(query->timeout));
 	if (result->ar_hostent != NULL) {
 		if (!markspam) {
 			smtp_filter_disconnect(session->reqid, session->token,
@@ -235,17 +228,6 @@ dnsbl_resolve(struct asr_result *result, void *arg)
 }
 
 void
-dnsbl_timeout(int fd, short event, void *arg)
-{
-	struct dnsbl_query *query = arg;
-	struct dnsbl_session *session = query->session;
-
-	smtp_filter_disconnect(session->reqid, session->token,
-	    "DNS timeout on %s", blacklists[query->blacklist]);
-	dnsbl_session_free(session);
-}
-
-void
 dnsbl_disconnect(char *type, int version, struct timespec *tm, char *direction,
     char *phase, uint64_t reqid)
 {
@@ -303,7 +285,6 @@ dnsbl_session_query_done(struct dnsbl_session *session
 	for (i = 0; i < nblacklists; i++) {
 		if (!session->query[i].resolved) {
 			event_asr_abort(session->query[i].event);
-			evtimer_del(&(session->query[i].timeout));
 			session->query[i].resolved = 1;
 		}
 	}