X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fmodules%2Fdns.h;h=3db651798e0028267b8f91279a353ab4dbb382ba;hb=79892a727e323dcc4bce7e9c0cf3c99c5fe61706;hp=5f28367618c92acf23d08a170aafa60e30980010;hpb=5267fb9d362aeb326c9e64f7171c957f76776f90;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/modules/dns.h b/include/modules/dns.h
index 5f2836761..3db651798 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -33,6 +33,8 @@ namespace DNS
 		QUERY_CNAME = 5,
 		/* Reverse DNS lookup */
 		QUERY_PTR = 12,
+		/* TXT */
+		QUERY_TXT = 16,
 		/* IPv6 AAAA lookup */
 		QUERY_AAAA = 28
 	};
@@ -162,7 +164,7 @@ namespace DNS
 		Module* const creator;
 
 		Request(Manager* mgr, Module* mod, const std::string& addr, QueryType qt, bool usecache = true)
-			: Timer((ServerInstance->Config->dns_timeout ? ServerInstance->Config->dns_timeout : 5))
+			: Timer(ServerInstance->Config->ConfValue("dns")->getDuration("timeout", 5, 1))
 			, manager(mgr)
 			, question(addr, qt)
 			, use_cache(usecache)
@@ -189,7 +191,7 @@ namespace DNS
 		/** Used to time out the query, calls OnError and asks the TimerManager
 		 * to delete this request
 		 */
-		bool Tick(time_t now)
+		bool Tick(time_t now) CXX11_OVERRIDE
 		{
 			Query rr(this->question);
 			rr.error = ERROR_TIMEDOUT;