zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unused listen-mode of AsyncStunTCPSocket

Browse Source 
Small step towards using separate classes for TCP server sockets.
Added a new test-only class AsyncStunServerTCPSocket needed
for unit tests of AsyncStunTCPSocket.

Bug: webrtc:13065
Change-Id: I7d9713983d8f6b30aa3d3e7442bb34ea48b815eb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/232324
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35047}
This commit is contained in:
Niels Möller
2021-09-17 16:27:56 +02:00
committed by WebRTC LUCI CQ
parent a37fa66463
commit 6da016ff71
5 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
p2p/base/async_stun_tcp_socket_unittest.cc
View File

@ -58,6 +58,15 @@ static unsigned char kTurnChannelDataMessageWithOddLength[] = {
static const rtc::SocketAddress kClientAddr("11.11.11.11", 0);
static const rtc::SocketAddress kServerAddr("22.22.22.22", 0);
class AsyncStunServerTCPSocket : public rtc::AsyncTCPSocket {
public:
explicit AsyncStunServerTCPSocket(rtc::Socket* socket)
: AsyncTCPSocket(socket, true) {}
void HandleIncomingConnection(rtc::Socket* socket) override {
SignalNewConnection(this, new AsyncStunTCPSocket(socket));
}
};
class AsyncStunTCPSocketTest : public ::testing::Test,
public sigslot::has_slots<> {
protected:
@ -69,7 +78,7 @@ class AsyncStunTCPSocketTest : public ::testing::Test,
void CreateSockets() {
rtc::Socket* server = vss_->CreateSocket(kServerAddr.family(), SOCK_STREAM);
server->Bind(kServerAddr);
recv_socket_.reset(new AsyncStunTCPSocket(server, true));
recv_socket_.reset(new AsyncStunServerTCPSocket(server));
recv_socket_->SignalNewConnection.connect(
this, &AsyncStunTCPSocketTest::OnNewConnection);
@ -95,7 +104,7 @@ class AsyncStunTCPSocketTest : public ::testing::Test,
++sent_packets_;
}
void OnNewConnection(rtc::AsyncPacketSocket* server,
void OnNewConnection(rtc::AsyncPacketSocket* /*server*/,
rtc::AsyncPacketSocket* new_socket) {
listen_socket_.reset(new_socket);
new_socket->SignalReadPacket.connect(this,
@ -123,7 +132,7 @@ class AsyncStunTCPSocketTest : public ::testing::Test,
std::unique_ptr<rtc::VirtualSocketServer> vss_;
rtc::AutoSocketServerThread thread_;
std::unique_ptr<AsyncStunTCPSocket> send_socket_;
std::unique_ptr<AsyncStunTCPSocket> recv_socket_;
std::unique_ptr<rtc::AsyncPacketSocket> recv_socket_;
std::unique_ptr<rtc::AsyncPacketSocket> listen_socket_;
std::list<std::string> recv_packets_;
int sent_packets_ = 0;