Multicast DNS implementation (initial)

net/dns/mdns_client_unittest.cc

Index: net/dns/mdns_client_unittest.cc
diff --git a/net/dns/mdns_client_unittest.cc b/net/dns/mdns_client_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ca80969d57079bf065bab44ea7b85269c4fd8d40
--- /dev/null
+++ b/net/dns/mdns_client_unittest.cc
@@ -0,0 +1,1030 @@
+// Copyright (c) 2013 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 "base/memory/ref_counted.h"
+#include "base/message_loop.h"
+#include "net/base/rand_callback.h"
+#include "net/base/test_completion_callback.h"
+#include "net/dns/mdns_client_impl.h"
+#include "net/dns/record_rdata.h"
+#include "net/udp/udp_client_socket.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using ::testing::Invoke;
+using ::testing::InvokeWithoutArgs;
+using ::testing::StrictMock;
+using ::testing::Exactly;
+using ::testing::Return;
+using ::testing::SaveArg;
+using ::testing::_;
+
+namespace net {
+
+namespace {
+
+const char kSamplePacket1[] = {
+    // 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, 0x01,        // TTL (4 bytes) is 20 hours, 47 minutes, 49 seconds.
+    0x24, 0x75,
+    0x00, 0x08,        // RDLENGTH is 8 bytes.
+    0x05, 'h', 'e', 'l', 'l', 'o',
+    0xc0, 0x32
+  };
+
+const char kCorruptedPacketBadQuestion[] = {
+    // Header
+    0x00, 0x00,               // ID is zeroed out
+    0x81, 0x80,               // Standard query response, RA, no error
+    0x00, 0x01,               // One question
+    0x00, 0x02,               // 2 RRs (answers)
+    0x00, 0x00,               // 0 authority RRs
+    0x00, 0x00,               // 0 additional RRs
+
+    // Question is corrupted and cannot be read.
+    0x99, 'h', 'e', 'l', 'l', 'o',
+    0x00,
+    0x00, 0x00,
+    0x00, 0x00,
+
+    // 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, 0x01,        // TTL (4 bytes) is 20 hours, 47 minutes, 48 seconds.
+    0x24, 0x74,
+    0x00, 0x99,        // RDLENGTH is impossible
+    0x05, 'h', 'e', 'l', 'l', 'o',
+    0xc0, 0x0c,
+
+    // Answer 2
+    0x08, '_', 'p', 'r',  // Useless trailing data.
+};
+
+const char kCorruptedPacketUnsalvagable[] = {
+    // 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, 0x01,        // TTL (4 bytes) is 20 hours, 47 minutes, 48 seconds.
+    0x24, 0x74,
+    0x00, 0x99,        // RDLENGTH is impossible
+    0x05, 'h', 'e', 'l', 'l', 'o',
+    0xc0, 0x0c,
+
+    // Answer 2
+    0x08, '_', 'p', 'r',  // Useless trailing data.
+};
+
+const char kCorruptedPacketSalvagable[] = {
+      // 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, 0x01,        // TTL (4 bytes) is 20 hours, 47 minutes, 48 seconds.
+    0x24, 0x74,
+    0x00, 0x08,        // RDLENGTH is 8 bytes.
+    0x99, 'h', 'e', 'l', 'l', 'o',   // Bad RDATA format.
+    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, 0x01,        // TTL (4 bytes) is 20 hours, 47 minutes, 49 seconds.
+    0x24, 0x75,
+    0x00, 0x08,        // RDLENGTH is 8 bytes.
+    0x05, 'h', 'e', 'l', 'l', 'o',
+    0xc0, 0x32
+};
+
+const char kSamplePacket2[] = {
+    // 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, 0x01,        // TTL (4 bytes) is 20 hours, 47 minutes, 48 seconds.
+    0x24, 0x74,
+    0x00, 0x08,        // RDLENGTH is 8 bytes.
+    0x05, 'z', 'z', 'z', 'z', 'z',
+    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, 0x01,        // TTL (4 bytes) is 20 hours, 47 minutes, 48 seconds.
+    0x24, 0x74,
+    0x00, 0x08,        // RDLENGTH is 8 bytes.
+    0x05, 'z', 'z', 'z', 'z', 'z',
+    0xc0, 0x32
+  };
+
+const char kQueryPacketPrivet[] = {
+  // Header
+  0x00, 0x00,               // ID is zeroed out
+  0x01, 0x00,               // RD flag set
+  0x00, 0x01,               // One question.
+  0x00, 0x00,               // 0 RRs (answers)
+  0x00, 0x00,               // 0 authority RRs
+  0x00, 0x00,               // 0 additional RRs
+
+  // Question
+  // This part is echoed back from the respective query.
+  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.
+};
+
+const char kSamplePacketAdditionalOnly[] = {
+    // Header
+    0x00, 0x00,               // ID is zeroed out
+    0x81, 0x80,               // Standard query response, RA, no error
+    0x00, 0x00,               // No questions (for simplicity)
+    0x00, 0x00,               // 2 RRs (answers)
+    0x00, 0x00,               // 0 authority RRs
+    0x00, 0x01,               // 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, 0x01,        // TTL (4 bytes) is 20 hours, 47 minutes, 48 seconds.
+    0x24, 0x74,
+    0x00, 0x08,        // RDLENGTH is 8 bytes.
+    0x05, 'h', 'e', 'l', 'l', 'o',
+    0xc0, 0x0c,
+};
+
+class MockMDnsConnectionFactory;
+
+class MockMDnsConnection : public MDnsConnection {

[szym, 2013/06/10 21:58:29]

I think this could be equivalently built from MDnsConnectionImpl with mock
sockets. It's possible you could accomplish that with existing
MockDatagramServerSocket. Alternatively, a "SimpleMockSocket" would be:

int RecvFrom(buffer, callback) {
  recv_buffer_ = buffer;
  recv_callback_ = callback;
  return ERR_IO_PENDING;
}

int SendTo(buffer, callback) {
  send_buffer_ = buffer;
  send_callback_ = callback;
  return ERR_IO_PENDING;
}

bool SimulateReceive(string data) {
  if(recv_buffer_ == NULL) return false;
  memcpy(recv_buffer_, data);
  recv_buffer_ = NULL;
  recv_callback_.Run(data.size());
  return true;
}

bool ExpectSendData(string data) {
  if (send_buffer_ == NULL) return false;
  if (memcmp(send_buffer_, data)) return false;
  send_buffer_ = NULL;
  send_callback_.Run(data.size());
  return true;
}

Then inject this into MDnsClientImpl using DatagramServerSocketFactory (instead
of MDnsConnectionFactory).

MDnsTest() {
  MDnsTest(): factory_(new MockSocketFactory),
              test_client_(new MDnsClientImpl(factory_)) {}

  MockSocketFactory* factory_;  // owned by test_client_
  scoped_ptr<MDnsClientImpl> test_client_;
};

where

MockSocketFactory : DatagramServerSocketFactory {
  scoped_ptr<DatagramServerSocket> CreateSocket() {
    socket = new MockDatagramServerSocket();
    sockets_.push(socket);
    return new MockDatagramServerSocket();
  }
  bool ExpectSendData(string data) {
    for (socket in sockets_)
      if (!socket->ExpectSendData(data))
        return false;
  }

  vector<DatagramServerSocket*> sockets_; // sockets owned by the caller.
}

This approach would completely avoid the need for the pure virtual
MDnsConnection interface. The price is only a little bit of awkwardness because
you need to go through all the issued sockets by the factory.

======
Why it makes sense? DatagramServerSocket is already an interface which can be
mocked out for testing. There is no need to add yet another interface unless it
significantly simplifies the mocks. I don't think that's the case here.

[Noam Samuel, 2013/06/11 18:31:14]

Should I call the factory interface DatagramServerSocketFactory, or should the
name be more specific? Right now I'm using MDnsDatagramServerSocketFactory as a
placeholder name, but it is a bit unwieldy.

On 2013/06/10 21:58:29, szym wrote:

[Noam Samuel, 2013/06/11 20:35:03]

Done with name MDnsDatagramServerSocketFactory.

On 2013/06/11 18:31:14, Noam Samuel wrote:

+ public:
+  MockMDnsConnection(MDnsConnection::Delegate* delegate,
+                     MockMDnsConnectionFactory* factory)
+      : delegate_(delegate), factory_(factory) {
+  }
+
+  virtual ~MockMDnsConnection() {
+  }
+
+  virtual int Init() OVERRIDE {
+    return OK;
+  }
+
+  virtual int Send(IOBuffer* buffer, unsigned size) OVERRIDE;
+
+  void SimulateRecieve(const char* packet, int size);
+
+ private:
+  DnsResponse response;
+  MDnsConnection::Delegate* delegate_;
+  MockMDnsConnectionFactory* factory_;
+};
+
+class MockMDnsConnectionFactory : public MDnsConnectionFactory {
+ public:
+  MockMDnsConnectionFactory() {}
+  virtual ~MockMDnsConnectionFactory() {}
+  virtual scoped_ptr<MDnsConnection> CreateConnection(
+      MDnsConnection::Delegate* delegate) OVERRIDE;
+
+  MOCK_METHOD1(OnSend, void(std::string packet));
+
+  MockMDnsConnection* latest_connection() { return latest_connection_; }
+
+ private:
+  MockMDnsConnection* latest_connection_;
+};
+
+class MockMDnsConnectionDelegate : public MDnsConnection::Delegate {
+ public:
+  virtual void HandlePacket(DnsResponse* response, int size) {
+    HandlePacketInternal(std::string(response->io_buffer()->data(), size));
+  }
+
+  MOCK_METHOD1(HandlePacketInternal, void(std::string packet));
+
+  MOCK_METHOD1(OnConnectionError, void(int error));
+};
+
+int MockMDnsConnection::Send(IOBuffer* buffer, unsigned size) {
+  factory_->OnSend(std::string(buffer->data(), size));
+  return OK;
+}
+
+void MockMDnsConnection::SimulateRecieve(const char* packet, int size) {
+  memcpy(response.io_buffer()->data(), packet, size);
+  delegate_->HandlePacket(&response, size);
+}
+
+scoped_ptr<MDnsConnection> MockMDnsConnectionFactory::CreateConnection(
+    MDnsConnection::Delegate* delegate) {
+  latest_connection_ = new MockMDnsConnection(delegate, this);
+
+  return scoped_ptr<MDnsConnection>(latest_connection_);
+}
+
+class RecordParsedCopyContainer {

[szym, 2013/06/10 21:58:29]

It seems you could avoid the clone by following the pattern of ExpectPacket,
i.e., store the expectations before the callback is called. (Maybe call it
ExpectedNptrRecord.)

If you prefer this, you should copy only the interesting parts out of the
record: |name| and |ptrdomain| and verify that it is a PTR record. (Maybe call
it NptrRecordContainer.)

[Noam Samuel, 2013/06/11 20:35:03]

Done.

+ public:
+  RecordParsedCopyContainer() {}
+  ~RecordParsedCopyContainer() {}
+
+  bool is_set() const { return value_.get() != NULL; }
+
+  void SaveWithDummyArg(int unused, const RecordParsed* value) {
+    Save(value);
+  }
+
+  void Save(const RecordParsed* value) {
+    value_ = value->Clone();
+  }
+
+  const RecordParsed* operator->() const {
+    return value_.get();
+  }
+
+ private:
+  scoped_ptr<const RecordParsed> value_;
+};
+
+class MDnsTest : public ::testing::Test {
+ public:
+  MDnsTest();
+  virtual ~MDnsTest();
+  void DeleteTransaction();
+  void DeleteBothListeners();
+  void RunUntilIdle();
+  void RunFor(base::TimeDelta time_period);
+  void Stop();
+
+  MOCK_METHOD2(MockableRecordCallback, void(MDnsTransactionResult result,
+                                            const RecordParsed* record));
+
+ protected:
+  void ExpectPacket(const char* packet, unsigned size);
+  void SendPacket(const char* packet, unsigned size);

[szym, 2013/06/10 21:58:29]

This name is a bit misleading. You are simulating a packet arriving on the
socket. Needs a better name and a comment.

[Noam Samuel, 2013/06/11 20:35:03]

Done.

+  void ExpectPtrRecord(

[szym, 2013/06/10 21:58:29]

This name is misleading. Should be ExpectContainsPtrRecord, but bool
ContainsPtrRecord would be better. If you fail within a method, you will need to
rely on stack trace to diagnose the bug. If possible, it's generally better to
return bool and wrap it in EXPECT_TRUE(...).

[Noam Samuel, 2013/06/11 20:35:03]

Done.

+      const std::string& name,
+      const std::string& ptrdomain,
+      const RecordParsedCopyContainer& record);
+
+  base::MessageLoop* message_loop_;
+
+  scoped_ptr<MDnsClientImpl> test_client_;
+  IPEndPoint mdns_ipv4_endpoint_;
+  StrictMock<MockMDnsConnectionFactory> connection_factory_;
+
+  // Transactions and listeners that can be deleted by class methods for
+  // reentrancy tests.
+  scoped_ptr<MDnsTransaction> transaction_;
+  scoped_ptr<MDnsListener> listener1_;
+  scoped_ptr<MDnsListener> listener2_;
+};
+
+class MockListenerDelegate : public MDnsListener::Delegate {
+ public:
+  MOCK_METHOD2(OnRecordUpdate,
+               void(MDnsUpdateType update, const RecordParsed* records));
+  MOCK_METHOD2(OnNsecRecord, void(const std::string&, unsigned));
+  MOCK_METHOD0(OnCachePurged, void());
+};
+
+MDnsTest::MDnsTest()
+    : message_loop_(base::MessageLoop::current()) {
+  test_client_.reset(new MDnsClientImpl(&connection_factory_));
+}
+
+MDnsTest::~MDnsTest() {
+}
+
+void MDnsTest::SendPacket(const char* packet, unsigned size) {
+  connection_factory_.latest_connection()->SimulateRecieve(packet, size);
+}
+
+void MDnsTest::ExpectPtrRecord(
+    const std::string& name,
+    const std::string& ptrdomain,
+    const RecordParsedCopyContainer& record) {
+  EXPECT_TRUE(record.is_set());
+  EXPECT_EQ(name, record->name());
+  EXPECT_EQ(dns_protocol::kTypePTR, record->type());
+  EXPECT_EQ(dns_protocol::kClassIN, record->klass());
+  const PtrRecordRdata* rdata = record->rdata<PtrRecordRdata>();
+  EXPECT_TRUE(rdata != NULL);
+  EXPECT_EQ(ptrdomain, rdata->ptrdomain());
+}
+
+void MDnsTest::ExpectPacket(
+    const char* packet,
+    unsigned size) {
+  EXPECT_CALL(connection_factory_, OnSend(std::string(packet, size)));
+}
+
+void MDnsTest::DeleteTransaction() {
+  transaction_.reset();
+}
+
+void MDnsTest::DeleteBothListeners() {
+  listener1_.reset();
+  listener2_.reset();
+}
+
+void MDnsTest::RunUntilIdle() {
+  base::MessageLoop::current()->RunUntilIdle();
+}
+
+void MDnsTest::RunFor(base::TimeDelta time_period) {
+  base::CancelableCallback<void()> callback(base::Bind(&MDnsTest::Stop,
+                                                       base::Unretained(this)));
+  base::MessageLoop::current()->PostDelayedTask(
+      FROM_HERE, callback.callback(), time_period);
+
+  base::MessageLoop::current()->Run();
+  callback.Cancel();
+}
+
+void MDnsTest::Stop() {
+  base::MessageLoop::current()->Quit();
+}
+
+TEST_F(MDnsTest, PassiveListeners) {
+  StrictMock<MockListenerDelegate> delegate_privet;
+  StrictMock<MockListenerDelegate> delegate_printer;
+  StrictMock<MockListenerDelegate> delegate_ptr;
+
+  RecordParsedCopyContainer record_privet;
+  RecordParsedCopyContainer 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);
+  scoped_ptr<MDnsListener> listener_ptr = test_client_->CreateListener(
+      dns_protocol::kTypePTR, "", &delegate_ptr);
+
+  listener_privet->Start();
+  listener_printer->Start();
+  listener_ptr->Start();
+
+  ASSERT_TRUE(test_client_->IsListeningForTests());
+
+  // Send the same packet twice to ensure no records are double-counted.
+
+  EXPECT_CALL(delegate_privet, OnRecordUpdate(kMDnsRecordAdded, _))
+      .Times(Exactly(1))
+      .WillOnce(Invoke(
+          &record_privet,
+          &RecordParsedCopyContainer::SaveWithDummyArg));
+
+  EXPECT_CALL(delegate_printer, OnRecordUpdate(kMDnsRecordAdded, _))
+      .Times(Exactly(1))
+      .WillOnce(Invoke(
+          &record_printer,
+          &RecordParsedCopyContainer::SaveWithDummyArg));
+
+  EXPECT_CALL(delegate_ptr, OnRecordUpdate(kMDnsRecordAdded, _))
+      .Times(Exactly(2));
+
+  SendPacket(kSamplePacket1, sizeof(kSamplePacket1));
+  SendPacket(kSamplePacket1, sizeof(kSamplePacket1));
+
+  RunUntilIdle();
+
+  ExpectPtrRecord("_privet._tcp.local", "hello._privet._tcp.local",
+                  record_privet);
+
+  ExpectPtrRecord("_printer._tcp.local", "hello._printer._tcp.local",
+                  record_printer);
+
+  listener_privet.reset();
+  listener_printer.reset();
+
+  ASSERT_TRUE(test_client_->IsListeningForTests());
+
+  EXPECT_CALL(delegate_ptr, OnRecordUpdate(kMDnsRecordAdded, _))
+      .Times(Exactly(2));
+
+  SendPacket(kSamplePacket2, sizeof(kSamplePacket2));
+
+  RunUntilIdle();
+
+  // Test to make sure mdns listener is not active with no listeners present.
+  listener_ptr.reset();
+
+  RunUntilIdle();
+
+  ASSERT_FALSE(test_client_->IsListeningForTests());
+}
+
+TEST_F(MDnsTest, PassiveListenersCleanup) {
+  StrictMock<MockListenerDelegate> delegate_privet;
+
+  RecordParsedCopyContainer record_privet;
+  RecordParsedCopyContainer record_privet2;
+
+  scoped_ptr<MDnsListener> listener_privet = test_client_->CreateListener(
+      dns_protocol::kTypePTR, "_privet._tcp.local", &delegate_privet);
+
+  listener_privet->Start();
+
+  ASSERT_TRUE(test_client_->IsListeningForTests());
+
+  EXPECT_CALL(delegate_privet, OnRecordUpdate(kMDnsRecordAdded, _))
+      .Times(Exactly(1))
+      .WillOnce(Invoke(
+          &record_privet,
+          &RecordParsedCopyContainer::SaveWithDummyArg));
+
+  SendPacket(kSamplePacket1, sizeof(kSamplePacket1));
+
+  RunUntilIdle();
+
+  ExpectPtrRecord("_privet._tcp.local", "hello._privet._tcp.local",
+                  record_privet);
+
+  EXPECT_CALL(delegate_privet, OnRecordUpdate(kMDnsRecordRemoved, _))
+      .Times(Exactly(1))
+      .WillOnce(DoAll(InvokeWithoutArgs(this, &MDnsTest::Stop),
+                      Invoke(&record_privet2,
+                             &RecordParsedCopyContainer::SaveWithDummyArg)));
+
+  RunFor(base::TimeDelta::FromSeconds(record_privet->ttl() + 1));
+
+  RunUntilIdle();
+
+  ExpectPtrRecord("_privet._tcp.local", "hello._privet._tcp.local",
+                  record_privet2);
+}
+
+TEST_F(MDnsTest, MalformedPacket) {
+  StrictMock<MockListenerDelegate> delegate_printer;
+
+  RecordParsedCopyContainer record_printer;
+
+  scoped_ptr<MDnsListener> listener_printer = test_client_->CreateListener(
+      dns_protocol::kTypePTR, "_printer._tcp.local", &delegate_printer);
+
+  listener_printer->Start();
+
+  ASSERT_TRUE(test_client_->IsListeningForTests());
+
+  EXPECT_CALL(delegate_printer, OnRecordUpdate(kMDnsRecordAdded, _))
+      .Times(Exactly(1))
+      .WillOnce(Invoke(
+          &record_printer,
+          &RecordParsedCopyContainer::SaveWithDummyArg));
+
+  // First, send unsalvagable packet to ensure we can deal with it.
+  SendPacket(kCorruptedPacketUnsalvagable,
+             sizeof(kCorruptedPacketUnsalvagable));
+
+  // Regression test: send a packet where the question cannot be read.
+  SendPacket(kCorruptedPacketBadQuestion,
+             sizeof(kCorruptedPacketBadQuestion));
+
+  // Then send salvagable packet to ensure we can extract useful records.
+  SendPacket(kCorruptedPacketSalvagable,
+             sizeof(kCorruptedPacketSalvagable));
+
+  RunUntilIdle();
+
+  ExpectPtrRecord("_printer._tcp.local", "hello._printer._tcp.local",
+                  record_printer);
+}
+
+TEST_F(MDnsTest, TransactionNoCache) {
+  ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet));
+
+  scoped_ptr<MDnsTransaction> transaction_privet =
+      test_client_->CreateTransaction(
+          dns_protocol::kTypePTR, "_privet._tcp.local",
+          kMDnsTransactionQueryNetwork |
+          kMDnsTransactionQueryCache |
+          kMDnsTransactionSingleResult,
+          base::Bind(&MDnsTest::MockableRecordCallback,
+                     base::Unretained(this)));
+
+  transaction_privet->Start();
+
+  EXPECT_TRUE(test_client_->IsListeningForTests());
+
+  RecordParsedCopyContainer record_privet;
+
+  EXPECT_CALL(*this, MockableRecordCallback(kMDnsTransactionRecord, _))
+      .Times(Exactly(1))
+      .WillOnce(Invoke(&record_privet,
+                       &RecordParsedCopyContainer::SaveWithDummyArg));
+
+  SendPacket(kSamplePacket1, sizeof(kSamplePacket1));
+
+  RunUntilIdle();
+
+  ExpectPtrRecord("_privet._tcp.local", "hello._privet._tcp.local",
+                  record_privet);
+
+  EXPECT_FALSE(test_client_->IsListeningForTests());
+}
+
+
+TEST_F(MDnsTest, TransactionCacheOnlyNoResult) {
+  scoped_ptr<MDnsTransaction> transaction_privet =
+      test_client_->CreateTransaction(
+          dns_protocol::kTypePTR, "_privet._tcp.local",
+          kMDnsTransactionQueryCache |
+          kMDnsTransactionSingleResult,
+          base::Bind(&MDnsTest::MockableRecordCallback,
+                     base::Unretained(this)));
+
+  EXPECT_CALL(*this, MockableRecordCallback(kMDnsTransactionNoResults, _))
+      .Times(Exactly(1));
+
+  transaction_privet->Start();
+
+  EXPECT_FALSE(test_client_->IsListeningForTests());
+
+  RunUntilIdle();
+}
+
+
+TEST_F(MDnsTest, TransactionWithCache) {
+  // Listener to force the client to listen
+  StrictMock<MockListenerDelegate> delegate_irrelevant;
+  scoped_ptr<MDnsListener> listener_irrelevant = test_client_->CreateListener(
+      dns_protocol::kTypeA, "codereview.chromium.local",
+      &delegate_irrelevant);
+
+  listener_irrelevant->Start();
+
+  EXPECT_TRUE(test_client_->IsListeningForTests());
+
+  SendPacket(kSamplePacket1, sizeof(kSamplePacket1));
+
+  RunUntilIdle();
+
+  RecordParsedCopyContainer record_privet;
+
+  EXPECT_CALL(*this, MockableRecordCallback(kMDnsTransactionRecord, _))
+      .WillOnce(Invoke(&record_privet,
+                       &RecordParsedCopyContainer::SaveWithDummyArg));
+
+  scoped_ptr<MDnsTransaction> transaction_privet =
+      test_client_->CreateTransaction(
+          dns_protocol::kTypePTR, "_privet._tcp.local",
+          kMDnsTransactionQueryNetwork |
+          kMDnsTransactionQueryCache |
+          kMDnsTransactionSingleResult,
+          base::Bind(&MDnsTest::MockableRecordCallback,
+                     base::Unretained(this)));
+
+  transaction_privet->Start();
+
+  RunUntilIdle();
+
+  ExpectPtrRecord("_privet._tcp.local", "hello._privet._tcp.local",
+                  record_privet);
+}
+
+TEST_F(MDnsTest, AdditionalRecords) {
+  StrictMock<MockListenerDelegate> delegate_privet;
+
+  RecordParsedCopyContainer record_privet;
+
+  scoped_ptr<MDnsListener> listener_privet = test_client_->CreateListener(
+      dns_protocol::kTypePTR, "_privet._tcp.local",
+      &delegate_privet);
+
+  listener_privet->Start();
+
+  ASSERT_TRUE(test_client_->IsListeningForTests());
+
+  EXPECT_CALL(delegate_privet, OnRecordUpdate(kMDnsRecordAdded, _))
+      .Times(Exactly(1))
+      .WillOnce(Invoke(
+          &record_privet,
+          &RecordParsedCopyContainer::SaveWithDummyArg));
+
+  SendPacket(kSamplePacketAdditionalOnly, sizeof(kSamplePacket1));
+
+  RunUntilIdle();
+
+  ExpectPtrRecord("_privet._tcp.local", "hello._privet._tcp.local",
+                  record_privet);
+}
+
+TEST_F(MDnsTest, TransactionTimeout) {
+  ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet));
+
+  scoped_ptr<MDnsTransaction> transaction_privet =
+      test_client_->CreateTransaction(
+          dns_protocol::kTypePTR, "_privet._tcp.local",
+          kMDnsTransactionQueryNetwork |
+          kMDnsTransactionQueryCache |
+          kMDnsTransactionSingleResult,
+          base::Bind(&MDnsTest::MockableRecordCallback,
+                     base::Unretained(this)));
+
+  transaction_privet->Start();
+
+  EXPECT_TRUE(test_client_->IsListeningForTests());
+
+  EXPECT_CALL(*this, MockableRecordCallback(kMDnsTransactionNoResults, NULL))
+      .Times(Exactly(1))
+      .WillOnce(InvokeWithoutArgs(this, &MDnsTest::Stop));
+
+  RunFor(base::TimeDelta::FromSeconds(4));
+
+  EXPECT_FALSE(test_client_->IsListeningForTests());
+}
+
+TEST_F(MDnsTest, TransactionMultipleRecords) {
+  ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet));
+
+  scoped_ptr<MDnsTransaction> transaction_privet =
+      test_client_->CreateTransaction(
+          dns_protocol::kTypePTR, "_privet._tcp.local",
+          kMDnsTransactionQueryNetwork |
+          kMDnsTransactionQueryCache ,
+          base::Bind(&MDnsTest::MockableRecordCallback,
+                     base::Unretained(this)));
+
+  transaction_privet->Start();
+
+  EXPECT_TRUE(test_client_->IsListeningForTests());
+
+  RecordParsedCopyContainer record_privet;
+  RecordParsedCopyContainer record_privet2;
+
+  EXPECT_CALL(*this, MockableRecordCallback(kMDnsTransactionRecord, _))
+      .Times(Exactly(2))
+      .WillOnce(Invoke(&record_privet,
+                       &RecordParsedCopyContainer::SaveWithDummyArg))
+      .WillOnce(Invoke(&record_privet2,
+                       &RecordParsedCopyContainer::SaveWithDummyArg));
+
+  SendPacket(kSamplePacket1, sizeof(kSamplePacket1));
+  SendPacket(kSamplePacket2, sizeof(kSamplePacket2));
+
+  RunUntilIdle();
+
+  ExpectPtrRecord("_privet._tcp.local", "hello._privet._tcp.local",
+                  record_privet);
+
+  ExpectPtrRecord("_privet._tcp.local", "zzzzz._privet._tcp.local",
+                  record_privet2);
+
+  EXPECT_CALL(*this, MockableRecordCallback(kMDnsTransactionDone, NULL))
+      .WillOnce(InvokeWithoutArgs(this, &MDnsTest::Stop));
+
+  RunFor(base::TimeDelta::FromSeconds(4));
+
+  EXPECT_FALSE(test_client_->IsListeningForTests());
+}
+
+
+TEST_F(MDnsTest, TransactionReentrantDelete) {
+  ExpectPacket(kQueryPacketPrivet, sizeof(kQueryPacketPrivet));
+
+  transaction_ = test_client_->CreateTransaction(
+      dns_protocol::kTypePTR, "_privet._tcp.local",
+      kMDnsTransactionQueryNetwork |
+      kMDnsTransactionQueryCache |
+      kMDnsTransactionSingleResult,
+      base::Bind(&MDnsTest::MockableRecordCallback,
+                 base::Unretained(this)));
+
+  transaction_->Start();
+
+  EXPECT_TRUE(test_client_->IsListeningForTests());
+
+  EXPECT_CALL(*this, MockableRecordCallback(kMDnsTransactionNoResults, NULL))
+      .Times(Exactly(1))
+      .WillOnce(DoAll(InvokeWithoutArgs(this, &MDnsTest::DeleteTransaction),
+                      InvokeWithoutArgs(this, &MDnsTest::Stop)));
+
+
+  RunFor(base::TimeDelta::FromSeconds(4));
+
+  EXPECT_EQ(NULL, transaction_.get());
+
+  EXPECT_FALSE(test_client_->IsListeningForTests());
+}
+
+
+TEST_F(MDnsTest, TransactionReentrantDeleteFromCache) {
+  StrictMock<MockListenerDelegate> delegate_irrelevant;
+  scoped_ptr<MDnsListener> listener_irrelevant = test_client_->CreateListener(
+      dns_protocol::kTypeA, "codereview.chromium.local",
+      &delegate_irrelevant);
+  listener_irrelevant->Start();
+
+  ASSERT_TRUE(test_client_->IsListeningForTests());
+
+  SendPacket(kSamplePacket1, sizeof(kSamplePacket1));
+
+  transaction_ = test_client_->CreateTransaction(
+      dns_protocol::kTypePTR, "_privet._tcp.local",
+      kMDnsTransactionQueryNetwork |
+      kMDnsTransactionQueryCache,
+      base::Bind(&MDnsTest::MockableRecordCallback,
+                 base::Unretained(this)));
+
+
+  EXPECT_CALL(*this, MockableRecordCallback(kMDnsTransactionRecord, _))
+      .Times(Exactly(1))
+      .WillOnce(InvokeWithoutArgs(this, &MDnsTest::DeleteTransaction));
+
+  transaction_->Start();
+
+
+  RunUntilIdle();
+
+  EXPECT_EQ(NULL, transaction_.get());
+}
+
+
+// In order to reliably test reentrant listener deletes, we create two listeners
+// and have each of them delete both, so we're guaranteed to try and deliver a
+// callback to at least one deleted listener.
+
+TEST_F(MDnsTest, ListenerReentrantDelete) {
+  StrictMock<MockListenerDelegate> delegate_privet;
+
+  listener1_ = test_client_->CreateListener(
+      dns_protocol::kTypePTR, "_privet._tcp.local",
+      &delegate_privet);
+
+  listener2_ = test_client_->CreateListener(
+      dns_protocol::kTypePTR, "_privet._tcp.local",
+      &delegate_privet);
+
+  listener1_->Start();
+
+  listener2_->Start();
+
+  EXPECT_CALL(delegate_privet, OnRecordUpdate(kMDnsRecordAdded, _))
+      .Times(Exactly(1))
+      .WillOnce(InvokeWithoutArgs(this, &MDnsTest::DeleteBothListeners));
+
+  EXPECT_TRUE(test_client_->IsListeningForTests());
+
+  SendPacket(kSamplePacket1, sizeof(kSamplePacket1));
+
+  RunUntilIdle();
+
+  EXPECT_EQ(NULL, listener1_.get());
+  EXPECT_EQ(NULL, listener2_.get());
+
+  EXPECT_FALSE(test_client_->IsListeningForTests());
+}
+
+class MockDatagramServerSocket : public DatagramServerSocket {
+ public:
+  int Listen(const IPEndPoint& address) {
+    return ListenInternal(address.ToString());
+  }
+
+  MOCK_METHOD1(ListenInternal, int(const std::string& address));
+
+  void SetResponsePacket(std::string response_packet) {
+    response_packet_ = response_packet;
+  }
+
+  int RespondImmediately(IOBuffer* buffer, int size, IPEndPoint* address,
+                         const CompletionCallback& callback) {
+    int to_copy = std::min(response_packet_.size(), (unsigned long)size);
+    memcpy(buffer->data(), response_packet_.data(), to_copy);
+    return to_copy;
+  }
+
+  int RespondDelayed(IOBuffer* buffer, int size, IPEndPoint* address,
+                     const CompletionCallback& callback) {
+    int rv = RespondImmediately(buffer, size, address, callback);
+    MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, rv));
+    return ERR_IO_PENDING;
+  }
+
+  MOCK_METHOD4(RecvFrom, int(IOBuffer* buffer, int size,
+                             IPEndPoint* address,
+                             const CompletionCallback& callback));
+
+  int SendTo(IOBuffer* buf, int buf_len, const IPEndPoint& address,
+             const CompletionCallback& callback) {
+    return SendToInternal(std::string(buf->data(), buf_len), address.ToString(),
+                          callback);
+  }
+
+  MOCK_METHOD3(SendToInternal, int(const std::string&, const std::string,
+                                   const CompletionCallback&));
+
+  MOCK_METHOD1(SetReceiveBufferSize, bool(int32 size));
+  MOCK_METHOD1(SetSendBufferSize, bool(int32 size));
+
+  MOCK_METHOD0(Close, void());
+
+  MOCK_CONST_METHOD1(GetPeerAddress, int(IPEndPoint* address));
+  MOCK_CONST_METHOD1(GetLocalAddress, int(IPEndPoint* address));
+  MOCK_CONST_METHOD0(NetLog, const BoundNetLog&());
+
+  MOCK_METHOD0(AllowAddressReuse, void());
+  MOCK_METHOD0(AllowBroadcast, void());
+
+  int JoinGroup(const IPAddressNumber& group_address) const {
+    return JoinGroupInternal(IPAddressToString(group_address));
+  }
+
+  MOCK_CONST_METHOD1(JoinGroupInternal, int(const std::string& group));
+
+  int LeaveGroup(const IPAddressNumber& group_address) const {
+    return JoinGroupInternal(IPAddressToString(group_address));

[szym, 2013/06/10 21:58:29]

Shouldn't this be LeaveGroupInternal?

[Noam Samuel, 2013/06/11 20:35:03]

Done.

+  }
+
+  MOCK_CONST_METHOD1(LeaveGroupInternal, int(const std::string& group));
+
+  MOCK_METHOD1(SetMulticastTimeToLive, int(int ttl));
+
+  MOCK_METHOD1(SetMulticastLoopbackMode, int(bool loopback));
+
+ private:
+  std::string response_packet_;
+};
+
+class MDnsConnectionTest : public ::testing::Test {
+ public:
+  MDnsConnectionTest() : connection_(&socket_ipv4_, &socket_ipv6_, &delegate_) {
+  }
+
+ protected:
+  // Follow successful connection initialization
+  void InitConnection() {
+    EXPECT_CALL(socket_ipv4_, AllowAddressReuse());
+    EXPECT_CALL(socket_ipv6_, AllowAddressReuse());
+
+    EXPECT_CALL(socket_ipv4_, SetMulticastLoopbackMode(false));
+    EXPECT_CALL(socket_ipv6_, SetMulticastLoopbackMode(false));
+
+    EXPECT_CALL(socket_ipv4_, ListenInternal("0.0.0.0:5353"))
+        .WillOnce(Return(OK));
+    EXPECT_CALL(socket_ipv6_, ListenInternal("[::]:5353"))
+        .WillOnce(Return(OK));
+
+    EXPECT_CALL(socket_ipv4_, JoinGroupInternal("224.0.0.251"))
+        .WillOnce(Return(OK));
+    EXPECT_CALL(socket_ipv6_, JoinGroupInternal("ff02::fb"))
+        .WillOnce(Return(OK));
+
+    connection_.Init();
+  }
+
+  StrictMock<MockMDnsConnectionDelegate> delegate_;
+
+  MockDatagramServerSocket socket_ipv4_;
+  MockDatagramServerSocket socket_ipv6_;
+  MDnsConnectionImpl connection_;
+  TestCompletionCallback callback_;
+};
+
+TEST_F(MDnsConnectionTest, RecieveSynchronous) {

[szym, 2013/06/10 21:58:29]

nit: Receive

[Noam Samuel, 2013/06/11 20:35:03]

Done.

+  std::string sample_packet =
+      std::string(kSamplePacket1, sizeof(kSamplePacket1));
+  socket_ipv6_.SetResponsePacket(sample_packet);
+  EXPECT_CALL(socket_ipv4_, RecvFrom(_, _, _, _))
+      .WillOnce(Return(ERR_IO_PENDING));
+  EXPECT_CALL(socket_ipv6_, RecvFrom(_, _, _, _))
+      .WillOnce(
+          Invoke(&socket_ipv6_, &MockDatagramServerSocket::RespondImmediately))
+      .WillOnce(Return(ERR_IO_PENDING));
+
+  EXPECT_CALL(delegate_, HandlePacketInternal(sample_packet));
+
+  InitConnection();
+}
+
+TEST_F(MDnsConnectionTest, RecieveAsynchronous) {
+  std::string sample_packet =
+      std::string(kSamplePacket1, sizeof(kSamplePacket1));
+  socket_ipv6_.SetResponsePacket(sample_packet);
+  EXPECT_CALL(socket_ipv4_, RecvFrom(_, _, _, _))
+      .WillOnce(Return(ERR_IO_PENDING));
+  EXPECT_CALL(socket_ipv6_, RecvFrom(_, _, _, _))
+      .WillOnce(
+          Invoke(&socket_ipv6_, &MockDatagramServerSocket::RespondDelayed))
+      .WillOnce(Return(ERR_IO_PENDING));
+
+  InitConnection();
+
+  EXPECT_CALL(delegate_, HandlePacketInternal(sample_packet));
+
+  base::MessageLoop::current()->RunUntilIdle();
+}
+
+TEST_F(MDnsConnectionTest, Send) {
+  std::string sample_packet =
+      std::string(kSamplePacket1, sizeof(kSamplePacket1));
+
+  scoped_refptr<IOBufferWithSize> buf(
+      new IOBufferWithSize(sizeof kSamplePacket1));
+  memcpy(buf->data(), kSamplePacket1, sizeof(kSamplePacket1));
+
+  EXPECT_CALL(socket_ipv4_, RecvFrom(_, _, _, _))
+      .WillOnce(Return(ERR_IO_PENDING));
+  EXPECT_CALL(socket_ipv6_, RecvFrom(_, _, _, _))
+      .WillOnce(Return(ERR_IO_PENDING));
+
+  InitConnection();
+
+  EXPECT_CALL(socket_ipv4_,
+              SendToInternal(sample_packet, "224.0.0.251:5353", _));
+  EXPECT_CALL(socket_ipv6_,
+              SendToInternal(sample_packet, "[ff02::fb]:5353", _));
+
+  connection_.Send(buf, buf->size());
+}
+
+TEST_F(MDnsConnectionTest, Error) {
+  CompletionCallback callback;
+
+  EXPECT_CALL(socket_ipv4_, RecvFrom(_, _, _, _))
+      .WillOnce(Return(ERR_IO_PENDING));
+  EXPECT_CALL(socket_ipv6_, RecvFrom(_, _, _, _))
+      .WillOnce(DoAll(SaveArg<3>(&callback),  Return(ERR_IO_PENDING)));
+
+  InitConnection();
+
+  EXPECT_CALL(delegate_, OnConnectionError(ERR_SOCKET_NOT_CONNECTED));
+  callback.Run(ERR_SOCKET_NOT_CONNECTED);
+}
+
+}  // namespace
+
+}  // namespace net