Index: net/dns/dns_response.cc |
diff --git a/net/dns/dns_response.cc b/net/dns/dns_response.cc |
index 64db818b2b9426a73a5d4c20e2a24bec32396b2e..6be3a944fcf1d1fe72c720ff9e6cc3666e799f9e 100644 |
--- a/net/dns/dns_response.cc |
+++ b/net/dns/dns_response.cc |
@@ -116,10 +116,8 @@ bool DnsRecordParser::ReadRecord(DnsResourceRecord* out) { |
base::BigEndianReader reader(cur_ + consumed, |
packet_ + length_ - (cur_ + consumed)); |
uint16 rdlen; |
- if (reader.ReadU16(&out->type) && |
- reader.ReadU16(&out->klass) && |
- reader.ReadU32(&out->ttl) && |
- reader.ReadU16(&rdlen) && |
+ if (reader.ReadU16(&out->type) && reader.ReadU16(&out->klass) && |
+ reader.ReadU32(&out->ttl) && reader.ReadU16(&rdlen) && |
reader.ReadPiece(&out->rdata, rdlen)) { |
cur_ = reader.ptr(); |
return true; |
@@ -149,9 +147,7 @@ DnsResponse::DnsResponse(size_t length) |
: io_buffer_(new IOBufferWithSize(length)) { |
} |
-DnsResponse::DnsResponse(const void* data, |
- size_t length, |
- size_t answer_offset) |
+DnsResponse::DnsResponse(const void* data, size_t length, size_t answer_offset) |
: io_buffer_(new IOBufferWithSize(length)), |
parser_(io_buffer_->data(), length, answer_offset) { |
DCHECK(data); |
@@ -178,15 +174,14 @@ bool DnsResponse::InitParse(int nbytes, const DnsQuery& query) { |
// Match the question section. |
const size_t hdr_size = sizeof(dns_protocol::Header); |
const base::StringPiece question = query.question(); |
- if (question != base::StringPiece(io_buffer_->data() + hdr_size, |
- question.size())) { |
+ if (question != |
+ base::StringPiece(io_buffer_->data() + hdr_size, question.size())) { |
return false; |
} |
// Construct the parser. |
- parser_ = DnsRecordParser(io_buffer_->data(), |
- nbytes, |
- hdr_size + question.size()); |
+ parser_ = |
+ DnsRecordParser(io_buffer_->data(), nbytes, hdr_size + question.size()); |
return true; |
} |
@@ -198,8 +193,7 @@ bool DnsResponse::InitParseWithoutQuery(int nbytes) { |
if (nbytes < static_cast<int>(hdr_size) || nbytes >= io_buffer_->size()) |
return false; |
- parser_ = DnsRecordParser( |
- io_buffer_->data(), nbytes, hdr_size); |
+ parser_ = DnsRecordParser(io_buffer_->data(), nbytes, hdr_size); |
unsigned qdcount = base::NetToHost16(header()->qdcount); |
for (unsigned i = 0; i < qdcount; ++i) { |
@@ -287,7 +281,8 @@ DnsResponse::Result DnsResponse::ParseToAddressList( |
expected_type == dns_protocol::kTypeAAAA); |
size_t expected_size = (expected_type == dns_protocol::kTypeAAAA) |
- ? kIPv6AddressSize : kIPv4AddressSize; |
+ ? kIPv6AddressSize |
+ : kIPv4AddressSize; |
uint32 ttl_sec = kuint32max; |
IPAddressList ip_addresses; |
@@ -319,8 +314,8 @@ DnsResponse::Result DnsResponse::ParseToAddressList( |
return DNS_NAME_MISMATCH; |
ttl_sec = std::min(ttl_sec, record.ttl); |
- ip_addresses.push_back(IPAddressNumber(record.rdata.begin(), |
- record.rdata.end())); |
+ ip_addresses.push_back( |
+ IPAddressNumber(record.rdata.begin(), record.rdata.end())); |
} |
} |
@@ -328,8 +323,8 @@ DnsResponse::Result DnsResponse::ParseToAddressList( |
// getcanonname in eglibc returns the first owner name of an A or AAAA RR. |
// If the response passed all the checks so far, then |expected_name| is it. |
- *addr_list = AddressList::CreateFromIPAddressList(ip_addresses, |
- expected_name); |
+ *addr_list = |
+ AddressList::CreateFromIPAddressList(ip_addresses, expected_name); |
*ttl = base::TimeDelta::FromSeconds(ttl_sec); |
return DNS_PARSE_OK; |
} |