From: Kai Blin <kai@samba.org>
Date: Sat, 13 Oct 2012 00:09:57 +0000 (+0200)
Subject: libcli/dns: Time out requests after a while
X-Git-Tag: ldb-1.1.14~276
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05a59748910cc11d43bffbfc4d00fdf3701e2ca1;p=thirdparty%2Fsamba.git

libcli/dns: Time out requests after a while

Time out UDP requests after DNS_REQUEST_TIMEOUT seconds. Currently set
to 2 seconds.

This should fix bug #8878.

Signed-off-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Oct 16 12:58:32 CEST 2012 on sn-devel-104
---

diff --git a/libcli/dns/dns.c b/libcli/dns/dns.c
index da65ce4c4ff..43e1c4e0c79 100644
--- a/libcli/dns/dns.c
+++ b/libcli/dns/dns.c
@@ -38,6 +38,8 @@ struct dns_udp_request_state {
 	size_t reply_len;
 };
 
+#define DNS_REQUEST_TIMEOUT 2
+
 /* Declare callback functions used below. */
 static void dns_udp_request_get_reply(struct tevent_req *subreq);
 static void dns_udp_request_done(struct tevent_req *subreq);
@@ -92,6 +94,12 @@ struct tevent_req *dns_udp_request_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
+	if (!tevent_req_set_endtime(req, ev,
+				timeval_current_ofs(DNS_REQUEST_TIMEOUT, 0))) {
+		return tevent_req_post(req, ev);
+	}
+
+
 	tevent_req_set_callback(subreq, dns_udp_request_get_reply, req);
 	return req;
 }