OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/p2p/port_allocator.h" | 5 #include "content/renderer/p2p/port_allocator.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "base/strings/string_split.h" | 10 #include "base/strings/string_split.h" |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 &protocol)) { | 378 &protocol)) { |
379 DLOG(WARNING) << "Ignoring TURN server " | 379 DLOG(WARNING) << "Ignoring TURN server " |
380 << relay_info.config.server_address << ". " | 380 << relay_info.config.server_address << ". " |
381 << "Reason= Incorrect " | 381 << "Reason= Incorrect " |
382 << relay_info.config.transport_type | 382 << relay_info.config.transport_type |
383 << " transport parameter."; | 383 << " transport parameter."; |
384 continue; | 384 continue; |
385 } | 385 } |
386 | 386 |
387 relay_server.ports.push_back(cricket::ProtocolAddress( | 387 relay_server.ports.push_back(cricket::ProtocolAddress( |
388 relay_info.resolved_relay_address, protocol)); | 388 relay_info.resolved_relay_address, |
| 389 protocol, |
| 390 relay_info.config.secure)); |
389 relay_server.credentials = credentials; | 391 relay_server.credentials = credentials; |
390 port_config->AddRelay(relay_server); | 392 port_config->AddRelay(relay_server); |
391 } | 393 } |
392 } | 394 } |
393 ConfigReady(port_config); | 395 ConfigReady(port_config); |
394 } | 396 } |
395 | 397 |
396 } // namespace content | 398 } // namespace content |
OLD | NEW |