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

Do not create incompatible TurnPort if the server address family is known.

Browse Source 
In the existing code, if the server address and the local IP family does not
match, we still create a TurnPort and destroy it later.
Instead, we could avoid creating it at the beginning.
This does not affect the client behavior except for the port creation.

BUG=
R=deadbeef@webrtc.org, pthatcher@webrtc.org, zhihuang@webrtc.org

Review URL: https://codereview.webrtc.org/2206713004 .

Cr-Commit-Position: refs/heads/master@{#13720}
This commit is contained in:
Honghai Zhang
2016-08-10 10:33:05 -07:00
parent bf8a2c94ce
commit 3d31bd65cf
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/p2p/client/basicportallocator.cc
View File

@ -1296,6 +1296,19 @@ void AllocationSequence::CreateTurnPort(const RelayServerConfig& config) {
continue; continue;
} }
// Do not create a port if the server address family is known and does
// not match the local IP address family.
int server_ip_family = relay_port->address.ipaddr().family();
int local_ip_family = ip_.family();
if (server_ip_family != AF_UNSPEC && server_ip_family != local_ip_family) {
LOG(LS_INFO) << "Server and local address families are not compatible. "
<< "Server address: "
<< relay_port->address.ipaddr().ToString()
<< " Local address: " << ip_.ToString();
continue;
}
// Shared socket mode must be enabled only for UDP based ports. Hence // Shared socket mode must be enabled only for UDP based ports. Hence
// don't pass shared socket for ports which will create TCP sockets. // don't pass shared socket for ports which will create TCP sockets.
// TODO(mallinath) - Enable shared socket mode for TURN ports. Disabled // TODO(mallinath) - Enable shared socket mode for TURN ports. Disabled