Skip to content

GitLab

T
tangled
Commit 3e740be5 authored by kmarshall's avatar kmarshall Committed by Commit bot
Browse files
Options

Fix MDnsClient's cache entry cleanup logic. 

The current implementation has an error in its time delay computation.
It computes negative timedeltas for cache entries that are
> Now(). This causes a CHECK failure in
IncomingTaskQueue::CalculateDelayedRuntime.

BUG=459443
CC=mfoltz@chromium.org

Review URL: https://codereview.chromium.org/937743003

Cr-Commit-Position: refs/heads/master@{#318766}
parent 6c6d81a4
Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 149 deletions
net/dns/mdns_client_impl.cc
View file @ 3e740be5
...@@ -4,13 +4,16 @@ ...@@ -4,13 +4,16 @@
#include "net/dns/mdns_client_impl.h" #include "net/dns/mdns_client_impl.h"
#include <algorithm>
#include <queue> #include <queue>
#include "base/bind.h" #include "base/bind.h"
#include "base/message_loop/message_loop_proxy.h" #include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/time/clock.h"
#include "base/time/default_clock.h" #include "base/time/default_clock.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "base/timer/timer.h"
#include "net/base/dns_util.h" #include "net/base/dns_util.h"
#include "net/base/net_errors.h" #include "net/base/net_errors.h"
#include "net/base/net_log.h" #include "net/base/net_log.h"
...@@ -80,9 +83,7 @@ int MDnsConnection::SocketHandler::DoLoop(int rv) { ...@@ -80,9 +83,7 @@ int MDnsConnection::SocketHandler::DoLoop(int rv) {
connection_->OnDatagramReceived(&response_, recv_addr_, rv); connection_->OnDatagramReceived(&response_, recv_addr_, rv);
rv = socket_->RecvFrom( rv = socket_->RecvFrom(
response_.io_buffer(), response_.io_buffer(), response_.io_buffer()->size(), &recv_addr_,
response_.io_buffer()->size(),
&recv_addr_,
base::Bind(&MDnsConnection::SocketHandler::OnDatagramReceived, base::Bind(&MDnsConnection::SocketHandler::OnDatagramReceived,
base::Unretained(this))); base::Unretained(this)));
} while (rv > 0); } while (rv > 0);
...@@ -195,7 +196,10 @@ void MDnsConnection::OnDatagramReceived( ...@@ -195,7 +196,10 @@ void MDnsConnection::OnDatagramReceived(
delegate_->HandlePacket(response, bytes_read); delegate_->HandlePacket(response, bytes_read);
} }
MDnsClientImpl::Core::Core() : connection_(new MDnsConnection(this)) { MDnsClientImpl::Core::Core(base::Clock* clock, base::Timer* timer)
: clock_(clock),
cleanup_timer_(timer),
connection_(new MDnsConnection(this)) {
} }
MDnsClientImpl::Core::~Core() { MDnsClientImpl::Core::~Core() {
...@@ -241,8 +245,8 @@ void MDnsClientImpl::Core::HandlePacket(DnsResponse* response, ...@@ -241,8 +245,8 @@ void MDnsClientImpl::Core::HandlePacket(DnsResponse* response,
for (unsigned i = 0; i < answer_count; i++) { for (unsigned i = 0; i < answer_count; i++) {
offset = parser.GetOffset(); offset = parser.GetOffset();
scoped_ptr<const RecordParsed> record = RecordParsed::CreateFrom( scoped_ptr<const RecordParsed> record =
&parser, base::Time::Now()); RecordParsed::CreateFrom(&parser, clock_->Now());
if (!record) { if (!record) {
DVLOG(1) << "Could not understand an mDNS record."; DVLOG(1) << "Could not understand an mDNS record.";
...@@ -295,8 +299,7 @@ void MDnsClientImpl::Core::NotifyNsecRecord(const RecordParsed* record) { ...@@ -295,8 +299,7 @@ void MDnsClientImpl::Core::NotifyNsecRecord(const RecordParsed* record) {
// Remove all cached records matching the nonexistent RR types. // Remove all cached records matching the nonexistent RR types.
std::vector<const RecordParsed*> records_to_remove; std::vector<const RecordParsed*> records_to_remove;
cache_.FindDnsRecords(0, record->name(), &records_to_remove, cache_.FindDnsRecords(0, record->name(), &records_to_remove, clock_->Now());
base::Time::Now());
for (std::vector<const RecordParsed*>::iterator i = records_to_remove.begin(); for (std::vector<const RecordParsed*>::iterator i = records_to_remove.begin();
i != records_to_remove.end(); i++) { i != records_to_remove.end(); i++) {
...@@ -380,25 +383,26 @@ void MDnsClientImpl::Core::CleanupObserverList(const ListenerKey& key) { ...@@ -380,25 +383,26 @@ void MDnsClientImpl::Core::CleanupObserverList(const ListenerKey& key) {
void MDnsClientImpl::Core::ScheduleCleanup(base::Time cleanup) { void MDnsClientImpl::Core::ScheduleCleanup(base::Time cleanup) {
// Cleanup is already scheduled, no need to do anything. // Cleanup is already scheduled, no need to do anything.
if (cleanup == scheduled_cleanup_) return; if (cleanup == scheduled_cleanup_) {
return;
}
scheduled_cleanup_ = cleanup; scheduled_cleanup_ = cleanup;
// This cancels the previously scheduled cleanup. // This cancels the previously scheduled cleanup.
cleanup_callback_.Reset(base::Bind( cleanup_timer_->Stop();
&MDnsClientImpl::Core::DoCleanup, base::Unretained(this)));
// If |cleanup| is empty, then no cleanup necessary. // If |cleanup| is empty, then no cleanup necessary.
if (cleanup != base::Time()) { if (cleanup != base::Time()) {
base::MessageLoop::current()->PostDelayedTask( cleanup_timer_->Start(
FROM_HERE, FROM_HERE, std::max(base::TimeDelta(), cleanup - clock_->Now()),
cleanup_callback_.callback(), base::Bind(&MDnsClientImpl::Core::DoCleanup, base::Unretained(this)));
cleanup - base::Time::Now());
} }
} }
void MDnsClientImpl::Core::DoCleanup() { void MDnsClientImpl::Core::DoCleanup() {
cache_.CleanupRecords(base::Time::Now(), base::Bind( cache_.CleanupRecords(clock_->Now(),
&MDnsClientImpl::Core::OnRecordRemoved, base::Unretained(this))); base::Bind(&MDnsClientImpl::Core::OnRecordRemoved,
base::Unretained(this)));
ScheduleCleanup(cache_.next_expiration()); ScheduleCleanup(cache_.next_expiration());
} }
...@@ -412,10 +416,17 @@ void MDnsClientImpl::Core::OnRecordRemoved( ...@@ -412,10 +416,17 @@ void MDnsClientImpl::Core::OnRecordRemoved(
void MDnsClientImpl::Core::QueryCache( void MDnsClientImpl::Core::QueryCache(
uint16 rrtype, const std::string& name, uint16 rrtype, const std::string& name,
std::vector<const RecordParsed*>* records) const { std::vector<const RecordParsed*>* records) const {
cache_.FindDnsRecords(rrtype, name, records, base::Time::Now()); cache_.FindDnsRecords(rrtype, name, records, clock_->Now());
} }
MDnsClientImpl::MDnsClientImpl() { MDnsClientImpl::MDnsClientImpl()
: clock_(new base::DefaultClock),
cleanup_timer_(new base::Timer(false, false)) {
}
MDnsClientImpl::MDnsClientImpl(scoped_ptr<base::Clock> clock,
scoped_ptr<base::Timer> timer)
: clock_(clock.Pass()), cleanup_timer_(timer.Pass()) {
} }
MDnsClientImpl::~MDnsClientImpl() { MDnsClientImpl::~MDnsClientImpl() {
...@@ -423,7 +434,7 @@ MDnsClientImpl::~MDnsClientImpl() { ...@@ -423,7 +434,7 @@ MDnsClientImpl::~MDnsClientImpl() {
bool MDnsClientImpl::StartListening(MDnsSocketFactory* socket_factory) { bool MDnsClientImpl::StartListening(MDnsSocketFactory* socket_factory) {
DCHECK(!core_.get()); DCHECK(!core_.get());
core_.reset(new Core()); core_.reset(new Core(clock_.get(), cleanup_timer_.get()));
if (!core_->Init(socket_factory)) { if (!core_->Init(socket_factory)) {
core_.reset(); core_.reset();
return false; return false;
...@@ -444,7 +455,7 @@ scoped_ptr<MDnsListener> MDnsClientImpl::CreateListener( ...@@ -444,7 +455,7 @@ scoped_ptr<MDnsListener> MDnsClientImpl::CreateListener(
const std::string& name, const std::string& name,
MDnsListener::Delegate* delegate) { MDnsListener::Delegate* delegate) {
return scoped_ptr<net::MDnsListener>( return scoped_ptr<net::MDnsListener>(
new MDnsListenerImpl(rrtype, name, delegate, this)); new MDnsListenerImpl(rrtype, name, clock_.get(), delegate, this));
} }
scoped_ptr<MDnsTransaction> MDnsClientImpl::CreateTransaction( scoped_ptr<MDnsTransaction> MDnsClientImpl::CreateTransaction(
...@@ -456,13 +467,18 @@ scoped_ptr<MDnsTransaction> MDnsClientImpl::CreateTransaction( ...@@ -456,13 +467,18 @@ scoped_ptr<MDnsTransaction> MDnsClientImpl::CreateTransaction(
new MDnsTransactionImpl(rrtype, name, flags, callback, this)); new MDnsTransactionImpl(rrtype, name, flags, callback, this));
} }
MDnsListenerImpl::MDnsListenerImpl( MDnsListenerImpl::MDnsListenerImpl(uint16 rrtype,
uint16 rrtype, const std::string& name,
const std::string& name, base::Clock* clock,
MDnsListener::Delegate* delegate, MDnsListener::Delegate* delegate,
MDnsClientImpl* client) MDnsClientImpl* client)
: rrtype_(rrtype), name_(name), client_(client), delegate_(delegate), : rrtype_(rrtype),
started_(false), active_refresh_(false) { name_(name),
clock_(clock),
client_(client),
delegate_(delegate),
started_(false),
active_refresh_(false) {
} }
MDnsListenerImpl::~MDnsListenerImpl() { MDnsListenerImpl::~MDnsListenerImpl() {
...@@ -571,14 +587,10 @@ void MDnsListenerImpl::ScheduleNextRefresh() { ...@@ -571,14 +587,10 @@ void MDnsListenerImpl::ScheduleNextRefresh() {
kListenerRefreshRatio2 * ttl_)); kListenerRefreshRatio2 * ttl_));
base::MessageLoop::current()->PostDelayedTask( base::MessageLoop::current()->PostDelayedTask(
FROM_HERE, FROM_HERE, next_refresh_.callback(), next_refresh1 - clock_->Now());
next_refresh_.callback(),
next_refresh1 - base::Time::Now());
base::MessageLoop::current()->PostDelayedTask( base::MessageLoop::current()->PostDelayedTask(
FROM_HERE, FROM_HERE, next_refresh_.callback(), next_refresh2 - clock_->Now());
next_refresh_.callback(),
next_refresh2 - base::Time::Now());
} }
void MDnsListenerImpl::DoRefresh() { void MDnsListenerImpl::DoRefresh() {
......
net/dns/mdns_client_impl.h
View file @ 3e740be5
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#define NET_DNS_MDNS_CLIENT_IMPL_H_ #define NET_DNS_MDNS_CLIENT_IMPL_H_
#include <map> #include <map>
#include <queue>
#include <string> #include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>
...@@ -21,11 +22,16 @@ ...@@ -21,11 +22,16 @@
#include "net/udp/udp_server_socket.h" #include "net/udp/udp_server_socket.h"
#include "net/udp/udp_socket.h" #include "net/udp/udp_socket.h"
namespace base {
class Clock;
class Timer;
} // namespace base
namespace net { namespace net {
class MDnsSocketFactoryImpl : public MDnsSocketFactory { class MDnsSocketFactoryImpl : public MDnsSocketFactory {
public: public:
MDnsSocketFactoryImpl() {}; MDnsSocketFactoryImpl() {}
~MDnsSocketFactoryImpl() override{}; ~MDnsSocketFactoryImpl() override{};
void CreateSockets(ScopedVector<DatagramServerSocket>* sockets) override; void CreateSockets(ScopedVector<DatagramServerSocket>* sockets) override;
...@@ -109,7 +115,7 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient { ...@@ -109,7 +115,7 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient {
// invalidate the core. // invalidate the core.
class Core : public base::SupportsWeakPtr<Core>, MDnsConnection::Delegate { class Core : public base::SupportsWeakPtr<Core>, MDnsConnection::Delegate {
public: public:
Core(); Core(base::Clock* clock, base::Timer* timer);
~Core() override; ~Core() override;
// Initialize the core. Returns true on success. // Initialize the core. Returns true on success.
...@@ -132,6 +138,8 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient { ...@@ -132,6 +138,8 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient {
void OnConnectionError(int error) override; void OnConnectionError(int error) override;
private: private:
FRIEND_TEST_ALL_PREFIXES(MDnsTest, CacheCleanupWithShortTTL);
typedef std::pair<std::string, uint16> ListenerKey; typedef std::pair<std::string, uint16> ListenerKey;
typedef std::map<ListenerKey, ObserverList<MDnsListenerImpl>* > typedef std::map<ListenerKey, ObserverList<MDnsListenerImpl>* >
ListenerMap; ListenerMap;
...@@ -159,7 +167,8 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient { ...@@ -159,7 +167,8 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient {
MDnsCache cache_; MDnsCache cache_;
base::CancelableClosure cleanup_callback_; base::Clock* clock_;
base::Timer* cleanup_timer_;
base::Time scheduled_cleanup_; base::Time scheduled_cleanup_;
scoped_ptr<MDnsConnection> connection_; scoped_ptr<MDnsConnection> connection_;
...@@ -189,7 +198,15 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient { ...@@ -189,7 +198,15 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient {
Core* core() { return core_.get(); } Core* core() { return core_.get(); }
private: private:
FRIEND_TEST_ALL_PREFIXES(MDnsTest, CacheCleanupWithShortTTL);
// Test constructor, takes a mock clock and mock timer.
MDnsClientImpl(scoped_ptr<base::Clock> clock,
scoped_ptr<base::Timer> cleanup_timer);
scoped_ptr<Core> core_; scoped_ptr<Core> core_;
scoped_ptr<base::Clock> clock_;
scoped_ptr<base::Timer> cleanup_timer_;
DISALLOW_COPY_AND_ASSIGN(MDnsClientImpl); DISALLOW_COPY_AND_ASSIGN(MDnsClientImpl);
}; };
...@@ -199,6 +216,7 @@ class MDnsListenerImpl : public MDnsListener, ...@@ -199,6 +216,7 @@ class MDnsListenerImpl : public MDnsListener,
public: public:
MDnsListenerImpl(uint16 rrtype, MDnsListenerImpl(uint16 rrtype,
const std::string& name, const std::string& name,
base::Clock* clock,
MDnsListener::Delegate* delegate, MDnsListener::Delegate* delegate,
MDnsClientImpl* client); MDnsClientImpl* client);
...@@ -229,6 +247,7 @@ class MDnsListenerImpl : public MDnsListener, ...@@ -229,6 +247,7 @@ class MDnsListenerImpl : public MDnsListener,
uint16 rrtype_; uint16 rrtype_;
std::string name_; std::string name_;
base::Clock* clock_;
MDnsClientImpl* client_; MDnsClientImpl* client_;
MDnsListener::Delegate* delegate_; MDnsListener::Delegate* delegate_;
......
net/dns/mdns_client_unittest.cc
View file @ 3e740be5
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/time/clock.h"
#include "base/time/default_clock.h"
#include "base/timer/mock_timer.h"
#include "net/base/rand_callback.h" #include "net/base/rand_callback.h"
#include "net/base/test_completion_callback.h" #include "net/base/test_completion_callback.h"
#include "net/dns/mdns_client_impl.h" #include "net/dns/mdns_client_impl.h"
...@@ -222,6 +225,38 @@ const uint8 kSamplePacket2[] = { ...@@ -222,6 +225,38 @@ const uint8 kSamplePacket2[] = {
0xc0, 0x32 0xc0, 0x32
}; };
const uint8 kSamplePacket3[] = {
// Header
0x00, 0x00, // ID is zeroed out
0x81, 0x80, // Standard query response, RA, no error
0x00, 0x00, // No questions (for simplicity)
0x00, 0x02, // 2 RRs (answers)
0x00, 0x00, // 0 authority RRs
0x00, 0x00, // 0 additional RRs
// Answer 1
0x07, '_', 'p', 'r', 'i', 'v', 'e', 't', //
0x04, '_', 't', 'c', 'p', //
0x05, 'l', 'o', 'c', 'a', 'l', //
0x00, 0x00, 0x0c, // TYPE is PTR.
0x00, 0x01, // CLASS is IN.
0x00, 0x00, // TTL (4 bytes) is 1 second;
0x00, 0x01, //
0x00, 0x08, // RDLENGTH is 8 bytes.
0x05, 'h', 'e', 'l', 'l', 'o', //
0xc0, 0x0c, //
// Answer 2
0x08, '_', 'p', 'r', 'i', 'n', 't', 'e', 'r', //
0xc0, 0x14, // Pointer to "._tcp.local"
0x00, 0x0c, // TYPE is PTR.
0x00, 0x01, // CLASS is IN.
0x00, 0x00, // TTL (4 bytes) is 3 seconds.
0x00, 0x03, //
0x00, 0x08, // RDLENGTH is 8 bytes.
0x05, 'h', 'e', 'l', 'l', 'o', //
0xc0, 0x32};
const uint8 kQueryPacketPrivet[] = { const uint8 kQueryPacketPrivet[] = {
// Header // Header
0x00, 0x00, // ID is zeroed out 0x00, 0x00, // ID is zeroed out
...@@ -389,9 +424,45 @@ class PtrRecordCopyContainer { ...@@ -389,9 +424,45 @@ class PtrRecordCopyContainer {
int ttl_; int ttl_;
}; };
class MockClock : public base::DefaultClock {
public:
MockClock() : base::DefaultClock() {}
virtual ~MockClock() {}
MOCK_METHOD0(Now, base::Time());
private:
DISALLOW_COPY_AND_ASSIGN(MockClock);
};
class MockTimer : public base::MockTimer {
public:
MockTimer() : base::MockTimer(false, false) {}
~MockTimer() {}
void Start(const tracked_objects::Location& posted_from,
base::TimeDelta delay,
const base::Closure& user_task) {
StartObserver(posted_from, delay, user_task);
base::MockTimer::Start(posted_from, delay, user_task);
}
// StartObserver is invoked when MockTimer::Start() is called.
// Does not replace the behavior of MockTimer::Start().
MOCK_METHOD3(StartObserver,
void(const tracked_objects::Location& posted_from,
base::TimeDelta delay,
const base::Closure& user_task));
private:
DISALLOW_COPY_AND_ASSIGN(MockTimer);
};
} // namespace
class MDnsTest : public ::testing::Test { class MDnsTest : public ::testing::Test {
public: public:
virtual void SetUp() override; void SetUp() override;
void DeleteTransaction(); void DeleteTransaction();
void DeleteBothListeners(); void DeleteBothListeners();
void RunFor(base::TimeDelta time_period); void RunFor(base::TimeDelta time_period);
...@@ -403,12 +474,11 @@ class MDnsTest : public ::testing::Test { ...@@ -403,12 +474,11 @@ class MDnsTest : public ::testing::Test {
MOCK_METHOD2(MockableRecordCallback2, void(MDnsTransaction::Result result, MOCK_METHOD2(MockableRecordCallback2, void(MDnsTransaction::Result result,
const RecordParsed* record)); const RecordParsed* record));
protected: protected:
void ExpectPacket(const uint8* packet, unsigned size); void ExpectPacket(const uint8* packet, unsigned size);
void SimulatePacketReceive(const uint8* packet, unsigned size); void SimulatePacketReceive(const uint8* packet, unsigned size);
MDnsClientImpl test_client_; scoped_ptr<MDnsClientImpl> test_client_;
IPEndPoint mdns_ipv4_endpoint_; IPEndPoint mdns_ipv4_endpoint_;
StrictMock<MockMDnsSocketFactory> socket_factory_; StrictMock<MockMDnsSocketFactory> socket_factory_;
...@@ -429,7 +499,8 @@ class MockListenerDelegate : public MDnsListener::Delegate { ...@@ -429,7 +499,8 @@ class MockListenerDelegate : public MDnsListener::Delegate {
}; };
void MDnsTest::SetUp() { void MDnsTest::SetUp() {
test_client_.StartListening(&socket_factory_); test_client_.reset(new MDnsClientImpl());
test_client_->StartListening(&socket_factory_);
} }
void MDnsTest::SimulatePacketReceive(const uint8* packet, unsigned size) { void MDnsTest::SimulatePacketReceive(const uint8* packet, unsigned size) {
...@@ -471,12 +542,10 @@ TEST_F(MDnsTest, PassiveListeners) { ...@@ -471,12 +542,10 @@ TEST_F(MDnsTest, PassiveListeners) {
PtrRecordCopyContainer record_privet; PtrRecordCopyContainer record_privet;
PtrRecordCopyContainer record_printer; PtrRecordCopyContainer record_printer;
scoped_ptr<MDnsListener> listener_privet = scoped_ptr<MDnsListener> listener_privet = test_client_->CreateListener(
test_client_.CreateListener(dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local", &delegate_privet);
&delegate_privet); scoped_ptr<MDnsListener> listener_printer = test_client_->CreateListener(
scoped_ptr<MDnsListener> listener_printer = dns_protocol::kTypePTR, "_printer._tcp.local", &delegate_printer);
test_client_.CreateListener(dns_protocol::kTypePTR, "_printer._tcp.local",
&delegate_printer);
ASSERT_TRUE(listener_privet->Start()); ASSERT_TRUE(listener_privet->Start());
ASSERT_TRUE(listener_printer->Start()); ASSERT_TRUE(listener_printer->Start());
...@@ -515,9 +584,8 @@ TEST_F(MDnsTest, PassiveListenersCacheCleanup) { ...@@ -515,9 +584,8 @@ TEST_F(MDnsTest, PassiveListenersCacheCleanup) {
PtrRecordCopyContainer record_privet; PtrRecordCopyContainer record_privet;
PtrRecordCopyContainer record_privet2; PtrRecordCopyContainer record_privet2;
scoped_ptr<MDnsListener> listener_privet = scoped_ptr<MDnsListener> listener_privet = test_client_->CreateListener(
test_client_.CreateListener(dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local", &delegate_privet);
&delegate_privet);
ASSERT_TRUE(listener_privet->Start()); ASSERT_TRUE(listener_privet->Start());
...@@ -545,14 +613,75 @@ TEST_F(MDnsTest, PassiveListenersCacheCleanup) { ...@@ -545,14 +613,75 @@ TEST_F(MDnsTest, PassiveListenersCacheCleanup) {
"hello._privet._tcp.local")); "hello._privet._tcp.local"));
} }
// Ensure that the cleanup task scheduler won't schedule cleanup tasks in the
// past if the system clock creeps past the expiration time while in the
// cleanup dispatcher.
TEST_F(MDnsTest, CacheCleanupWithShortTTL) {
// Use a nonzero starting time as a base.
base::Time start_time = base::Time() + base::TimeDelta::FromSeconds(1);
MockClock* clock = new MockClock;
MockTimer* timer = new MockTimer;
test_client_.reset(
new MDnsClientImpl(make_scoped_ptr(clock), make_scoped_ptr(timer)));
test_client_->StartListening(&socket_factory_);
EXPECT_CALL(*timer, StartObserver(_, _, _)).Times(1);
EXPECT_CALL(*clock, Now())
.Times(3)
.WillRepeatedly(Return(start_time))
.RetiresOnSaturation();
// Receive two records with different TTL values.
// TTL(privet)=1.0s
// TTL(printer)=3.0s
StrictMock<MockListenerDelegate> delegate_privet;
StrictMock<MockListenerDelegate> delegate_printer;
PtrRecordCopyContainer record_privet;
PtrRecordCopyContainer record_printer;
scoped_ptr<MDnsListener> listener_privet = test_client_->CreateListener(
dns_protocol::kTypePTR, "_privet._tcp.local", &delegate_privet);
scoped_ptr<MDnsListener> listener_printer = test_client_->CreateListener(
dns_protocol::kTypePTR, "_printer._tcp.local", &delegate_printer);
ASSERT_TRUE(listener_privet->Start());
ASSERT_TRUE(listener_printer->Start());
EXPECT_CALL(delegate_privet, OnRecordUpdate(MDnsListener::RECORD_ADDED, _))
.Times(Exactly(1));
EXPECT_CALL(delegate_printer, OnRecordUpdate(MDnsListener::RECORD_ADDED, _))
.Times(Exactly(1));
SimulatePacketReceive(kSamplePacket3, sizeof(kSamplePacket3));
EXPECT_CALL(delegate_privet, OnRecordUpdate(MDnsListener::RECORD_REMOVED, _))
.Times(Exactly(1));
// Set the clock to 2.0s, which should clean up the 'privet' record, but not
// the printer. The mock clock will change Now() mid-execution from 2s to 4s.
// Note: expectations are FILO-ordered -- t+2 seconds is returned, then t+4.
EXPECT_CALL(*clock, Now())
.WillOnce(Return(start_time + base::TimeDelta::FromSeconds(4)))
.RetiresOnSaturation();
EXPECT_CALL(*clock, Now())
.WillOnce(Return(start_time + base::TimeDelta::FromSeconds(2)))
.RetiresOnSaturation();
EXPECT_CALL(*timer, StartObserver(_, base::TimeDelta(), _));
timer->Fire();
}
TEST_F(MDnsTest, MalformedPacket) { TEST_F(MDnsTest, MalformedPacket) {
StrictMock<MockListenerDelegate> delegate_printer; StrictMock<MockListenerDelegate> delegate_printer;
PtrRecordCopyContainer record_printer; PtrRecordCopyContainer record_printer;
scoped_ptr<MDnsListener> listener_printer = scoped_ptr<MDnsListener> listener_printer = test_client_->CreateListener(
test_client_.CreateListener(dns_protocol::kTypePTR, "_printer._tcp.local", dns_protocol::kTypePTR, "_printer._tcp.local", &delegate_printer);
&delegate_printer);
ASSERT_TRUE(listener_printer->Start()); ASSERT_TRUE(listener_printer->Start());
...@@ -582,11 +711,10 @@ TEST_F(MDnsTest, TransactionWithEmptyCache) { ...@@ -582,11 +711,10 @@ TEST_F(MDnsTest, TransactionWithEmptyCache) {
ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet)); ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet));
scoped_ptr<MDnsTransaction> transaction_privet = scoped_ptr<MDnsTransaction> transaction_privet =
test_client_.CreateTransaction( test_client_->CreateTransaction(
dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local",
MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
MDnsTransaction::QUERY_CACHE | MDnsTransaction::SINGLE_RESULT,
MDnsTransaction::SINGLE_RESULT,
base::Bind(&MDnsTest::MockableRecordCallback, base::Bind(&MDnsTest::MockableRecordCallback,
base::Unretained(this))); base::Unretained(this)));
...@@ -607,10 +735,9 @@ TEST_F(MDnsTest, TransactionWithEmptyCache) { ...@@ -607,10 +735,9 @@ TEST_F(MDnsTest, TransactionWithEmptyCache) {
TEST_F(MDnsTest, TransactionCacheOnlyNoResult) { TEST_F(MDnsTest, TransactionCacheOnlyNoResult) {
scoped_ptr<MDnsTransaction> transaction_privet = scoped_ptr<MDnsTransaction> transaction_privet =
test_client_.CreateTransaction( test_client_->CreateTransaction(
dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local",
MDnsTransaction::QUERY_CACHE | MDnsTransaction::QUERY_CACHE | MDnsTransaction::SINGLE_RESULT,
MDnsTransaction::SINGLE_RESULT,
base::Bind(&MDnsTest::MockableRecordCallback, base::Bind(&MDnsTest::MockableRecordCallback,
base::Unretained(this))); base::Unretained(this)));
...@@ -624,10 +751,8 @@ TEST_F(MDnsTest, TransactionCacheOnlyNoResult) { ...@@ -624,10 +751,8 @@ TEST_F(MDnsTest, TransactionCacheOnlyNoResult) {
TEST_F(MDnsTest, TransactionWithCache) { TEST_F(MDnsTest, TransactionWithCache) {
// Listener to force the client to listen // Listener to force the client to listen
StrictMock<MockListenerDelegate> delegate_irrelevant; StrictMock<MockListenerDelegate> delegate_irrelevant;
scoped_ptr<MDnsListener> listener_irrelevant = scoped_ptr<MDnsListener> listener_irrelevant = test_client_->CreateListener(
test_client_.CreateListener(dns_protocol::kTypeA, dns_protocol::kTypeA, "codereview.chromium.local", &delegate_irrelevant);
"codereview.chromium.local",
&delegate_irrelevant);
ASSERT_TRUE(listener_irrelevant->Start()); ASSERT_TRUE(listener_irrelevant->Start());
...@@ -641,11 +766,10 @@ TEST_F(MDnsTest, TransactionWithCache) { ...@@ -641,11 +766,10 @@ TEST_F(MDnsTest, TransactionWithCache) {
&PtrRecordCopyContainer::SaveWithDummyArg)); &PtrRecordCopyContainer::SaveWithDummyArg));
scoped_ptr<MDnsTransaction> transaction_privet = scoped_ptr<MDnsTransaction> transaction_privet =
test_client_.CreateTransaction( test_client_->CreateTransaction(
dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local",
MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
MDnsTransaction::QUERY_CACHE | MDnsTransaction::SINGLE_RESULT,
MDnsTransaction::SINGLE_RESULT,
base::Bind(&MDnsTest::MockableRecordCallback, base::Bind(&MDnsTest::MockableRecordCallback,
base::Unretained(this))); base::Unretained(this)));
...@@ -660,9 +784,8 @@ TEST_F(MDnsTest, AdditionalRecords) { ...@@ -660,9 +784,8 @@ TEST_F(MDnsTest, AdditionalRecords) {
PtrRecordCopyContainer record_privet; PtrRecordCopyContainer record_privet;
scoped_ptr<MDnsListener> listener_privet = scoped_ptr<MDnsListener> listener_privet = test_client_->CreateListener(
test_client_.CreateListener(dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local", &delegate_privet);
&delegate_privet);
ASSERT_TRUE(listener_privet->Start()); ASSERT_TRUE(listener_privet->Start());
...@@ -683,11 +806,10 @@ TEST_F(MDnsTest, TransactionTimeout) { ...@@ -683,11 +806,10 @@ TEST_F(MDnsTest, TransactionTimeout) {
ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet)); ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet));
scoped_ptr<MDnsTransaction> transaction_privet = scoped_ptr<MDnsTransaction> transaction_privet =
test_client_.CreateTransaction( test_client_->CreateTransaction(
dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local",
MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
MDnsTransaction::QUERY_CACHE | MDnsTransaction::SINGLE_RESULT,
MDnsTransaction::SINGLE_RESULT,
base::Bind(&MDnsTest::MockableRecordCallback, base::Bind(&MDnsTest::MockableRecordCallback,
base::Unretained(this))); base::Unretained(this)));
...@@ -705,10 +827,9 @@ TEST_F(MDnsTest, TransactionMultipleRecords) { ...@@ -705,10 +827,9 @@ TEST_F(MDnsTest, TransactionMultipleRecords) {
ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet)); ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet));
scoped_ptr<MDnsTransaction> transaction_privet = scoped_ptr<MDnsTransaction> transaction_privet =
test_client_.CreateTransaction( test_client_->CreateTransaction(
dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local",
MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE,
MDnsTransaction::QUERY_CACHE ,
base::Bind(&MDnsTest::MockableRecordCallback, base::Bind(&MDnsTest::MockableRecordCallback,
base::Unretained(this))); base::Unretained(this)));
...@@ -742,13 +863,11 @@ TEST_F(MDnsTest, TransactionMultipleRecords) { ...@@ -742,13 +863,11 @@ TEST_F(MDnsTest, TransactionMultipleRecords) {
TEST_F(MDnsTest, TransactionReentrantDelete) { TEST_F(MDnsTest, TransactionReentrantDelete) {
ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet)); ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet));
transaction_ = test_client_.CreateTransaction( transaction_ = test_client_->CreateTransaction(
dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local",
MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
MDnsTransaction::QUERY_CACHE | MDnsTransaction::SINGLE_RESULT,
MDnsTransaction::SINGLE_RESULT, base::Bind(&MDnsTest::MockableRecordCallback, base::Unretained(this)));
base::Bind(&MDnsTest::MockableRecordCallback,
base::Unretained(this)));
ASSERT_TRUE(transaction_->Start()); ASSERT_TRUE(transaction_->Start());
...@@ -765,19 +884,16 @@ TEST_F(MDnsTest, TransactionReentrantDelete) { ...@@ -765,19 +884,16 @@ TEST_F(MDnsTest, TransactionReentrantDelete) {
TEST_F(MDnsTest, TransactionReentrantDeleteFromCache) { TEST_F(MDnsTest, TransactionReentrantDeleteFromCache) {
StrictMock<MockListenerDelegate> delegate_irrelevant; StrictMock<MockListenerDelegate> delegate_irrelevant;
scoped_ptr<MDnsListener> listener_irrelevant = test_client_.CreateListener( scoped_ptr<MDnsListener> listener_irrelevant = test_client_->CreateListener(
dns_protocol::kTypeA, "codereview.chromium.local", dns_protocol::kTypeA, "codereview.chromium.local", &delegate_irrelevant);
&delegate_irrelevant);
ASSERT_TRUE(listener_irrelevant->Start()); ASSERT_TRUE(listener_irrelevant->Start());
SimulatePacketReceive(kSamplePacket1, sizeof(kSamplePacket1)); SimulatePacketReceive(kSamplePacket1, sizeof(kSamplePacket1));
transaction_ = test_client_.CreateTransaction( transaction_ = test_client_->CreateTransaction(
dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local",
MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE,
MDnsTransaction::QUERY_CACHE, base::Bind(&MDnsTest::MockableRecordCallback, base::Unretained(this)));
base::Bind(&MDnsTest::MockableRecordCallback,
base::Unretained(this)));
EXPECT_CALL(*this, MockableRecordCallback(MDnsTransaction::RESULT_RECORD, _)) EXPECT_CALL(*this, MockableRecordCallback(MDnsTransaction::RESULT_RECORD, _))
.Times(Exactly(1)) .Times(Exactly(1))
...@@ -791,22 +907,16 @@ TEST_F(MDnsTest, TransactionReentrantDeleteFromCache) { ...@@ -791,22 +907,16 @@ TEST_F(MDnsTest, TransactionReentrantDeleteFromCache) {
TEST_F(MDnsTest, TransactionReentrantCacheLookupStart) { TEST_F(MDnsTest, TransactionReentrantCacheLookupStart) {
ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet)); ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet));
scoped_ptr<MDnsTransaction> transaction1 = scoped_ptr<MDnsTransaction> transaction1 = test_client_->CreateTransaction(
test_client_.CreateTransaction( dns_protocol::kTypePTR, "_privet._tcp.local",
dns_protocol::kTypePTR, "_privet._tcp.local", MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
MDnsTransaction::QUERY_NETWORK |
MDnsTransaction::QUERY_CACHE |
MDnsTransaction::SINGLE_RESULT, MDnsTransaction::SINGLE_RESULT,
base::Bind(&MDnsTest::MockableRecordCallback, base::Bind(&MDnsTest::MockableRecordCallback, base::Unretained(this)));
base::Unretained(this)));
scoped_ptr<MDnsTransaction> transaction2 = scoped_ptr<MDnsTransaction> transaction2 = test_client_->CreateTransaction(
test_client_.CreateTransaction( dns_protocol::kTypePTR, "_printer._tcp.local",
dns_protocol::kTypePTR, "_printer._tcp.local", MDnsTransaction::QUERY_CACHE | MDnsTransaction::SINGLE_RESULT,
MDnsTransaction::QUERY_CACHE | base::Bind(&MDnsTest::MockableRecordCallback2, base::Unretained(this)));
MDnsTransaction::SINGLE_RESULT,
base::Bind(&MDnsTest::MockableRecordCallback2,
base::Unretained(this)));
EXPECT_CALL(*this, MockableRecordCallback2(MDnsTransaction::RESULT_RECORD, EXPECT_CALL(*this, MockableRecordCallback2(MDnsTransaction::RESULT_RECORD,
_)) _))
...@@ -826,7 +936,7 @@ TEST_F(MDnsTest, TransactionReentrantCacheLookupStart) { ...@@ -826,7 +936,7 @@ TEST_F(MDnsTest, TransactionReentrantCacheLookupStart) {
TEST_F(MDnsTest, GoodbyePacketNotification) { TEST_F(MDnsTest, GoodbyePacketNotification) {
StrictMock<MockListenerDelegate> delegate_privet; StrictMock<MockListenerDelegate> delegate_privet;
scoped_ptr<MDnsListener> listener_privet = test_client_.CreateListener( scoped_ptr<MDnsListener> listener_privet = test_client_->CreateListener(
dns_protocol::kTypePTR, "_privet._tcp.local", &delegate_privet); dns_protocol::kTypePTR, "_privet._tcp.local", &delegate_privet);
ASSERT_TRUE(listener_privet->Start()); ASSERT_TRUE(listener_privet->Start());
...@@ -838,9 +948,8 @@ TEST_F(MDnsTest, GoodbyePacketNotification) { ...@@ -838,9 +948,8 @@ TEST_F(MDnsTest, GoodbyePacketNotification) {
TEST_F(MDnsTest, GoodbyePacketRemoval) { TEST_F(MDnsTest, GoodbyePacketRemoval) {
StrictMock<MockListenerDelegate> delegate_privet; StrictMock<MockListenerDelegate> delegate_privet;
scoped_ptr<MDnsListener> listener_privet = scoped_ptr<MDnsListener> listener_privet = test_client_->CreateListener(
test_client_.CreateListener(dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local", &delegate_privet);
&delegate_privet);
ASSERT_TRUE(listener_privet->Start()); ASSERT_TRUE(listener_privet->Start());
EXPECT_CALL(delegate_privet, OnRecordUpdate(MDnsListener::RECORD_ADDED, _)) EXPECT_CALL(delegate_privet, OnRecordUpdate(MDnsListener::RECORD_ADDED, _))
...@@ -863,13 +972,11 @@ TEST_F(MDnsTest, GoodbyePacketRemoval) { ...@@ -863,13 +972,11 @@ TEST_F(MDnsTest, GoodbyePacketRemoval) {
TEST_F(MDnsTest, ListenerReentrantDelete) { TEST_F(MDnsTest, ListenerReentrantDelete) {
StrictMock<MockListenerDelegate> delegate_privet; StrictMock<MockListenerDelegate> delegate_privet;
listener1_ = test_client_.CreateListener(dns_protocol::kTypePTR, listener1_ = test_client_->CreateListener(
"_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local", &delegate_privet);
&delegate_privet);
listener2_ = test_client_.CreateListener(dns_protocol::kTypePTR, listener2_ = test_client_->CreateListener(
"_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local", &delegate_privet);
&delegate_privet);
ASSERT_TRUE(listener1_->Start()); ASSERT_TRUE(listener1_->Start());
...@@ -896,9 +1003,8 @@ TEST_F(MDnsTest, DoubleRecordDisagreeing) { ...@@ -896,9 +1003,8 @@ TEST_F(MDnsTest, DoubleRecordDisagreeing) {
IPAddressNumber address; IPAddressNumber address;
StrictMock<MockListenerDelegate> delegate_privet; StrictMock<MockListenerDelegate> delegate_privet;
scoped_ptr<MDnsListener> listener_privet = scoped_ptr<MDnsListener> listener_privet = test_client_->CreateListener(
test_client_.CreateListener(dns_protocol::kTypeA, "privet.local", dns_protocol::kTypeA, "privet.local", &delegate_privet);
&delegate_privet);
ASSERT_TRUE(listener_privet->Start()); ASSERT_TRUE(listener_privet->Start());
...@@ -914,16 +1020,14 @@ TEST_F(MDnsTest, DoubleRecordDisagreeing) { ...@@ -914,16 +1020,14 @@ TEST_F(MDnsTest, DoubleRecordDisagreeing) {
TEST_F(MDnsTest, NsecWithListener) { TEST_F(MDnsTest, NsecWithListener) {
StrictMock<MockListenerDelegate> delegate_privet; StrictMock<MockListenerDelegate> delegate_privet;
scoped_ptr<MDnsListener> listener_privet = scoped_ptr<MDnsListener> listener_privet = test_client_->CreateListener(
test_client_.CreateListener(dns_protocol::kTypeA, "_privet._tcp.local", dns_protocol::kTypeA, "_privet._tcp.local", &delegate_privet);
&delegate_privet);
// Test to make sure nsec callback is NOT called for PTR // Test to make sure nsec callback is NOT called for PTR
// (which is marked as existing). // (which is marked as existing).
StrictMock<MockListenerDelegate> delegate_privet2; StrictMock<MockListenerDelegate> delegate_privet2;
scoped_ptr<MDnsListener> listener_privet2 = scoped_ptr<MDnsListener> listener_privet2 = test_client_->CreateListener(
test_client_.CreateListener(dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local", &delegate_privet2);
&delegate_privet2);
ASSERT_TRUE(listener_privet->Start()); ASSERT_TRUE(listener_privet->Start());
...@@ -936,11 +1040,10 @@ TEST_F(MDnsTest, NsecWithListener) { ...@@ -936,11 +1040,10 @@ TEST_F(MDnsTest, NsecWithListener) {
TEST_F(MDnsTest, NsecWithTransactionFromNetwork) { TEST_F(MDnsTest, NsecWithTransactionFromNetwork) {
scoped_ptr<MDnsTransaction> transaction_privet = scoped_ptr<MDnsTransaction> transaction_privet =
test_client_.CreateTransaction( test_client_->CreateTransaction(
dns_protocol::kTypeA, "_privet._tcp.local", dns_protocol::kTypeA, "_privet._tcp.local",
MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
MDnsTransaction::QUERY_CACHE | MDnsTransaction::SINGLE_RESULT,
MDnsTransaction::SINGLE_RESULT,
base::Bind(&MDnsTest::MockableRecordCallback, base::Bind(&MDnsTest::MockableRecordCallback,
base::Unretained(this))); base::Unretained(this)));
...@@ -958,9 +1061,8 @@ TEST_F(MDnsTest, NsecWithTransactionFromNetwork) { ...@@ -958,9 +1061,8 @@ TEST_F(MDnsTest, NsecWithTransactionFromNetwork) {
TEST_F(MDnsTest, NsecWithTransactionFromCache) { TEST_F(MDnsTest, NsecWithTransactionFromCache) {
// Force mDNS to listen. // Force mDNS to listen.
StrictMock<MockListenerDelegate> delegate_irrelevant; StrictMock<MockListenerDelegate> delegate_irrelevant;
scoped_ptr<MDnsListener> listener_irrelevant = scoped_ptr<MDnsListener> listener_irrelevant = test_client_->CreateListener(
test_client_.CreateListener(dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local", &delegate_irrelevant);
&delegate_irrelevant);
listener_irrelevant->Start(); listener_irrelevant->Start();
SimulatePacketReceive(kSamplePacketNsec, SimulatePacketReceive(kSamplePacketNsec,
...@@ -970,11 +1072,10 @@ TEST_F(MDnsTest, NsecWithTransactionFromCache) { ...@@ -970,11 +1072,10 @@ TEST_F(MDnsTest, NsecWithTransactionFromCache) {
MockableRecordCallback(MDnsTransaction::RESULT_NSEC, NULL)); MockableRecordCallback(MDnsTransaction::RESULT_NSEC, NULL));
scoped_ptr<MDnsTransaction> transaction_privet_a = scoped_ptr<MDnsTransaction> transaction_privet_a =
test_client_.CreateTransaction( test_client_->CreateTransaction(
dns_protocol::kTypeA, "_privet._tcp.local", dns_protocol::kTypeA, "_privet._tcp.local",
MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
MDnsTransaction::QUERY_CACHE | MDnsTransaction::SINGLE_RESULT,
MDnsTransaction::SINGLE_RESULT,
base::Bind(&MDnsTest::MockableRecordCallback, base::Bind(&MDnsTest::MockableRecordCallback,
base::Unretained(this))); base::Unretained(this)));
...@@ -984,11 +1085,10 @@ TEST_F(MDnsTest, NsecWithTransactionFromCache) { ...@@ -984,11 +1085,10 @@ TEST_F(MDnsTest, NsecWithTransactionFromCache) {
// valid answer to the query // valid answer to the query
scoped_ptr<MDnsTransaction> transaction_privet_ptr = scoped_ptr<MDnsTransaction> transaction_privet_ptr =
test_client_.CreateTransaction( test_client_->CreateTransaction(
dns_protocol::kTypePTR, "_privet._tcp.local", dns_protocol::kTypePTR, "_privet._tcp.local",
MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
MDnsTransaction::QUERY_CACHE | MDnsTransaction::SINGLE_RESULT,
MDnsTransaction::SINGLE_RESULT,
base::Bind(&MDnsTest::MockableRecordCallback, base::Bind(&MDnsTest::MockableRecordCallback,
base::Unretained(this))); base::Unretained(this)));
...@@ -999,9 +1099,8 @@ TEST_F(MDnsTest, NsecWithTransactionFromCache) { ...@@ -999,9 +1099,8 @@ TEST_F(MDnsTest, NsecWithTransactionFromCache) {
TEST_F(MDnsTest, NsecConflictRemoval) { TEST_F(MDnsTest, NsecConflictRemoval) {
StrictMock<MockListenerDelegate> delegate_privet; StrictMock<MockListenerDelegate> delegate_privet;
scoped_ptr<MDnsListener> listener_privet = scoped_ptr<MDnsListener> listener_privet = test_client_->CreateListener(
test_client_.CreateListener(dns_protocol::kTypeA, "_privet._tcp.local", dns_protocol::kTypeA, "_privet._tcp.local", &delegate_privet);
&delegate_privet);
ASSERT_TRUE(listener_privet->Start()); ASSERT_TRUE(listener_privet->Start());
...@@ -1029,9 +1128,8 @@ TEST_F(MDnsTest, NsecConflictRemoval) { ...@@ -1029,9 +1128,8 @@ TEST_F(MDnsTest, NsecConflictRemoval) {
TEST_F(MDnsTest, RefreshQuery) { TEST_F(MDnsTest, RefreshQuery) {
StrictMock<MockListenerDelegate> delegate_privet; StrictMock<MockListenerDelegate> delegate_privet;
scoped_ptr<MDnsListener> listener_privet = scoped_ptr<MDnsListener> listener_privet = test_client_->CreateListener(
test_client_.CreateListener(dns_protocol::kTypeA, "_privet._tcp.local", dns_protocol::kTypeA, "_privet._tcp.local", &delegate_privet);
&delegate_privet);
listener_privet->SetActiveRefresh(true); listener_privet->SetActiveRefresh(true);
ASSERT_TRUE(listener_privet->Start()); ASSERT_TRUE(listener_privet->Start());
...@@ -1087,7 +1185,7 @@ class MDnsConnectionTest : public ::testing::Test { ...@@ -1087,7 +1185,7 @@ class MDnsConnectionTest : public ::testing::Test {
protected: protected:
// Follow successful connection initialization. // Follow successful connection initialization.
virtual void SetUp() override { void SetUp() override {
socket_ipv4_ = new MockMDnsDatagramServerSocket(ADDRESS_FAMILY_IPV4); socket_ipv4_ = new MockMDnsDatagramServerSocket(ADDRESS_FAMILY_IPV4);
socket_ipv6_ = new MockMDnsDatagramServerSocket(ADDRESS_FAMILY_IPV6); socket_ipv6_ = new MockMDnsDatagramServerSocket(ADDRESS_FAMILY_IPV6);
factory_.PushSocket(socket_ipv6_); factory_.PushSocket(socket_ipv6_);
...@@ -1219,6 +1317,4 @@ TEST_F(MDnsConnectionSendTest, SendQueued) { ...@@ -1219,6 +1317,4 @@ TEST_F(MDnsConnectionSendTest, SendQueued) {
callback.Run(OK); callback.Run(OK);
} }
} // namespace
} // namespace net } // namespace net
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment