Always use bind-to-zero for port selection in QUIC tests.
It's more portable and less prone to race conditions.
PiperOrigin-RevId: 340541784
Change-Id: I63c85382eb0067b8d52da02369e16f97b3920015
diff --git a/quic/platform/api/quic_port_utils.h b/quic/platform/api/quic_port_utils.h
index 685be0a..b1ddf6e 100644
--- a/quic/platform/api/quic_port_utils.h
+++ b/quic/platform/api/quic_port_utils.h
@@ -5,22 +5,18 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_PORT_UTILS_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_PORT_UTILS_H_
-#include "net/quic/platform/impl/quic_port_utils_impl.h"
-
namespace quic {
// Returns a UDP port that is currently unused. Check-fails if none are
// available. May return 0 in which case the bind() call will cause the OS
// to use an unused port.
inline int QuicPickServerPortForTestsOrDie() {
- return QuicPickServerPortForTestsOrDieImpl();
+ return 0;
}
// Indicates that a specified port previously returned by
// QuicPickServerPortForTestsOrDie is no longer used.
-inline void QuicRecyclePort(int port) {
- return QuicRecyclePortImpl(port);
-}
+inline void QuicRecyclePort(int /*port*/) {}
} // namespace quic
diff --git a/quic/qbone/qbone_client_test.cc b/quic/qbone/qbone_client_test.cc
index e423c52..98b1a2e 100644
--- a/quic/qbone/qbone_client_test.cc
+++ b/quic/qbone/qbone_client_test.cc
@@ -232,6 +232,8 @@
QuicPickServerPortForTestsOrDie());
ServerThread server_thread(server, server_address);
server_thread.Initialize();
+ server_address =
+ QuicSocketAddress(server_address.host(), server_thread.GetPort());
server_thread.Start();
QuicEpollServer epoll_server;
