Port QuicServer to Chrome network stack

net/quic/quic_server_packet_writer.cc

Index: net/quic/quic_server_packet_writer.cc
diff --git a/net/quic/quic_server_packet_writer.cc b/net/quic/quic_server_packet_writer.cc
index c2635b699eb3efd06713015d8ba6fcd1a2d93a4e..27d5bdd0621e7264b9d2f6624cf087ea7b759816 100644
--- a/net/quic/quic_server_packet_writer.cc
+++ b/net/quic/quic_server_packet_writer.cc
@@ -4,20 +4,22 @@
 
 #include "net/quic/quic_server_packet_writer.h"
 
+#include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/sparse_histogram.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
+#include "net/udp/udp_server_socket.h"
 
 namespace net {
 
-QuicServerPacketWriter::QuicServerPacketWriter() : weak_factory_(this) {
-}
-
-QuicServerPacketWriter::QuicServerPacketWriter(UDPServerSocket* socket)
+QuicServerPacketWriter::QuicServerPacketWriter(
+    UDPServerSocket* socket,
+    QuicBlockedWriterInterface* blocked_writer)
     : weak_factory_(this),
       socket_(socket),
+      blocked_writer_(blocked_writer),
       write_blocked_(false) {
 }
 
@@ -25,12 +27,14 @@ QuicServerPacketWriter::~QuicServerPacketWriter() {
 }
 
 WriteResult QuicServerPacketWriter::WritePacket(
-    const char* buffer, size_t buf_len,
-    const net::IPAddressNumber& self_address,
-    const net::IPEndPoint& peer_address) {
+    const char* buffer,
+    size_t buf_len,
+    const IPAddressNumber& self_address,
+    const IPEndPoint& peer_address) {
   scoped_refptr<StringIOBuffer> buf(
       new StringIOBuffer(std::string(buffer, buf_len)));
   DCHECK(!IsWriteBlocked());
+  DCHECK(!callback_.is_null());
   int rv = socket_->SendTo(buf.get(),
                            buf_len,
                            peer_address,
@@ -46,10 +50,24 @@ WriteResult QuicServerPacketWriter::WritePacket(
       write_blocked_ = true;
     }
   }
-
   return WriteResult(status, rv);
 }
 
+WriteResult QuicServerPacketWriter::WritePacketWithCallback(
+    const char* buffer,
+    size_t buf_len,
+    const IPAddressNumber& self_address,
+    const IPEndPoint& peer_address,
+    WriteCallback callback) {
+  DCHECK(callback_.is_null());
+  callback_ = callback;
+  WriteResult result = WritePacket(buffer, buf_len, self_address, peer_address);
+  if (result.status != WRITE_STATUS_BLOCKED) {
+    callback_.Reset();
+  }

[wtc, 2014/06/23 23:12:16]

If it is safe to do so, it is cheaper to do this:

  DCHECK(callback_.is_null());
  WriteResult result = WritePacket(buffer, buf_len, self_address, peer_address);
  if (result.status == WRITE_STATUS_BLOCKED) {
    callback_ = callback;
  }
  return result;

[dmziegler, 2014/06/24 00:08:53]

I wanted to use the DCHECK(!callback_.is_null()) in WritePacket to make sure
WritePacket is not called on its own.

+  return result;
+}
+
 bool QuicServerPacketWriter::IsWriteBlockedDataBuffered() const {
   // UDPServerSocket::SendTo buffers the data until the Write is permitted.
   return true;
@@ -67,8 +85,8 @@ void QuicServerPacketWriter::OnWriteComplete(int rv) {
   DCHECK_NE(rv, ERR_IO_PENDING);
   write_blocked_ = false;
   WriteResult result(rv < 0 ? WRITE_STATUS_ERROR : WRITE_STATUS_OK, rv);
-  connection_->OnPacketSent(result);
-  connection_->OnCanWrite();
+  base::ResetAndReturn(&callback_).Run(result);
+  blocked_writer_->OnCanWrite();
 }
 
 }  // namespace net