summaryrefslogtreecommitdiffstats
path: root/remoting/host
diff options
context:
space:
mode:
authorsergeyu <sergeyu@chromium.org>2016-03-16 13:40:59 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-16 20:42:08 +0000
commite8e7cb43534bb63ce2972cc0a51f614cda15db3f (patch)
tree9984c03a77bc0d6502a9e14df95d913339249734 /remoting/host
parentb5022da0db55451ec2f7f77230a385ca0ff4bd81 (diff)
downloadchromium_src-e8e7cb43534bb63ce2972cc0a51f614cda15db3f.zip
chromium_src-e8e7cb43534bb63ce2972cc0a51f614cda15db3f.tar.gz
chromium_src-e8e7cb43534bb63ce2972cc0a51f614cda15db3f.tar.bz2
Enable TURN on the host when using WebRTC.
BUG=577954 Review URL: https://codereview.chromium.org/1800893002 Cr-Commit-Position: refs/heads/master@{#381520}
Diffstat (limited to 'remoting/host')
-rw-r--r--remoting/host/it2me/it2me_host.cc3
-rw-r--r--remoting/host/remoting_me2me_host.cc2
2 files changed, 5 insertions, 0 deletions
diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc
index f3a32a2..059f210 100644
--- a/remoting/host/it2me/it2me_host.cc
+++ b/remoting/host/it2me/it2me_host.cc
@@ -19,6 +19,7 @@
#include "remoting/base/chromium_url_request.h"
#include "remoting/base/logging.h"
#include "remoting/base/rsa_key_pair.h"
+#include "remoting/base/service_urls.h"
#include "remoting/host/chromoting_host.h"
#include "remoting/host/chromoting_host_context.h"
#include "remoting/host/host_event_logger.h"
@@ -243,6 +244,8 @@ void It2MeHost::FinishConnect() {
make_scoped_ptr(new ChromiumUrlRequestFactory(
host_context_->url_request_context_getter())),
network_settings, protocol::TransportRole::SERVER);
+ transport_context->set_ice_config_url(
+ ServiceUrls::GetInstance()->ice_config_url());
scoped_ptr<protocol::SessionManager> session_manager(
new protocol::JingleSessionManager(signal_strategy_.get()));
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index e9245cf..a1030dd 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -1517,6 +1517,8 @@ void HostProcess::StartHost() {
make_scoped_ptr(new ChromiumUrlRequestFactory(
context_->url_request_context_getter())),
network_settings, protocol::TransportRole::SERVER);
+ transport_context->set_ice_config_url(
+ ServiceUrls::GetInstance()->ice_config_url());
scoped_ptr<protocol::SessionManager> session_manager(
new protocol::JingleSessionManager(signal_strategy_.get()));