Support multiple STUN servers for PeerConnection.

content/renderer/p2p/port_allocator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/p2p/port_allocator.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 33 matching lines @@
   if (!base::StringToInt(string, value) || *value <= 0 || *value >= 65536) {
     LOG(ERROR) << "Received invalid port number from relay server: " << string;
     return false;
   }
   return true;
 }
 
 }  // namespace
 
 P2PPortAllocator::Config::Config()
-    : stun_server_port(0),
-      legacy_relay(true),
+    : legacy_relay(true),
       disable_tcp_transport(false) {
 }
 
 P2PPortAllocator::Config::~Config() {
 }
 
 P2PPortAllocator::Config::RelayServerConfig::RelayServerConfig()
     : port(0) {
 }
 
@@ skipping 186 matching lines @@
         return;
     }
   }
 
   AddConfig();
 }
 
 void P2PPortAllocatorSession::AddConfig() {
   const P2PPortAllocator::Config& config = allocator_->config_;
   cricket::PortConfiguration* port_config = new cricket::PortConfiguration(
-      rtc::SocketAddress(config.stun_server, config.stun_server_port),
-      std::string(), std::string());
+      config.stun_servers, std::string(), std::string());
 
   for (size_t i = 0; i < config.relays.size(); ++i) {
     cricket::RelayCredentials credentials(config.relays[i].username,
                                           config.relays[i].password);
     cricket::RelayServerConfig relay_server(cricket::RELAY_TURN);
     cricket::ProtocolType protocol;
     if (!cricket::StringToProto(config.relays[i].transport_type.c_str(),
                                 &protocol)) {
       DLOG(WARNING) << "Ignoring TURN server "
                     << config.relays[i].server_address << ". "
                     << "Reason= Incorrect "
                     << config.relays[i].transport_type
                     << " transport parameter.";
       continue;
     }
 
     relay_server.ports.push_back(cricket::ProtocolAddress(
         rtc::SocketAddress(config.relays[i].server_address,
                                  config.relays[i].port),
         protocol,
         config.relays[i].secure));
     relay_server.credentials = credentials;
     port_config->AddRelay(relay_server);
   }
   ConfigReady(port_config);
 }
 
 }  // namespace content