mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract method VirtualSocketServer::AssignBindAddress

Browse source 
Bug: webrtc:13065
Change-Id: Ib8ec14dd193457c010ba6ed943c73cc237bf8bae
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/229982
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34845}
This commit is contained in:
Niels Möller 2021-08-24 15:49:34 +02:00 committed by WebRTC LUCI CQ
parent 2ace42f084
commit c2d8f1e6bc
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
rtc_base/virtual_socket_server.cc
View file

@ -133,8 +133,8 @@ int VirtualSocket::Bind(const SocketAddress& addr) {
error_ = EINVAL;
return -1;
}
local_addr_ = addr;
int result = server_->Bind(this, &local_addr_);
local_addr_ = server_->AssignBindAddress(addr);
int result = server_->Bind(this, local_addr_);
if (result != 0) {
local_addr_.Clear();
error_ = EADDRINUSE;
@ -431,8 +431,9 @@ int VirtualSocket::SendUdp(const void* pv,
const SocketAddress& addr) {
// If we have not been assigned a local port, then get one.
if (local_addr_.IsNil()) {
local_addr_ = EmptySocketAddressWithFamily(addr.ipaddr().family());
int result = server_->Bind(this, &local_addr_);
local_addr_ = server_->AssignBindAddress(
EmptySocketAddressWithFamily(addr.ipaddr().family()));
int result = server_->Bind(this, local_addr_);
if (result != 0) {
local_addr_.Clear();
error_ = EADDRINUSE;
@ -684,35 +685,35 @@ int VirtualSocketServer::Bind(VirtualSocket* socket,
return bindings_->insert(entry).second ? 0 : -1;
}
int VirtualSocketServer::Bind(VirtualSocket* socket, SocketAddress* addr) {
RTC_DCHECK(nullptr != socket);
SocketAddress VirtualSocketServer::AssignBindAddress(
const SocketAddress& app_addr) {
RTC_DCHECK(!IPIsUnspec(app_addr.ipaddr()));
// Normalize the IP.
if (!IPIsUnspec(addr->ipaddr())) {
addr->SetIP(addr->ipaddr().Normalized());
} else {
RTC_NOTREACHED();
}
SocketAddress addr;
addr.SetIP(app_addr.ipaddr().Normalized());
// If the IP appears in `alternative_address_mapping_`, meaning the test has
// configured sockets bound to this IP to actually use another IP, replace
// the IP here.
auto alternative = alternative_address_mapping_.find(addr->ipaddr());
auto alternative = alternative_address_mapping_.find(addr.ipaddr());
if (alternative != alternative_address_mapping_.end()) {
addr->SetIP(alternative->second);
addr.SetIP(alternative->second);
}
// Assign a port if not assigned.
if (addr->port() == 0) {
if (app_addr.port() != 0) {
addr.SetPort(app_addr.port());
} else {
// Assign a port.
for (int i = 0; i < kEphemeralPortCount; ++i) {
addr->SetPort(GetNextPort());
if (bindings_->find(*addr) == bindings_->end()) {
addr.SetPort(GetNextPort());
if (bindings_->find(addr) == bindings_->end()) {
break;
}
}
}
return Bind(socket, *addr);
return addr;
}
VirtualSocket* VirtualSocketServer::LookupBinding(const SocketAddress& addr) {

5
rtc_base/virtual_socket_server.h
View file

@ -281,8 +281,9 @@ class VirtualSocketServer : public SocketServer {
// socket server. Intended to be used for test assertions.
uint32_t sent_packets() const { return sent_packets_; }
// Binds the given socket to addr, assigning and IP and Port if necessary
int Bind(VirtualSocket* socket, SocketAddress* addr);
// Assign IP and Port if application's address is unspecified. Also apply
// `alternative_address_mapping_`.
SocketAddress AssignBindAddress(const SocketAddress& app_addr);
// Binds the given socket to the given (fully-defined) address.
int Bind(VirtualSocket* socket, const SocketAddress& addr);