#include <arpa/inet.h>
#else
#include "inspircd_win32wrapper.h"
-#include "inspircd_se_config.h"
#endif
-#include "dns.h"
#include "inspircd.h"
#include "socketengine.h"
#include "configreader.h"
DNS* dnsobj; /* DNS caller (where we get our FD from) */
unsigned long ttl; /* Time to live */
std::string orig; /* Original requested name/ip */
- InspIRCd* ServerInstance;
- DNSRequest(InspIRCd* Instance, DNS* dns, int id, const std::string &original);
+ DNSRequest(DNS* dns, int id, const std::string &original);
~DNSRequest();
DNSInfo ResultIsReady(DNSHeader &h, int length);
int SendRequests(const DNSHeader *header, const int length, QueryType qt);
class CacheTimer : public Timer
{
private:
- InspIRCd* ServerInstance;
DNS* dns;
public:
- CacheTimer(InspIRCd* Instance, DNS* thisdns)
- : Timer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { }
+ CacheTimer(DNS* thisdns)
+ : Timer(3600, ServerInstance->Time(), true), dns(thisdns) { }
virtual void Tick(time_t)
{
class RequestTimeout : public Timer
{
- InspIRCd* ServerInstance;
DNSRequest* watch;
int watchid;
public:
- RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(n, SI->Time()), ServerInstance(SI), watch(watching), watchid(id)
+ RequestTimeout(unsigned long n, DNSRequest* watching, int id) : Timer(n, ServerInstance->Time()), watch(watching), watchid(id)
{
}
~RequestTimeout()
};
/* Allocate the processing buffer */
-DNSRequest::DNSRequest(InspIRCd* Instance, DNS* dns, int rid, const std::string &original) : dnsobj(dns), ServerInstance(Instance)
+DNSRequest::DNSRequest(DNS* dns, int rid, const std::string &original) : dnsobj(dns)
{
res = new unsigned char[512];
*res = 0;
orig = original;
- RequestTimeout* RT = new RequestTimeout(Instance->Config->dns_timeout ? Instance->Config->dns_timeout : 5, Instance, this, rid);
- Instance->Timers->AddTimer(RT); /* The timer manager frees this */
+ RequestTimeout* RT = new RequestTimeout(ServerInstance->Config->dns_timeout ? ServerInstance->Config->dns_timeout : 5, this, rid);
+ ServerInstance->Timers->AddTimer(RT); /* The timer manager frees this */
}
/* Deallocate the processing buffer */
DNS::EmptyHeader(payload,header,length);
- if (this->dnsobj->socketfamily == AF_INET6)
- {
- sockaddr_in6 addr;
- memset(&addr,0,sizeof(addr));
- memcpy(&addr.sin6_addr,&dnsobj->myserver6,sizeof(addr.sin6_addr));
- addr.sin6_family = AF_INET6;
- addr.sin6_port = htons(DNS::QUERY_PORT);
- if (ServerInstance->SE->SendTo(dnsobj, payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
- return -1;
- }
- else
- {
- sockaddr_in addr;
- memset(&addr,0,sizeof(addr));
- memcpy(&addr.sin_addr.s_addr,&dnsobj->myserver4,sizeof(addr.sin_addr));
- addr.sin_family = AF_INET;
- addr.sin_port = htons(DNS::QUERY_PORT);
- if (ServerInstance->SE->SendTo(dnsobj, (const char*)payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
- return -1;
- }
+ if (ServerInstance->SE->SendTo(dnsobj, payload, length + 12, 0, &(dnsobj->myserver.sa), sa_size(dnsobj->myserver)) != length+12)
+ return -1;
ServerInstance->Logs->Log("RESOLVER",DEBUG,"Sent OK");
return 0;
while (requests[id])
id = this->PRNG() & DNS::MAX_REQUEST_ID;
- DNSRequest* req = new DNSRequest(ServerInstance, this, id, original);
+ DNSRequest* req = new DNSRequest(this, id, original);
header->id[0] = req->id[0] = id >> 8;
header->id[1] = req->id[1] = id & 0xFF;
void DNS::Rehash()
{
- ip6munge = false;
int portpass = 0;
if (this->GetFd() > -1)
this->cache = new dnscache();
}
- if ((strstr(ServerInstance->Config->DNSServer,"::ffff:") == (char*)&ServerInstance->Config->DNSServer) || (strstr(ServerInstance->Config->DNSServer,"::FFFF:") == (char*)&ServerInstance->Config->DNSServer))
- {
- ServerInstance->Logs->Log("RESOLVER",DEFAULT,"WARNING: Using IPv4 addresses over IPv6 forces some DNS checks to be disabled.");
- ServerInstance->Logs->Log("RESOLVER",DEFAULT," This should not cause a problem, however it is recommended you migrate");
- ServerInstance->Logs->Log("RESOLVER",DEFAULT," to a true IPv6 environment.");
- this->ip6munge = true;
- }
-
- this->socketfamily = AF_INET;
- if (strchr(ServerInstance->Config->DNSServer,':'))
- {
- this->socketfamily = AF_INET6;
- inet_pton(AF_INET6, ServerInstance->Config->DNSServer, &this->myserver6);
- }
- else
- {
- inet_aton(ServerInstance->Config->DNSServer, &this->myserver4);
- portpass = -1;
- }
+ irc::sockets::aptosa(ServerInstance->Config->DNSServer, DNS::QUERY_PORT, &myserver);
/* Initialize mastersocket */
int s = irc::sockets::OpenTCPSocket(ServerInstance->Config->DNSServer, SOCK_DGRAM);
/* Hook the descriptor into the socket engine */
if (ServerInstance && ServerInstance->SE)
{
- if (!ServerInstance->SE->AddFd(this))
+ if (!ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE))
{
ServerInstance->Logs->Log("RESOLVER",DEFAULT,"Internal error starting DNS - hostnames will NOT resolve.");
ServerInstance->SE->Shutdown(this, 2);
}
/** Initialise the DNS UDP socket so that we can send requests */
-DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance)
+DNS::DNS()
{
ServerInstance->Logs->Log("RESOLVER",DEBUG,"DNS::DNS");
/* Clear the Resolver class table */
*/
this->Rehash();
- this->PruneTimer = new CacheTimer(ServerInstance, this);
+ this->PruneTimer = new CacheTimer(this);
ServerInstance->Timers->AddTimer(this->PruneTimer);
}
DNSRequest *req;
unsigned char buffer[sizeof(DNSHeader)];
irc::sockets::sockaddrs from;
- socklen_t x = this->socketfamily == AF_INET ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
- const char* ipaddr_from;
- unsigned short int port_from = 0;
+ memset(&from, 0, sizeof(from));
+ socklen_t x = sizeof(from);
int length = ServerInstance->SE->RecvFrom(this, (char*)buffer, sizeof(DNSHeader), 0, &from.sa, &x);
* is not 53.
* A user could in theory still spoof dns packets anyway
* but this is less trivial than just sending garbage
- * to the client, which is possible without this check.
+ * to the server, which is possible without this check.
*
* -- Thanks jilles for pointing this one out.
*/
- char nbuf[MAXBUF];
- if (this->socketfamily == AF_INET6)
+ if (memcmp(&from, &myserver, sizeof(irc::sockets::sockaddrs)))
{
- ipaddr_from = inet_ntop(AF_INET6, &from.in6.sin6_addr, nbuf, sizeof(nbuf));
- port_from = ntohs(from.in6.sin6_port);
- }
- else
- {
- ipaddr_from = inet_ntoa(from.in4.sin_addr);
- port_from = ntohs(from.in4.sin_port);
- }
-
- /* We cant perform this security check if you're using 4in6.
- * Tough luck to you, choose one or't other!
- */
- if (!ip6munge)
- {
- if ((port_from != DNS::QUERY_PORT) || (strcasecmp(ipaddr_from, ServerInstance->Config->DNSServer)))
- {
- return DNSResult(-1,"",0,"");
- }
+ return DNSResult(-1,"",0,"");
}
/* Put the read header info into a header class */
}
/** High level abstraction of dns used by application at large */
-Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt, bool &cached, Module* creator) : ServerInstance(Instance), Creator(creator), input(source), querytype(qt)
+Resolver::Resolver(const std::string &source, QueryType qt, bool &cached, Module* creator) : Creator(creator), input(source), querytype(qt)
{
ServerInstance->Logs->Log("RESOLVER",DEBUG,"Resolver::Resolver");
cached = false;
projects / user / henk / code / inspircd.git / blobdiff