| 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..1dfeb56334d77255f5d562989edce79be868f87e 100644
|
| --- a/net/quic/quic_server_packet_writer.cc
|
| +++ b/net/quic/quic_server_packet_writer.cc
|
| @@ -6,15 +6,14 @@
|
|
|
| #include "base/location.h"
|
| #include "base/logging.h"
|
| +#include "base/message_loop/message_loop.h"
|
| #include "base/metrics/sparse_histogram.h"
|
| #include "net/base/io_buffer.h"
|
| #include "net/base/net_errors.h"
|
| +#include "net/quic/crypto/quic_random.h"
|
|
|
| namespace net {
|
|
|
| -QuicServerPacketWriter::QuicServerPacketWriter() : weak_factory_(this) {
|
| -}
|
| -
|
| QuicServerPacketWriter::QuicServerPacketWriter(UDPServerSocket* socket)
|
| : weak_factory_(this),
|
| socket_(socket),
|
| @@ -26,8 +25,9 @@ QuicServerPacketWriter::~QuicServerPacketWriter() {
|
|
|
| WriteResult QuicServerPacketWriter::WritePacket(
|
| const char* buffer, size_t buf_len,
|
| - const net::IPAddressNumber& self_address,
|
| - const net::IPEndPoint& peer_address) {
|
| + const IPAddressNumber& self_address,
|
| + const IPEndPoint& peer_address,
|
| + base::Callback<void(WriteResult wr)> callback) {
|
| scoped_refptr<StringIOBuffer> buf(
|
| new StringIOBuffer(std::string(buffer, buf_len)));
|
| DCHECK(!IsWriteBlocked());
|
| @@ -44,9 +44,9 @@ WriteResult QuicServerPacketWriter::WritePacket(
|
| } else {
|
| status = WRITE_STATUS_BLOCKED;
|
| write_blocked_ = true;
|
| + callback_ = callback;
|
| }
|
| }
|
| -
|
| return WriteResult(status, rv);
|
| }
|
|
|
| @@ -67,8 +67,10 @@ 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();
|
| + if (!callback_.is_null()) {
|
| + callback_.Run(result);
|
| + }
|
| + blocked_writer_->OnCanWrite();
|
| }
|
|
|
| } // namespace net
|
|
|