*/
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)
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;
// Update name in the original request so question checking works for PTR queries
req->question.name = p.question.name;
- if (SocketEngine::SendTo(this, buffer, len, 0, &this->myserver.sa, this->myserver.sa_size()) != len)
+ if (SocketEngine::SendTo(this, buffer, len, 0, this->myserver) != len)
throw Exception("DNS: Unable to send query");
// Add timer for timeout
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? */
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);
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
ConfigTag* tag = ServerInstance->Config->ConfValue("dns");
DNSServer = tag->getString("server");
SourceIP = tag->getString("sourceip");
- SourcePort = tag->getInt("sourceport", 0, 0, 65535);
+ SourcePort = tag->getUInt("sourceport", 0, 0, UINT16_MAX);
if (DNSServer.empty())
FindDNSServer();