admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unused sigslot SignalAddressReady and MSG_ID_ADDRESS_BOUND

Browse Source 
Followup to https://webrtc-review.googlesource.com/c/src/+/207181

Bug: webrtc:11567
Change-Id: I604232eda0d5df7d9fe070926a37a4496924c637
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/208280
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33317}
This commit is contained in:
Niels Möller 2021-02-18 14:38:14 +01:00 committed by Commit Bot
parent 77ee8542dd
commit d44532afb7
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rtc_base/virtual_socket_server.cc
View File

@ -54,7 +54,6 @@ const int NUM_SAMPLES = 1000;
enum {
MSG_ID_PACKET,
MSG_ID_ADDRESS_BOUND,
MSG_ID_CONNECT,
MSG_ID_DISCONNECT,
MSG_ID_SIGNALREADEVENT,
@ -377,8 +376,6 @@ void VirtualSocket::OnMessage(Message* pmsg) {
SignalCloseEvent(this, error);
}
}
} else if (pmsg->message_id == MSG_ID_ADDRESS_BOUND) {
SignalAddressReady(this, GetLocalAddress());
} else if (pmsg->message_id == MSG_ID_SIGNALREADEVENT) {
if (!recv_buffer_.empty()) {
SignalReadEvent(this);
@ -696,13 +693,7 @@ int VirtualSocketServer::Bind(VirtualSocket* socket,
SocketAddress normalized(addr.ipaddr().Normalized(), addr.port());
AddressMap::value_type entry(normalized, socket);
if (bindings_->insert(entry).second) {
// Post a message here such that test case could have chance to
// process the local address. (i.e. SetAlternativeLocalAddress).
msg_queue_->Post(RTC_FROM_HERE, socket, MSG_ID_ADDRESS_BOUND);
return 0;
}
return -1;
return bindings_->insert(entry).second ? 0 : -1;
}
int VirtualSocketServer::Bind(VirtualSocket* socket, SocketAddress* addr) {

3
rtc_base/virtual_socket_server.h
View File

@ -369,9 +369,6 @@ class VirtualSocket : public AsyncSocket,
// Removes stale packets from the network. Returns current size.
size_t PurgeNetworkPackets(int64_t cur_time);
// For testing purpose only. Fired when client socket is bound to an address.
sigslot::signal2<VirtualSocket*, const SocketAddress&> SignalAddressReady;
private:
struct NetworkEntry {
size_t size;