Fix relay support in P2P Transport API.

Changed P2PPortAllocator to add Relays to PortConfiguration only after 
relay configuration is received.

BUG=111942


Review URL: http://codereview.chromium.org/9302009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119777 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 3 deletions

diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc
index 16201b0..0d1de18 100644
--- a/content/renderer/p2p/port_allocator.cc
+++ b/content/renderer/p2p/port_allocator.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -265,8 +265,8 @@ void P2PPortAllocatorSession::AddConfig() {
       new cricket::PortConfiguration(stun_server_address_,
                                      relay_username_, relay_password_, "");
 
-  cricket::PortConfiguration::PortList ports;
   if (relay_ip_.ip() != 0) {
+    cricket::PortConfiguration::PortList ports;
     if (relay_udp_port_ > 0) {
       talk_base::SocketAddress address(relay_ip_.ip(), relay_udp_port_);
       ports.push_back(cricket::ProtocolAddress(address, cricket::PROTO_UDP));
@@ -279,8 +279,9 @@ void P2PPortAllocatorSession::AddConfig() {
       talk_base::SocketAddress address(relay_ip_.ip(), relay_ssltcp_port_);
       ports.push_back(cricket::ProtocolAddress(address, cricket::PROTO_SSLTCP));
     }
+    if (!ports.empty())
+      config->AddRelay(ports, 0.0f);
   }
-  config->AddRelay(ports, 0.0f);
   ConfigReady(config);
 }