X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdns.cpp;h=0e0f3287466e3931c003febfc1917e903fac6091;hb=6f4bf8ffd367f35b96265fea1ad01fb1acf2adcd;hp=8f23eaa6ccc43639d3624f4071ee5a927610bbbd;hpb=e381b06561228aaea752deda20a62c6dc99a560e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/dns.cpp b/src/dns.cpp index 8f23eaa6c..0e0f32874 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -26,20 +26,13 @@ looks like this, walks like this or tastes like this. using namespace std; -#include -#include #include #include #include -#include -#include #include #include -#include #include "dns.h" #include "inspircd.h" - -#include "inspircd_config.h" #include "socketengine.h" #include "configreader.h" #include "socket.h" @@ -50,13 +43,15 @@ using irc::sockets::insp_inaddr; using irc::sockets::insp_ntoa; using irc::sockets::insp_aton; -/* Masks to mask off the responses we get from the DNSRequest methods */ +/** Masks to mask off the responses we get from the DNSRequest methods + */ enum QueryInfo { ERROR_MASK = 0x10000 /* Result is an error */ }; -/* Flags which can be ORed into a request or reply for different meanings */ +/** Flags which can be ORed into a request or reply for different meanings + */ enum QueryFlags { FLAGS_MASK_RD = 0x01, /* Recursive */ @@ -70,7 +65,8 @@ enum QueryFlags }; -/* Represents a dns resource record (rr) */ +/** Represents a dns resource record (rr) + */ class ResourceRecord { public: @@ -80,7 +76,7 @@ class ResourceRecord unsigned int rdlength; /* Record length */ }; -/* Represents a dns request/reply header, and its payload as opaque data. +/** Represents a dns request/reply header, and its payload as opaque data. */ class DNSHeader { @@ -95,41 +91,74 @@ class DNSHeader unsigned char payload[512]; /* Packet payload */ }; -/* Represents a request 'on the wire' with routing information relating to - * where to call when we get a result - */ class DNSRequest { public: unsigned char id[2]; /* Request id */ - unsigned char* res; /* Result processing buffer */ - unsigned int rr_class; /* Request class */ + unsigned char* res; /* Result processing buffer */ + unsigned int rr_class; /* Request class */ QueryType type; /* Request type */ - insp_inaddr myserver; /* DNS server address*/ - DNS* dnsobj; /* DNS caller (where we get our FD from) */ + insp_inaddr myserver; /* DNS server address*/ + DNS* dnsobj; /* DNS caller (where we get our FD from) */ + + DNSRequest(InspIRCd* Instance, DNS* dns, insp_inaddr server, int id, requestlist &requests); + ~DNSRequest(); + DNSInfo ResultIsReady(DNSHeader &h, int length); + int SendRequests(const DNSHeader *header, const int length, QueryType qt); +}; - /* Allocate the processing buffer */ - DNSRequest(DNS* dns, insp_inaddr server) : dnsobj(dns) +class RequestTimeout : public InspTimer +{ + InspIRCd* ServerInstance; + DNSRequest* watch; + int watchid; + requestlist &rl; + public: + RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id, requestlist &requests) : InspTimer(n, time(NULL)), ServerInstance(SI), watch(watching), watchid(id), rl(requests) { - res = new unsigned char[512]; - *res = 0; - memcpy(&myserver, &server, sizeof(insp_inaddr)); + ServerInstance->Log(DEBUG, "New DNS timeout set on %08x", watching); } - /* Deallocate the processing buffer */ - ~DNSRequest() + void Tick(time_t TIME) { - delete[] res; + if (rl.find(watchid) != rl.end()) + { + /* Still exists, whack it */ + if (rl.find(watchid)->second == watch) + { + if (ServerInstance->Res->Classes[watchid]) + { + ServerInstance->Res->Classes[watchid]->OnError(RESOLVER_TIMEOUT, "Request timed out"); + delete ServerInstance->Res->Classes[watchid]; + ServerInstance->Res->Classes[watchid] = NULL; + } + rl.erase(rl.find(watchid)); + delete watch; + ServerInstance->Log(DEBUG, "DNS timeout on %08x squished pointer", watch); + } + return; + } + ServerInstance->Log(DEBUG, "DNS timeout on %08x: result already received!", watch); } +}; - /* Called when a result is ready to be processed which matches this id */ - DNSInfo ResultIsReady(DNSHeader &h, int length); +/* Allocate the processing buffer */ +DNSRequest::DNSRequest(InspIRCd* Instance, DNS* dns, insp_inaddr server, int id, requestlist &requests) : dnsobj(dns) +{ + res = new unsigned char[512]; + *res = 0; + memcpy(&myserver, &server, sizeof(insp_inaddr)); + RequestTimeout* RT = new RequestTimeout(Instance->Config->dns_timeout ? Instance->Config->dns_timeout : 5, Instance, this, id, requests); + Instance->Timers->AddTimer(RT); /* The timer manager frees this */ +} - /* Called when there are requests to be sent out */ - int SendRequests(const DNSHeader *header, const int length, QueryType qt); -}; +/* Deallocate the processing buffer */ +DNSRequest::~DNSRequest() +{ + delete[] res; +} -/* Fill a ResourceRecord class based on raw data input */ +/** Fill a ResourceRecord class based on raw data input */ inline void DNS::FillResourceRecord(ResourceRecord* rr, const unsigned char *input) { rr->type = (QueryType)((input[0] << 8) + input[1]); @@ -138,7 +167,7 @@ inline void DNS::FillResourceRecord(ResourceRecord* rr, const unsigned char *inp rr->rdlength = (input[8] << 8) + input[9]; } -/* Fill a DNSHeader class based on raw data input of a given length */ +/** Fill a DNSHeader class based on raw data input of a given length */ inline void DNS::FillHeader(DNSHeader *header, const unsigned char *input, const int length) { header->id[0] = input[0]; @@ -152,7 +181,7 @@ inline void DNS::FillHeader(DNSHeader *header, const unsigned char *input, const memcpy(header->payload,&input[12],length); } -/* Empty a DNSHeader class out into raw data, ready for transmission */ +/** Empty a DNSHeader class out into raw data, ready for transmission */ inline void DNS::EmptyHeader(unsigned char *output, const DNSHeader *header, const int length) { output[0] = header->id[0]; @@ -170,7 +199,7 @@ inline void DNS::EmptyHeader(unsigned char *output, const DNSHeader *header, con memcpy(&output[12],header->payload,length); } -/* Send requests we have previously built down the UDP socket */ +/** Send requests we have previously built down the UDP socket */ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryType qt) { insp_sockaddr addr; @@ -197,7 +226,7 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp return 0; } -/* Add a query with a predefined header, and allocate an ID for it. */ +/** Add a query with a predefined header, and allocate an ID for it. */ DNSRequest* DNS::AddQuery(DNSHeader *header, int &id) { /* Is the DNS connection down? */ @@ -215,7 +244,7 @@ DNSRequest* DNS::AddQuery(DNSHeader *header, int &id) while (requests.find(id) != requests.end()) id = this->PRNG() & DNS::MAX_REQUEST_ID; - DNSRequest* req = new DNSRequest(this, this->myserver); + DNSRequest* req = new DNSRequest(ServerInstance, this, this->myserver, id, requests); header->id[0] = req->id[0] = id >> 8; header->id[1] = req->id[1] = id & 0xFF; @@ -235,7 +264,7 @@ DNSRequest* DNS::AddQuery(DNSHeader *header, int &id) return req; } -/* Initialise the DNS UDP socket so that we can send requests */ +/** Initialise the DNS UDP socket so that we can send requests */ DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance) { ServerInstance->Log(DEBUG,"DNS::DNS: Instance = %08x",Instance); @@ -249,6 +278,10 @@ DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance) */ currid = 0; + /* By default we're not munging ip's + */ + ip6munge = false; + /* Clear the namesever address */ memset(&myserver,0,sizeof(insp_inaddr)); @@ -335,7 +368,7 @@ DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance) } } -/* Build a payload to be placed after the header, based upon input data, a resource type, a class and a pointer to a buffer */ +/** Build a payload to be placed after the header, based upon input data, a resource type, a class and a pointer to a buffer */ int DNS::MakePayload(const char * const name, const QueryType rr, const unsigned short rr_class, unsigned char * const payload) { short payloadpos = 0; @@ -372,7 +405,7 @@ int DNS::MakePayload(const char * const name, const QueryType rr, const unsigned return payloadpos + 4; } -/* Start lookup of an hostname to an IP address */ +/** Start lookup of an hostname to an IP address */ int DNS::GetIP(const char *name) { DNSHeader h; @@ -390,7 +423,7 @@ int DNS::GetIP(const char *name) return id; } -/* Start lookup of an hostname to an IPv6 address */ +/** Start lookup of an hostname to an IPv6 address */ int DNS::GetIP6(const char *name) { DNSHeader h; @@ -408,7 +441,7 @@ int DNS::GetIP6(const char *name) return id; } -/* Start lookup of a cname to another name */ +/** Start lookup of a cname to another name */ int DNS::GetCName(const char *alias) { DNSHeader h; @@ -426,7 +459,7 @@ int DNS::GetCName(const char *alias) return id; } -/* Start lookup of an IP address to a hostname */ +/** Start lookup of an IP address to a hostname */ int DNS::GetName(const insp_inaddr *ip) { char query[128]; @@ -435,10 +468,15 @@ int DNS::GetName(const insp_inaddr *ip) int length; #ifdef IPV6 - DNS::MakeIP6Int(query, (in6_addr*)ip); + unsigned char* c = (unsigned char*)&ip->s6_addr; + if (c[0] == 0 && c[1] == 0 && c[2] == 0 && c[3] == 0 && + c[4] == 0 && c[5] == 0 && c[6] == 0 && c[7] == 0 && + c[8] == 0 && c[9] == 0 && c[10] == 0xFF && c[11] == 0xFF) + sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[15],c[14],c[13],c[12]); + else + DNS::MakeIP6Int(query, (in6_addr*)ip); #else unsigned char* c = (unsigned char*)&ip->s_addr; - sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[3],c[2],c[1],c[0]); #endif @@ -453,7 +491,7 @@ int DNS::GetName(const insp_inaddr *ip) return id; } -/* Start lookup of an IP address to a hostname */ +/** Start lookup of an IP address to a hostname */ int DNS::GetNameForce(const char *ip, ForceProtocol fp) { char query[128]; @@ -499,6 +537,8 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp) return id; } +/** Build an ipv6 reverse domain from an in6_addr + */ void DNS::MakeIP6Int(char* query, const in6_addr *ip) { #ifdef SUPPORT_IP6LINKS @@ -519,7 +559,7 @@ void DNS::MakeIP6Int(char* query, const in6_addr *ip) #endif } -/* Return the next id which is ready, and the result attached to it */ +/** Return the next id which is ready, and the result attached to it */ DNSResult DNS::GetResult() { /* Fetch dns query response and decide where it belongs */ @@ -683,7 +723,7 @@ DNSResult DNS::GetResult() } } -/* A result is ready, process it */ +/** A result is ready, process it */ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) { int i = 0; @@ -691,7 +731,11 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) int curanswer, o; ResourceRecord rr; unsigned short ptr; - + + /* This is just to keep _FORTIFY_SOURCE happy */ + rr.type = DNS_QUERY_NONE; + rr.rdlength = 0; + if (!(header.flags1 & FLAGS_MASK_QR)) return std::make_pair((unsigned char*)NULL,"Not a query result"); @@ -822,15 +866,15 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) return std::make_pair(res,"No error");; } -/* Close the master socket */ +/** Close the master socket */ DNS::~DNS() { shutdown(this->GetFd(), 2); close(this->GetFd()); } -/* High level abstraction of dns used by application at large */ -Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt) : ServerInstance(Instance), input(source), querytype(qt) +/** High level abstraction of dns used by application at large */ +Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt, Module* creator) : ServerInstance(Instance), Creator(creator), input(source), querytype(qt) { ServerInstance->Log(DEBUG,"Instance: %08x %08x",Instance, ServerInstance); @@ -890,24 +934,31 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt) ServerInstance->Log(DEBUG,"Resolver::Resolver: this->myid=%d",this->myid); } +/** Called when an error occurs */ void Resolver::OnError(ResolverError e, const std::string &errormessage) { /* Nothing in here */ } +/** Destroy a resolver */ Resolver::~Resolver() { /* Nothing here (yet) either */ } -/* Get the request id associated with this class */ +/** Get the request id associated with this class */ int Resolver::GetId() { return this->myid; } -/* Process a socket read event */ -void DNS::HandleEvent(EventType et) +Module* Resolver::GetCreator() +{ + return this->Creator; +} + +/** Process a socket read event */ +void DNS::HandleEvent(EventType et, int errornum) { ServerInstance->Log(DEBUG,"Marshall reads: %d",this->GetFd()); /* Fetch the id and result of the next available packet */ @@ -951,7 +1002,7 @@ void DNS::HandleEvent(EventType et) } } -/* Add a derived Resolver to the working set */ +/** Add a derived Resolver to the working set */ bool DNS::AddResolverClass(Resolver* r) { /* Check the pointers validity and the id's validity */ @@ -983,6 +1034,23 @@ bool DNS::AddResolverClass(Resolver* r) } } +void DNS::CleanResolvers(Module* module) +{ + for (int i = 0; i < MAX_REQUEST_ID; i++) + { + if (Classes[i]) + { + if (Classes[i]->GetCreator() == module) + { + Classes[i]->OnError(RESLOVER_FORCEUNLOAD, "Parent module is unloading"); + delete Classes[i]; + Classes[i] = NULL; + } + } + } +} + +/** Generate pseudo-random number */ unsigned long DNS::PRNG() { unsigned long val = 0;