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 */
};
-/* Represents a dns resource record (rr) */
+/** Represents a dns resource record (rr)
+ */
class ResourceRecord
{
public:
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
{
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 */
- QueryType type; /* Request type */
- insp_inaddr myserver; /* DNS server address*/
- DNS* dnsobj; /* DNS caller (where we get our FD from) */
-
- /* Allocate the processing buffer */
- DNSRequest(DNS* dns, insp_inaddr server) : dnsobj(dns)
+ unsigned char id[2]; /* Request id */
+ 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) */
+
+ 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);
+};
+
+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]);
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];
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];
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;
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? */
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;
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);
*/
currid = 0;
+ /* By default we're not munging ip's
+ */
+ ip6munge = false;
+
/* Clear the namesever address */
memset(&myserver,0,sizeof(insp_inaddr));
}
}
-/* 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;
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;
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;
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;
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];
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];
return id;
}
+/** Build an ipv6 reverse domain from an in6_addr
+ */
void DNS::MakeIP6Int(char* query, const in6_addr *ip)
{
#ifdef SUPPORT_IP6LINKS
#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 */
}
}
-/* A result is ready, process it */
+/** A result is ready, process it */
DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length)
{
int i = 0;
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 */
+/** 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)
{
ServerInstance->Log(DEBUG,"Instance: %08x %08x",Instance, ServerInstance);
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 */
+/** Process a socket read event */
void DNS::HandleEvent(EventType et)
{
ServerInstance->Log(DEBUG,"Marshall reads: %d",this->GetFd());
}
}
-/* 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 */
}
}
+/** Generate pseudo-random number */
unsigned long DNS::PRNG()
{
unsigned long val = 0;
projects / user / henk / code / inspircd.git / blobdiff