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();
- DNSInfo ResultIsReady(DNSHeader &h, int length);
+ DNSInfo ResultIsReady(DNSHeader &h, int length, int result_we_want);
int SendRequests(const DNSHeader *header, const int length, QueryType qt);
};
-class CacheTimer : public InspTimer
+class CacheTimer : public Timer
{
private:
InspIRCd* ServerInstance;
DNS* dns;
public:
CacheTimer(InspIRCd* Instance, DNS* thisdns)
- : InspTimer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { }
+ : Timer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { }
virtual void Tick(time_t TIME)
{
}
};
-class RequestTimeout : public InspTimer
+class RequestTimeout : public Timer
{
InspIRCd* ServerInstance;
DNSRequest* watch;
int watchid;
public:
- RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : InspTimer(n, time(NULL)), ServerInstance(SI), watch(watching), watchid(id)
+ RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(n, time(NULL)), ServerInstance(SI), watch(watching), watchid(id)
{
}
};
/* Allocate the processing buffer */
-DNSRequest::DNSRequest(InspIRCd* Instance, DNS* dns, int id, const std::string &original) : dnsobj(dns)
+DNSRequest::DNSRequest(InspIRCd* Instance, DNS* dns, int id, const std::string &original) : dnsobj(dns), ServerInstance(Instance)
{
res = new unsigned char[512];
*res = 0;
memcpy(&addr.sin6_addr,&dnsobj->myserver6,sizeof(addr.sin6_addr));
addr.sin6_family = AF_INET6;
addr.sin6_port = htons(DNS::QUERY_PORT);
- if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
+ if (ServerInstance->SE->SendTo(dnsobj, payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
return -1;
}
else
+#endif
{
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 (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
+ if (ServerInstance->SE->SendTo(dnsobj, (const char*)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 (sendto(dnsobj->GetFd(), (const char*)payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
- return -1;
-#endif
-
return 0;
}
{
if (ServerInstance && ServerInstance->SE)
ServerInstance->SE->DelFd(this);
- shutdown(this->GetFd(), 2);
- close(this->GetFd());
+ ServerInstance->SE->Shutdown(this, 2);
+ ServerInstance->SE->Close(this);
this->SetFd(-1);
/* Rehash the cache */
/* Initialize mastersocket */
int s = OpenTCPSocket(ServerInstance->Config->DNSServer, SOCK_DGRAM);
this->SetFd(s);
+ ServerInstance->SE->NonBlocking(this->GetFd());
/* Have we got a socket and is it nonblocking? */
if (this->GetFd() != -1)
if (!ServerInstance->BindSocket(this->GetFd(), portpass, "", false))
{
/* Failed to bind */
- shutdown(this->GetFd(),2);
- close(this->GetFd());
+ ServerInstance->SE->Shutdown(this, 2);
+ ServerInstance->SE->Close(this);
this->SetFd(-1);
}
if (!ServerInstance->SE->AddFd(this))
{
ServerInstance->Log(DEFAULT,"Internal error starting DNS - hostnames will NOT resolve.");
- shutdown(this->GetFd(),2);
- close(this->GetFd());
+ ServerInstance->SE->Shutdown(this, 2);
+ ServerInstance->SE->Close(this);
this->SetFd(-1);
}
}
}
/** Return the next id which is ready, and the result attached to it */
-DNSResult DNS::GetResult()
+DNSResult DNS::GetResult(int resultnum)
{
/* Fetch dns query response and decide where it belongs */
DNSHeader header;
#endif
const char* ipaddr_from;
unsigned short int port_from = 0;
- int length = _recvfrom(this->GetFd(),(char*)buffer,sizeof(DNSHeader),0,from,&x);
+
+ int length = ServerInstance->SE->RecvFrom(this, (char*)buffer, sizeof(DNSHeader), 0, from, &x);
/* Did we get the whole header? */
if (length < 12)
* When its finished it will return a DNSInfo which is a pair of
* unsigned char* resource record data, and an error message.
*/
- DNSInfo data = req->ResultIsReady(header, length);
+ DNSInfo data = req->ResultIsReady(header, length, resultnum);
std::string resultstr;
/* Check if we got a result, if we didnt, its an error */
case DNS_QUERY_AAAA:
{
- snprintf(formatted,40,"%x:%x:%x:%x:%x:%x:%x:%x",
- (ntohs(data.first[0]) + ntohs(data.first[1] << 8)),
- (ntohs(data.first[2]) + ntohs(data.first[3] << 8)),
- (ntohs(data.first[4]) + ntohs(data.first[5] << 8)),
- (ntohs(data.first[6]) + ntohs(data.first[7] << 8)),
- (ntohs(data.first[8]) + ntohs(data.first[9] << 8)),
- (ntohs(data.first[10]) + ntohs(data.first[11] << 8)),
- (ntohs(data.first[12]) + ntohs(data.first[13] << 8)),
- (ntohs(data.first[14]) + ntohs(data.first[15] << 8)));
+ inet_ntop(AF_INET6, data.first, formatted, sizeof(formatted));
char* c = strstr(formatted,":0:");
if (c != NULL)
{
}
/** A result is ready, process it */
-DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length)
+DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_want)
{
int i = 0;
int q = 0;
return std::make_pair((unsigned char*)NULL,"Incorrectly sized DNS reply");
/* XXX: We actually initialise 'rr' here including its ttl field */
- DNS::FillResourceRecord(&rr,&header.payload[i]);
+ if (curanswer == result_we_want)
+ DNS::FillResourceRecord(&rr,&header.payload[i]);
+
i += 10;
if (rr.type != this->type)
{
break;
}
if ((unsigned int)curanswer == header.ancount)
- return std::make_pair((unsigned char*)NULL,"No valid answers");
+ return std::make_pair((unsigned char*)NULL,"No more records");
if (i + rr.rdlength > (unsigned int)length)
return std::make_pair((unsigned char*)NULL,"Resource record larger than stated");
res[rr.rdlength] = 0;
break;
}
- return std::make_pair(res,"No error");;
+ return std::make_pair(res,"No error");
}
/** Close the master socket */
DNS::~DNS()
{
- shutdown(this->GetFd(), 2);
- close(this->GetFd());
+ ServerInstance->SE->Shutdown(this, 2);
+ ServerInstance->SE->Close(this);
ServerInstance->Timers->DelTimer(this->PruneTimer);
delete this->PruneTimer;
}
void Resolver::TriggerCachedResult()
{
if (CQ)
- OnLookupComplete(CQ->data, time_left, true);
+ OnLookupComplete(CQ->data, time_left, true, 0);
}
/** High level abstraction of dns used by application at large */
void DNS::HandleEvent(EventType et, int errornum)
{
/* Fetch the id and result of the next available packet */
- DNSResult res = this->GetResult();
- /* Is there a usable request id? */
- if (res.id != -1)
+ int resultnum = 0;
+ DNSResult res(0,"",0,"");
+ res.id = 0;
+ ServerInstance->Log(DEBUG,"Handle DNS event");
+ while ((res.id & ERROR_MASK) == 0)
{
- /* Its an error reply */
- if (res.id & ERROR_MASK)
+ res = this->GetResult(resultnum);
+
+ ServerInstance->Log(DEBUG,"Result %d id %d", resultnum, res.id);
+
+ /* Is there a usable request id? */
+ if (res.id != -1)
{
- /* Mask off the error bit */
- res.id -= ERROR_MASK;
- /* Marshall the error to the correct class */
- if (Classes[res.id])
+ /* Its an error reply */
+ if (res.id & ERROR_MASK)
{
- if (ServerInstance && ServerInstance->stats)
- ServerInstance->stats->statsDnsBad++;
- Classes[res.id]->OnError(RESOLVER_NXDOMAIN, res.result);
- delete Classes[res.id];
- Classes[res.id] = NULL;
+ /* Mask off the error bit */
+ res.id -= ERROR_MASK;
+ /* Marshall the error to the correct class */
+ if (Classes[res.id])
+ {
+ if (ServerInstance && ServerInstance->stats)
+ ServerInstance->stats->statsDnsBad++;
+ Classes[res.id]->OnError(RESOLVER_NXDOMAIN, res.result);
+ delete Classes[res.id];
+ Classes[res.id] = NULL;
+ }
+ break;
}
- }
- else
- {
- /* It is a non-error result, marshall the result to the correct class */
- if (Classes[res.id])
+ else
{
- if (ServerInstance && ServerInstance->stats)
- ServerInstance->stats->statsDnsGood++;
-
- if (!this->GetCache(res.original.c_str()))
- this->cache->insert(std::make_pair(res.original.c_str(), CachedQuery(res.result, res.ttl)));
-
- Classes[res.id]->OnLookupComplete(res.result, res.ttl, false);
- delete Classes[res.id];
- Classes[res.id] = NULL;
+ /* It is a non-error result, marshall the result to the correct class */
+ if (Classes[res.id])
+ {
+ if (ServerInstance && ServerInstance->stats)
+ ServerInstance->stats->statsDnsGood++;
+
+ if (!this->GetCache(res.original.c_str()))
+ this->cache->insert(std::make_pair(res.original.c_str(), CachedQuery(res.result, res.ttl)));
+
+ Classes[res.id]->OnLookupComplete(res.result, res.ttl, false, resultnum);
+ delete Classes[res.id];
+ Classes[res.id] = NULL;
+ }
}
+
+ if (ServerInstance && ServerInstance->stats)
+ ServerInstance->stats->statsDns++;
}
- if (ServerInstance && ServerInstance->stats)
- ServerInstance->stats->statsDns++;
+ resultnum++;
}
}
-
+
/** Add a derived Resolver to the working set */
bool DNS::AddResolverClass(Resolver* r)
{
/** Generate pseudo-random number */
unsigned long DNS::PRNG()
{
-#ifndef WIN32
unsigned long val = 0;
timeval n;
serverstats* s = ServerInstance->stats;
val = val + s->statsCollisions ^ s->statsDnsGood - s->statsDnsBad;
val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv) - ServerInstance->Config->ports.size();
return val;
-#else
- unsigned long val = 0;
- serverstats* s = ServerInstance->stats;
- val = (time(NULL) ^ GetCurrentProcessId() ^ GetCurrentThreadId() ^ (this->currid++)) ^ s->statsAccept + time(NULL);
- val = val + s->statsCollisions ^ s->statsDnsGood - s->statsDnsBad;
- val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv);
- return val;
-#endif
}
projects / user / henk / code / inspircd.git / blobdiff