ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

dns: cleanup ResultIsReady() prototype

Browse Source
This commit is contained in:
William Pitcock 2012-03-20 18:41:09 -05:00 committed by Robin Burchell
parent 5a778fb849
commit c897aacd8e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dns.cpp
View File

@ -97,7 +97,7 @@ class DNSRequest
DNSRequest(DNS* dns, int id, const std::string &original);
~DNSRequest();
DNSInfo ResultIsReady(DNSHeader &h, int length);
DNSInfo ResultIsReady(DNSHeader &h, unsigned length);
int SendRequests(const DNSHeader *header, const int length, QueryType qt);
};
@ -690,7 +690,7 @@ DNSResult DNS::GetResult()
}
/** A result is ready, process it */
DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length)
DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, unsigned length)
{
unsigned i = 0, o;
int q = 0;
@ -719,7 +719,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length)
/* Subtract the length of the header from the length of the packet */
length -= 12;
while ((unsigned int)q < header.qdcount && i < (unsigned) length)
while ((unsigned int)q < header.qdcount && i < length)
{
if (header.payload[i] > 63)
{
@ -740,7 +740,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length)
while ((unsigned)curanswer < header.ancount)
{
q = 0;
while (q == 0 && i < (unsigned) length)
while (q == 0 && i < length)
{
if (header.payload[i] > 63)
{
@ -757,7 +757,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length)
else i += header.payload[i] + 1; /* skip length and label */
}
}
if ((unsigned) length - i < 10)
if (length - i < 10)
return std::make_pair((unsigned char*)NULL,"Incorrectly sized DNS reply");
/* XXX: We actually initialise 'rr' here including its ttl field */
@ -799,7 +799,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length)
case DNS_QUERY_PTR:
o = 0;
q = 0;
while (q == 0 && i < (unsigned) length && o + 256 < 1023)
while (q == 0 && i < length && o + 256 < 1023)
{
/* DN label found (byte over 63) */
if (header.payload[i] > 63)