Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(798)

Unified Diff: net/base/dns_response.cc

Issue 7056050: Revert 87809 - Added DnsQuery class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/dns_response.h ('k') | net/base/dns_response_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/dns_response.cc
===================================================================
--- net/base/dns_response.cc (revision 87811)
+++ net/base/dns_response.cc (working copy)
@@ -1,103 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "net/base/dns_response.h"
-
-#include "net/base/address_list.h"
-#include "net/base/dns_util.h"
-#include "net/base/net_errors.h"
-
-namespace net {
-
-// RFC 1035, section 4.2.1: Messages carried by UDP are restricted to 512
-// bytes (not counting the IP nor UDP headers).
-static const int kMaxResponseSize = 512;
-
-DnsResponse::DnsResponse(DnsQuery* query)
- : query_(query),
- io_buffer_(new IOBufferWithSize(kMaxResponseSize + 1)) {
- DCHECK(query_);
- DCHECK(query_->IsValid());
-}
-
-int DnsResponse::Parse(int nbytes, AddressList* results) {
- DCHECK(query_->IsValid());
-
- // Response includes query, it should be at least that size.
- if (nbytes < query_->io_buffer()->size() || nbytes > kMaxResponseSize)
- return ERR_DNS_MALFORMED_RESPONSE;
-
- DnsResponseBuffer response(reinterpret_cast<uint8*>(io_buffer_->data()),
- io_buffer_->size());
- uint16 id;
- if (!response.U16(&id) || id != query_->id()) // Make sure IDs match.
- return ERR_DNS_MALFORMED_RESPONSE;
-
- uint8 flags, rcode;
- if (!response.U8(&flags) || !response.U8(&rcode))
- return ERR_DNS_MALFORMED_RESPONSE;
-
- if (flags & 2) // TC is set -- server wants TCP, we don't support it (yet?).
- return ERR_DNS_SERVER_REQUIRES_TCP;
-
- rcode &= 0x0f; // 3 means NXDOMAIN, the rest means server failed.
- if (rcode && (rcode != 3))
- return ERR_DNS_SERVER_FAILED;
-
- uint16 query_count, answer_count, authority_count, additional_count;
- if (!response.U16(&query_count) ||
- !response.U16(&answer_count) ||
- !response.U16(&authority_count) ||
- !response.U16(&additional_count)) {
- return ERR_DNS_MALFORMED_RESPONSE;
- }
-
- if (query_count != 1) // Sent a single question, shouldn't have changed.
- return ERR_DNS_MALFORMED_RESPONSE;
-
- std::string hostname;
- uint16 qtype, qclass;
- if (!response.DNSName(&hostname) ||
- !response.U16(&qtype) ||
- !response.U16(&qclass) ||
- hostname != query_->hostname() || // Make sure Question section
- qtype != query_->qtype() || // echoed back.
- qclass != kClassIN) {
- return ERR_DNS_MALFORMED_RESPONSE;
- }
-
- if (answer_count < 1)
- return ERR_NAME_NOT_RESOLVED;
-
- std::vector<IPAddressNumber> rdatas;
- while (answer_count--) {
- uint32 ttl;
- uint16 rdlength;
- if (!response.DNSName(NULL) ||
- !response.U16(&qtype) ||
- !response.U16(&qclass) ||
- !response.U32(&ttl) ||
- !response.U16(&rdlength)) {
- return ERR_DNS_MALFORMED_RESPONSE;
- }
-
- if (qtype == query_->qtype() &&
- qclass == kClassIN &&
- (rdlength == kIPv4AddressSize || rdlength == kIPv6AddressSize)) {
- base::StringPiece rdata;
- if (!response.Block(&rdata, rdlength))
- return ERR_DNS_MALFORMED_RESPONSE;
- rdatas.push_back(IPAddressNumber(rdata.begin(), rdata.end()));
- } else if (!response.Skip(rdlength))
- return ERR_DNS_MALFORMED_RESPONSE;
- }
-
- if (rdatas.empty())
- return ERR_NAME_NOT_RESOLVED;
-
- *results = AddressList::CreateFromIPAddressList(rdatas, query_->port());
- return OK;
-}
-
-} // namespace net
« no previous file with comments | « net/base/dns_response.h ('k') | net/base/dns_response_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698