commit 81001b0d2a8b92cdc5e5fe695b18d50d8a405c27
author deadbeef <deadbeef@webrtc.org> Thu Jul 16 17:22:21 2015
committer Commit bot <commit-bot@chromium.org> Thu Jul 16 17:22:28 2015
tree cb1e69a5f456385a67bbf3c24502147acfad2f67
parent 8cb86f1ceefa2a798d31595d919846d37b416e17

Ensuring that UDP TURN servers are always used as STUN servers.

This was already working in most cases, but not for some corner cases:
* If the PORTALLOCATOR_ENABLE_SHARED_SOCKET flag is not set
* If both a STUN server and TURN server are configured

I added unit tests for these cases, and centralized the code that gets
STUN server addresses in order to fix these and any related issues.

BUG=webrtc:4215

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

Cr-Original-Commit-Position: refs/heads/master@{#9596}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: c5d0d95fd8957a7a6645b1196e5f1e9cee33525c

base/proxyserver.cc

diff --git a/base/proxyserver.cc b/base/proxyserver.cc
index 8f12a99..d91a92f 100644
--- a/base/proxyserver.cc
+++ b/base/proxyserver.cc
@@ -36,6 +36,10 @@
   }
 }
 
+SocketAddress ProxyServer::GetServerAddress() {
+  return server_socket_->GetLocalAddress();
+}
+
 void ProxyServer::OnAcceptEvent(AsyncSocket* socket) {
   ASSERT(socket != NULL && socket == server_socket_.get());
   AsyncSocket* int_socket = socket->Accept(NULL);