X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fmodules%2Fdns.h;h=3db651798e0028267b8f91279a353ab4dbb382ba;hb=65f74be719bf249f4bc93e09670ee07410ecec96;hp=65a1762b33c099f6b3408ba3140a0366d5f36842;hpb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/modules/dns.h b/include/modules/dns.h
index 65a1762b3..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
 	};
@@ -57,6 +59,7 @@ namespace DNS
 		ERROR_UNKNOWN,
 		ERROR_UNLOADED,
 		ERROR_TIMEDOUT,
+		ERROR_MALFORMED,
 		ERROR_NOT_AN_ANSWER,
 		ERROR_NONSTANDARD_QUERY,
 		ERROR_FORMAT_ERROR,
@@ -68,13 +71,9 @@ namespace DNS
 		ERROR_INVALIDTYPE
 	};
 
-	const int PORT = 53;
+	typedef uint16_t RequestId;
 
-	/**
-	 * The maximum value of a dns request id,
-	 * 16 bits wide, 0xFFFF.
-	 */
-	const int MAX_REQUEST_ID = 0xFFFF;
+	const int PORT = 53;
 
 	class Exception : public ModuleException
 	{
@@ -86,11 +85,11 @@ namespace DNS
 	{
 		std::string name;
 		QueryType type;
-		unsigned short qclass;
 
-		Question() : type(QUERY_NONE), qclass(0) { }
-		Question(const std::string& n, QueryType t, unsigned short c = 1) : name(n), type(t), qclass(c) { }
-		inline bool operator==(const Question& other) const { return name == other.name && type == other.type && qclass == other.qclass; }
+		Question() : type(QUERY_NONE) { }
+		Question(const std::string& n, QueryType t) : name(n), type(t) { }
+		bool operator==(const Question& other) const { return ((name == other.name) && (type == other.type)); }
+		bool operator!=(const Question& other) const { return (!(*this == other)); }
 
 		struct hash
 		{
@@ -107,19 +106,31 @@ namespace DNS
 		std::string rdata;
 		time_t created;
 
-		ResourceRecord(const std::string& n, QueryType t, unsigned short c = 1) : Question(n, t, c), ttl(0), created(ServerInstance->Time()) { }
+		ResourceRecord(const std::string& n, QueryType t) : Question(n, t), ttl(0), created(ServerInstance->Time()) { }
 		ResourceRecord(const Question& question) : Question(question), ttl(0), created(ServerInstance->Time()) { }
 	};
 
 	struct Query
 	{
-		std::vector<Question> questions;
+		Question question;
 		std::vector<ResourceRecord> answers;
 		Error error;
 		bool cached;
 
 		Query() : error(ERROR_NONE), cached(false) { }
-		Query(const Question& question) : error(ERROR_NONE), cached(false) { questions.push_back(question); }
+		Query(const Question& q) : question(q), error(ERROR_NONE), cached(false) { }
+
+		const ResourceRecord* FindAnswerOfType(QueryType qtype) const
+		{
+			for (std::vector<DNS::ResourceRecord>::const_iterator i = answers.begin(); i != answers.end(); ++i)
+			{
+				const DNS::ResourceRecord& rr = *i;
+				if (rr.type == qtype)
+					return &rr;
+			}
+
+			return NULL;
+		}
 	};
 
 	class ReplySocket;
@@ -139,27 +150,27 @@ namespace DNS
 
 	/** A DNS query.
 	 */
-	class Request : public Timer, public Question
+	class Request : public Timer
 	{
 	 protected:
 		Manager* const manager;
 	 public:
+		Question question;
 		/* Use result cache if available */
 		bool use_cache;
 		/* Request id */
-	 	unsigned short id;
+	 	RequestId id;
 	 	/* Creator of this request */
 		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), ServerInstance->Time())
-			, Question(addr, qt)
+			: Timer(ServerInstance->Config->ConfValue("dns")->getDuration("timeout", 5, 1))
 			, manager(mgr)
+			, question(addr, qt)
 			, use_cache(usecache)
 			, id(0)
 			, creator(mod)
 		{
-			ServerInstance->Timers->AddTimer(this);
 		}
 
 		virtual ~Request()
@@ -180,14 +191,14 @@ 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);
+			Query rr(this->question);
 			rr.error = ERROR_TIMEDOUT;
 			this->OnError(&rr);
+			delete this;
 			return false;
 		}
 	};
 
 } // namespace DNS
-