summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 01:18:54 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 01:18:54 +0000
commit14e077789ec5dae873eb6a8ea19b627b9bc917cf (patch)
tree4d9272e3f77f2f94da6969c8c774e806f23f968c /remoting
parent5e511a7081281048a0f3d8abbc75c71617c90c7d (diff)
downloadchromium_src-14e077789ec5dae873eb6a8ea19b627b9bc917cf.zip
chromium_src-14e077789ec5dae873eb6a8ea19b627b9bc917cf.tar.gz
chromium_src-14e077789ec5dae873eb6a8ea19b627b9bc917cf.tar.bz2
Use all stun addresses in PepperPortAllocator.
Previously PepperPortAllocator was using only the first STUN server because cricket::PortConfiguration didn't support more than one STUN server. Review URL: https://codereview.chromium.org/456013002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/client/plugin/pepper_port_allocator.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/remoting/client/plugin/pepper_port_allocator.cc b/remoting/client/plugin/pepper_port_allocator.cc
index bcbb1b2..db47a62 100644
--- a/remoting/client/plugin/pepper_port_allocator.cc
+++ b/remoting/client/plugin/pepper_port_allocator.cc
@@ -51,8 +51,7 @@ class PepperPortAllocatorSession
pp::InstanceHandle instance_;
- rtc::SocketAddress stun_address_;
- int stun_port_;
+ cricket::ServerAddresses stun_hosts_;
scoped_ptr<pp::URLLoader> relay_url_loader_;
std::vector<char> relay_response_body_;
@@ -83,12 +82,9 @@ PepperPortAllocatorSession::PepperPortAllocatorSession(
relay_token,
std::string()),
instance_(instance),
- stun_port_(0),
+ stun_hosts_(stun_hosts.begin(), stun_hosts.end()),
relay_response_received_(false),
callback_factory_(this) {
- if (stun_hosts.size() > 0) {
- stun_address_ = stun_hosts[0];
- }
}
PepperPortAllocatorSession::~PepperPortAllocatorSession() {
@@ -115,7 +111,7 @@ void PepperPortAllocatorSession::GetPortConfigurations() {
// Add a configuration without relay response first so local and STUN
// candidates can be allocated without waiting for the relay response.
ConfigReady(new cricket::PortConfiguration(
- stun_address_, std::string(), std::string()));
+ stun_hosts_, std::string(), std::string()));
TryCreateRelaySession();
}