diff options
Diffstat (limited to 'chromium/net/tools')
13 files changed, 38 insertions, 28 deletions
diff --git a/chromium/net/tools/cert_verify_tool/cert_verify_tool_util.cc b/chromium/net/tools/cert_verify_tool/cert_verify_tool_util.cc index 95aa01c6e5a..f2b09c1551f 100644 --- a/chromium/net/tools/cert_verify_tool/cert_verify_tool_util.cc +++ b/chromium/net/tools/cert_verify_tool/cert_verify_tool_util.cc @@ -7,6 +7,7 @@ #include <iostream> #include "base/files/file_util.h" +#include "base/logging.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "net/cert/pem.h" diff --git a/chromium/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc b/chromium/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc index cd3f9a39d29..7abb217e250 100644 --- a/chromium/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc +++ b/chromium/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc @@ -14,6 +14,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/json/json_reader.h" +#include "base/logging.h" #include "base/time/time.h" #include "base/values.h" #include "net/base/address_list.h" diff --git a/chromium/net/tools/epoll_server/platform/impl/epoll_logging_impl.h b/chromium/net/tools/epoll_server/platform/impl/epoll_logging_impl.h index 9f9b8ab05b6..9487e1d2cbd 100644 --- a/chromium/net/tools/epoll_server/platform/impl/epoll_logging_impl.h +++ b/chromium/net/tools/epoll_server/platform/impl/epoll_logging_impl.h @@ -5,7 +5,9 @@ #ifndef NET_TOOLS_EPOLL_SERVER_PLATFORM_IMPL_EPOLL_LOGGING_IMPL_H_ #define NET_TOOLS_EPOLL_SERVER_PLATFORM_IMPL_EPOLL_LOGGING_IMPL_H_ +#include "base/check_op.h" #include "base/logging.h" +#include "base/notreached.h" #define EPOLL_CHROMIUM_LOG_INFO VLOG(1) #define EPOLL_CHROMIUM_LOG_WARNING DLOG(WARNING) diff --git a/chromium/net/tools/quic/quic_http_proxy_backend.h b/chromium/net/tools/quic/quic_http_proxy_backend.h index 0852d70a557..32d9d6bb4bf 100644 --- a/chromium/net/tools/quic/quic_http_proxy_backend.h +++ b/chromium/net/tools/quic/quic_http_proxy_backend.h @@ -26,7 +26,6 @@ #include "base/base64.h" #include "base/callback.h" -#include "base/logging.h" #include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread.h" diff --git a/chromium/net/tools/quic/quic_http_proxy_backend_stream.h b/chromium/net/tools/quic/quic_http_proxy_backend_stream.h index 6d87391eb8a..80f8e2bc9a5 100644 --- a/chromium/net/tools/quic/quic_http_proxy_backend_stream.h +++ b/chromium/net/tools/quic/quic_http_proxy_backend_stream.h @@ -24,7 +24,6 @@ #include "base/bind.h" #include "base/callback.h" #include "base/location.h" -#include "base/logging.h" #include "base/macros.h" #include "net/base/request_priority.h" #include "net/base/upload_data_stream.h" diff --git a/chromium/net/tools/quic/quic_simple_client.cc b/chromium/net/tools/quic/quic_simple_client.cc index 5d8bf33b2a1..25fcab0a909 100644 --- a/chromium/net/tools/quic/quic_simple_client.cc +++ b/chromium/net/tools/quic/quic_simple_client.cc @@ -37,11 +37,12 @@ QuicSimpleClient::QuicSimpleClient( quic::QuicSocketAddress server_address, const quic::QuicServerId& server_id, const quic::ParsedQuicVersionVector& supported_versions, + const quic::QuicConfig& config, std::unique_ptr<quic::ProofVerifier> proof_verifier) : quic::QuicSpdyClientBase( server_id, supported_versions, - quic::QuicConfig(), + config, CreateQuicConnectionHelper(), CreateQuicAlarmFactory(), quic::QuicWrapUnique( diff --git a/chromium/net/tools/quic/quic_simple_client.h b/chromium/net/tools/quic/quic_simple_client.h index c791adefd75..3ac2841a68d 100644 --- a/chromium/net/tools/quic/quic_simple_client.h +++ b/chromium/net/tools/quic/quic_simple_client.h @@ -41,6 +41,7 @@ class QuicSimpleClient : public quic::QuicSpdyClientBase { QuicSimpleClient(quic::QuicSocketAddress server_address, const quic::QuicServerId& server_id, const quic::ParsedQuicVersionVector& supported_versions, + const quic::QuicConfig& config, std::unique_ptr<quic::ProofVerifier> proof_verifier); ~QuicSimpleClient() override; diff --git a/chromium/net/tools/quic/quic_simple_client_bin.cc b/chromium/net/tools/quic/quic_simple_client_bin.cc index dae728bc0a0..1de449b8af6 100644 --- a/chromium/net/tools/quic/quic_simple_client_bin.cc +++ b/chromium/net/tools/quic/quic_simple_client_bin.cc @@ -61,6 +61,7 @@ class QuicSimpleClientFactory : public quic::QuicToyClient::ClientFactory { std::string host_for_lookup, uint16_t port, quic::ParsedQuicVersionVector versions, + const quic::QuicConfig& config, std::unique_ptr<quic::ProofVerifier> verifier) override { net::AddressList addresses; int rv = net::SynchronousHostResolver::Resolve(host_for_lookup, &addresses); @@ -85,7 +86,7 @@ class QuicSimpleClientFactory : public quic::QuicToyClient::ClientFactory { quic::QuicServerId server_id(host_for_handshake, port, false); return std::make_unique<net::QuicSimpleClient>( - quic::QuicSocketAddress(ip_addr, port), server_id, versions, + quic::QuicSocketAddress(ip_addr, port), server_id, versions, config, std::move(verifier)); } }; diff --git a/chromium/net/tools/quic/quic_simple_client_test.cc b/chromium/net/tools/quic/quic_simple_client_test.cc index a36102e5ad9..b522460bcd3 100644 --- a/chromium/net/tools/quic/quic_simple_client_test.cc +++ b/chromium/net/tools/quic/quic_simple_client_test.cc @@ -19,7 +19,7 @@ TEST(QuicSimpleClientTest, Initialize) { quic::QuicServerId server_id("hostname", server_address.port(), false); quic::ParsedQuicVersionVector versions = quic::AllSupportedVersions(); QuicSimpleClient client( - server_address, server_id, versions, + server_address, server_id, versions, quic::QuicConfig(), quic::test::crypto_test_utils::ProofVerifierForTesting()); EXPECT_TRUE(client.Initialize()); } diff --git a/chromium/net/tools/quic/quic_simple_server.cc b/chromium/net/tools/quic/quic_simple_server.cc index 9c397b57c98..01c3e63a084 100644 --- a/chromium/net/tools/quic/quic_simple_server.cc +++ b/chromium/net/tools/quic/quic_simple_server.cc @@ -125,6 +125,7 @@ bool QuicSimpleServer::Listen(const IPEndPoint& address) { } void QuicSimpleServer::Shutdown() { + LOG(WARNING) << "QuicSimpleServer is shutting down"; // Before we shut down the epoll server, give all active sessions a chance to // notify clients that they're closing. dispatcher_->Shutdown(); @@ -177,20 +178,24 @@ void QuicSimpleServer::StartReading() { void QuicSimpleServer::OnReadComplete(int result) { read_pending_ = false; - if (result == 0) - result = ERR_CONNECTION_CLOSED; - if (result < 0) { + if (result > 0) { + quic::QuicReceivedPacket packet(read_buffer_->data(), result, + helper_->GetClock()->Now(), false); + dispatcher_->ProcessPacket(ToQuicSocketAddress(server_address_), + ToQuicSocketAddress(client_address_), packet); + } else { LOG(ERROR) << "QuicSimpleServer read failed: " << ErrorToString(result); - Shutdown(); - return; + // Do not act on ERR_MSG_TOO_BIG as that indicates that we received a UDP + // packet whose payload is larger than our receive buffer. Do not act on 0 + // as that indicates that we received a UDP packet with an empty payload. + // In both cases, the socket should still be usable. + if (result != ERR_MSG_TOO_BIG && result != 0) { + Shutdown(); + return; + } } - quic::QuicReceivedPacket packet(read_buffer_->data(), result, - helper_->GetClock()->Now(), false); - dispatcher_->ProcessPacket(ToQuicSocketAddress(server_address_), - ToQuicSocketAddress(client_address_), packet); - StartReading(); } diff --git a/chromium/net/tools/quic/quic_simple_server_packet_writer.cc b/chromium/net/tools/quic/quic_simple_server_packet_writer.cc index b4599eba584..5978b7922a8 100644 --- a/chromium/net/tools/quic/quic_simple_server_packet_writer.cc +++ b/chromium/net/tools/quic/quic_simple_server_packet_writer.cc @@ -88,10 +88,10 @@ bool QuicSimpleServerPacketWriter::IsBatchMode() const { return false; } -char* QuicSimpleServerPacketWriter::GetNextWriteLocation( +quic::QuicPacketBuffer QuicSimpleServerPacketWriter::GetNextWriteLocation( const quic::QuicIpAddress& self_address, const quic::QuicSocketAddress& peer_address) { - return nullptr; + return {nullptr, nullptr}; } quic::WriteResult QuicSimpleServerPacketWriter::Flush() { diff --git a/chromium/net/tools/quic/quic_simple_server_packet_writer.h b/chromium/net/tools/quic/quic_simple_server_packet_writer.h index 76f8b8e82f9..c8ba2227ba5 100644 --- a/chromium/net/tools/quic/quic_simple_server_packet_writer.h +++ b/chromium/net/tools/quic/quic_simple_server_packet_writer.h @@ -50,7 +50,7 @@ class QuicSimpleServerPacketWriter : public quic::QuicPacketWriter { const quic::QuicSocketAddress& peer_address) const override; bool SupportsReleaseTime() const override; bool IsBatchMode() const override; - char* GetNextWriteLocation( + quic::QuicPacketBuffer GetNextWriteLocation( const quic::QuicIpAddress& self_address, const quic::QuicSocketAddress& peer_address) override; quic::WriteResult Flush() override; diff --git a/chromium/net/tools/testserver/testserver_base.py b/chromium/net/tools/testserver/testserver_base.py index 7be34a3fac3..25cb7af9e8a 100644 --- a/chromium/net/tools/testserver/testserver_base.py +++ b/chromium/net/tools/testserver/testserver_base.py @@ -2,14 +2,14 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import BaseHTTPServer +from six.moves import BaseHTTPServer import errno import json import optparse import os import re import socket -import SocketServer +from six.moves import socketserver as SocketServer import struct import sys import warnings @@ -74,7 +74,7 @@ class BrokenPipeHandlerMixIn: def handle_error(self, request, client_address): value = sys.exc_info()[1] if isinstance(value, tlslite.errors.TLSClosedConnectionError): - print "testserver.py: Closed connection" + print("testserver.py: Closed connection") return if isinstance(value, socket.error): err = value.args[0] @@ -84,10 +84,10 @@ class BrokenPipeHandlerMixIn: else: pipe_err = errno.EPIPE if err == pipe_err: - print "testserver.py: Broken pipe" + print("testserver.py: Broken pipe") return if err == errno.ECONNRESET: - print "testserver.py: Connection reset by peer" + print("testserver.py: Connection reset by peer") return SocketServer.BaseServer.handle_error(self, request, client_address) @@ -219,7 +219,7 @@ class TestServerRunner(object): try: self.server.serve_forever() except KeyboardInterrupt: - print 'shutting down server' + print('shutting down server') self.server.stop = True def add_options(self): @@ -256,15 +256,15 @@ class TestServerRunner(object): # Notify the parent that we've started. (BaseServer subclasses # bind their sockets on construction.) if self.options.startup_pipe is not None: - server_data_json = json.dumps(server_data) + server_data_json = json.dumps(server_data).encode() server_data_len = len(server_data_json) - print 'sending server_data: %s (%d bytes)' % ( - server_data_json, server_data_len) + print('sending server_data: %s (%d bytes)' % + (server_data_json, server_data_len)) if sys.platform == 'win32': fd = msvcrt.open_osfhandle(self.options.startup_pipe, 0) else: fd = self.options.startup_pipe - startup_pipe = os.fdopen(fd, "w") + startup_pipe = os.fdopen(fd, "wb") # First write the data length as an unsigned 4-byte value. This # is _not_ using network byte ordering since the other end of the # pipe is on the same machine. |