core_dns Add typedef for request id, change it to uint16_t

inspircd · Apr 21, 2015 · 4e58282 · 4e58282
1 parent 14d15d3
commit 4e58282
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/include/modules/dns.h b/include/modules/dns.h
@@ -68,6 +68,8 @@ namespace DNS
 		ERROR_INVALIDTYPE
 	};
 
+	typedef uint16_t RequestId;
+
 	const int PORT = 53;
 
 	/**
@@ -147,7 +149,7 @@ namespace DNS
 		/* Use result cache if available */
 		bool use_cache;
 		/* Request id */
-	 	unsigned short id;
+	 	RequestId id;
 	 	/* Creator of this request */
 		Module* const creator;
 

diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp
@@ -201,7 +201,7 @@ class Packet : public Query
 	static const int HEADER_LENGTH = 12;
 
 	/* ID for this packet */
-	unsigned short id;
+	RequestId id;
 	/* Flags on the packet */
 	unsigned short flags;
 
@@ -219,9 +219,6 @@ class Packet : public Query
 		this->id = (input[packet_pos] << 8) | input[packet_pos + 1];
 		packet_pos += 2;
 
-		if (this->id >= MAX_REQUEST_ID)
-			throw Exception("Query ID too large?");
-
 		this->flags = (input[packet_pos] << 8) | input[packet_pos + 1];
 		packet_pos += 2;