X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_dns.cpp;h=002686bc276157eb5b2ef91c8371dce2c88017b5;hb=be91435ccb8e05c84ecd126b5c41b74c45f4535b;hp=ea234861a81913087236933de9770a0ea0bcf44a;hpb=780dda83ba3857bc3c330d4b5d38bb251a9d879b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp
index ea234861a..002686bc2 100644
--- a/src/coremods/core_dns.cpp
+++ b/src/coremods/core_dns.cpp
@@ -40,11 +40,6 @@ using namespace DNS;
  */
 class Packet : public Query
 {
-	static bool IsValidName(const std::string& name)
-	{
-		return (name.find_first_not_of("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-") == std::string::npos);
-	}
-
 	void PackName(unsigned char* output, unsigned short output_size, unsigned short& pos, const std::string& name)
 	{
 		if (pos + name.length() + 2 > output_size)
@@ -195,7 +190,7 @@ class Packet : public Query
 			case QUERY_PTR:
 			{
 				record.rdata = this->UnpackName(input, input_size, pos);
-				if (!IsValidName(record.rdata))
+				if (!InspIRCd::IsHost(record.rdata))
 					throw Exception("Invalid name"); // XXX: Causes the request to time out
 
 				break;
@@ -693,7 +688,7 @@ class MyManager : public Manager, public Timer, public EventHandler
 		irc::sockets::aptosa(dnsserver, DNS::PORT, myserver);
 
 		/* Initialize mastersocket */
-		int s = socket(myserver.sa.sa_family, SOCK_DGRAM, 0);
+		int s = socket(myserver.family(), SOCK_DGRAM, 0);
 		this->SetFd(s);
 
 		/* Have we got a socket? */
@@ -706,9 +701,9 @@ class MyManager : public Manager, public Timer, public EventHandler
 			if (sourceaddr.empty())
 			{
 				// set a sourceaddr for irc::sockets::aptosa() based on the servers af type
-				if (myserver.sa.sa_family == AF_INET)
+				if (myserver.family() == AF_INET)
 					sourceaddr = "0.0.0.0";
-				else if (myserver.sa.sa_family == AF_INET6)
+				else if (myserver.family() == AF_INET6)
 					sourceaddr = "::";
 			}
 			irc::sockets::aptosa(sourceaddr, sourceport, bindto);
@@ -727,7 +722,7 @@ class MyManager : public Manager, public Timer, public EventHandler
 				this->SetFd(-1);
 			}
 
-			if (bindto.sa.sa_family != myserver.sa.sa_family)
+			if (bindto.family() != myserver.family())
 				ServerInstance->Logs->Log(MODNAME, LOG_SPARSE, "Nameserver address family differs from source address family - hostnames might not resolve");
 		}
 		else