Give two ClampBufferSize functions distinct names
In some jumbo build configurations, two ClampBufferSize functions in services/network ended up in the same translation unit which caused compilation errors. Cq-Include-Trybots: luci.chromium.try:linux_mojo Change-Id: I6b7ea9c226b114a10d59fa9891e67f83537c5ec6 Reviewed-on: https://chromium-review.googlesource.com/1238219 Reviewed-by: Matt Menke <mmenke@chromium.org> Commit-Queue: Daniel Bratell <bratell@opera.com> Cr-Commit-Position: refs/heads/master@{#593215}
This commit is contained in:

committed by
Commit Bot

parent
2d2d28fc02
commit
b43f546a93
services/network
@ -20,7 +20,7 @@ namespace network {
|
||||
|
||||
namespace {
|
||||
|
||||
int ClampBufferSize(int requested_buffer_size) {
|
||||
int ClampTCPBufferSize(int requested_buffer_size) {
|
||||
return base::ClampToRange(requested_buffer_size, 0,
|
||||
TCPConnectedSocket::kMaxBufferSize);
|
||||
}
|
||||
@ -32,7 +32,7 @@ int ConfigureSocket(
|
||||
net::TransportClientSocket* socket,
|
||||
const mojom::TCPConnectedSocketOptions& tcp_connected_socket_options) {
|
||||
int send_buffer_size =
|
||||
ClampBufferSize(tcp_connected_socket_options.send_buffer_size);
|
||||
ClampTCPBufferSize(tcp_connected_socket_options.send_buffer_size);
|
||||
if (send_buffer_size > 0) {
|
||||
int result = socket->SetSendBufferSize(send_buffer_size);
|
||||
DCHECK_NE(net::ERR_IO_PENDING, result);
|
||||
@ -41,7 +41,7 @@ int ConfigureSocket(
|
||||
}
|
||||
|
||||
int receive_buffer_size =
|
||||
ClampBufferSize(tcp_connected_socket_options.receive_buffer_size);
|
||||
ClampTCPBufferSize(tcp_connected_socket_options.receive_buffer_size);
|
||||
if (receive_buffer_size > 0) {
|
||||
int result = socket->SetReceiveBufferSize(receive_buffer_size);
|
||||
DCHECK_NE(net::ERR_IO_PENDING, result);
|
||||
@ -168,7 +168,7 @@ void TCPConnectedSocket::SetSendBufferSize(int send_buffer_size,
|
||||
std::move(callback).Run(net::ERR_UNEXPECTED);
|
||||
return;
|
||||
}
|
||||
int result = socket_->SetSendBufferSize(ClampBufferSize(send_buffer_size));
|
||||
int result = socket_->SetSendBufferSize(ClampTCPBufferSize(send_buffer_size));
|
||||
std::move(callback).Run(result);
|
||||
}
|
||||
|
||||
@ -180,7 +180,8 @@ void TCPConnectedSocket::SetReceiveBufferSize(
|
||||
std::move(callback).Run(net::ERR_UNEXPECTED);
|
||||
return;
|
||||
}
|
||||
int result = socket_->SetReceiveBufferSize(ClampBufferSize(send_buffer_size));
|
||||
int result =
|
||||
socket_->SetReceiveBufferSize(ClampTCPBufferSize(send_buffer_size));
|
||||
std::move(callback).Run(result);
|
||||
}
|
||||
|
||||
|
@ -26,7 +26,7 @@ const uint32_t kMaxReadSize = 64 * 1024;
|
||||
// IPv6.
|
||||
const uint32_t kMaxPacketSize = kMaxReadSize - 1;
|
||||
|
||||
int ClampBufferSize(int requested_buffer_size) {
|
||||
int ClampUDPBufferSize(int requested_buffer_size) {
|
||||
constexpr int kMinBufferSize = 0;
|
||||
constexpr int kMaxBufferSize = 128 * 1024;
|
||||
return base::ClampToRange(requested_buffer_size, kMinBufferSize,
|
||||
@ -83,10 +83,11 @@ class SocketWrapperImpl : public UDPSocket::SocketWrapper {
|
||||
return socket_.SetBroadcast(broadcast);
|
||||
}
|
||||
int SetSendBufferSize(int send_buffer_size) override {
|
||||
return socket_.SetSendBufferSize(ClampBufferSize(send_buffer_size));
|
||||
return socket_.SetSendBufferSize(ClampUDPBufferSize(send_buffer_size));
|
||||
}
|
||||
int SetReceiveBufferSize(int receive_buffer_size) override {
|
||||
return socket_.SetReceiveBufferSize(ClampBufferSize(receive_buffer_size));
|
||||
return socket_.SetReceiveBufferSize(
|
||||
ClampUDPBufferSize(receive_buffer_size));
|
||||
}
|
||||
int JoinGroup(const net::IPAddress& group_address) override {
|
||||
return socket_.JoinGroup(group_address);
|
||||
@ -129,11 +130,11 @@ class SocketWrapperImpl : public UDPSocket::SocketWrapper {
|
||||
}
|
||||
if (result == net::OK && options->receive_buffer_size != 0) {
|
||||
result = socket_.SetReceiveBufferSize(
|
||||
ClampBufferSize(options->receive_buffer_size));
|
||||
ClampUDPBufferSize(options->receive_buffer_size));
|
||||
}
|
||||
if (result == net::OK && options->send_buffer_size != 0) {
|
||||
result =
|
||||
socket_.SetSendBufferSize(ClampBufferSize(options->send_buffer_size));
|
||||
result = socket_.SetSendBufferSize(
|
||||
ClampUDPBufferSize(options->send_buffer_size));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
Reference in New Issue
Block a user