Merge pull request #1302 from Adam-/master+txt

core_dns: add support for txt records

1 files changed, 14 insertions, 1 deletions

diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp
index 753b41f43..7ee406a24 100644
--- a/src/coremods/core_dns.cpp
+++ b/src/coremods/core_dns.cpp
@@ -154,7 +154,7 @@ class Packet : public Query
 		record.ttl = (input[pos] << 24) | (input[pos + 1] << 16) | (input[pos + 2] << 8) | input[pos + 3];
 		pos += 4;
 
-		//record.rdlength = input[pos] << 8 | input[pos + 1];
+		uint16_t rdlength = input[pos] << 8 | input[pos + 1];
 		pos += 2;
 
 		switch (record.type)
@@ -200,6 +200,19 @@ class Packet : public Query
 
 				break;
 			}
+			case QUERY_TXT:
+			{
+				if (pos + rdlength > input_size)
+					throw Exception("Unable to unpack txt resource record");
+
+				record.rdata = std::string(reinterpret_cast<const char *>(input + pos), rdlength);
+				pos += rdlength;
+
+				if (record.rdata.find_first_of("\r\n\0", 0, 3) != std::string::npos)
+					throw Exception("Invalid character in txt record");
+
+				break;
+			}
 			default:
 				break;
 		}