From 9cc6c874bc68353acbec895fcc79ef293d6e5f45 Mon Sep 17 00:00:00 2001 From: sergeyu Date: Thu, 24 Mar 2016 11:45:44 -0700 Subject: Move ServiceUrls to remoting/host ServiceUrls was used only in one place in android client and it's not really useful there. Moved it to the host directory. Committed: https://crrev.com/2a2656a67bd2ce190df4d918f609bdb4449a64fe Cr-Commit-Position: refs/heads/master@{#382939} Review URL: https://codereview.chromium.org/1817573003 Cr-Commit-Position: refs/heads/master@{#383105} --- remoting/DEPS | 1 - remoting/android/BUILD.gn | 1 - remoting/base/BUILD.gn | 1 - remoting/base/service_urls.cc | 88 ---------------------- remoting/base/service_urls.h | 69 ----------------- remoting/client/jni/chromoting_jni_instance.cc | 8 +- remoting/host/DEPS | 1 + remoting/host/it2me/it2me_host.cc | 2 +- remoting/host/it2me/it2me_native_messaging_host.cc | 2 +- remoting/host/remoting_me2me_host.cc | 2 +- remoting/host/service_urls.cc | 88 ++++++++++++++++++++++ remoting/host/service_urls.h | 69 +++++++++++++++++ remoting/host/setup/start_host.cc | 2 +- remoting/remoting_android.gypi | 1 - remoting/remoting_host_srcs.gypi | 6 +- remoting/remoting_srcs.gypi | 2 - remoting/test/DEPS | 1 + remoting/test/test_chromoting_client.cc | 3 - 18 files changed, 171 insertions(+), 176 deletions(-) delete mode 100644 remoting/base/service_urls.cc delete mode 100644 remoting/base/service_urls.h create mode 100644 remoting/host/service_urls.cc create mode 100644 remoting/host/service_urls.h (limited to 'remoting') diff --git a/remoting/DEPS b/remoting/DEPS index 5d57d6c..9d57819 100644 --- a/remoting/DEPS +++ b/remoting/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+crypto", - "+google_apis", # Note: Only for net::EnableSSLServerSockets(), which must be called by # unit tests at process start. diff --git a/remoting/android/BUILD.gn b/remoting/android/BUILD.gn index d0bac7c..62112fa 100644 --- a/remoting/android/BUILD.gn +++ b/remoting/android/BUILD.gn @@ -20,7 +20,6 @@ generate_jni("jni_headers") { shared_library("remoting_client_jni") { deps = [ - "//google_apis", "//remoting/android:jni_headers", "//remoting/base", "//remoting/client", diff --git a/remoting/base/BUILD.gn b/remoting/base/BUILD.gn index 23dcad1..b8577c1 100644 --- a/remoting/base/BUILD.gn +++ b/remoting/base/BUILD.gn @@ -26,7 +26,6 @@ source_set("base") { if (is_nacl) { sources -= [ "chromium_url_request.cc", - "service_urls.cc", "url_request_context_getter.cc", ] } diff --git a/remoting/base/service_urls.cc b/remoting/base/service_urls.cc deleted file mode 100644 index 3ba940b..0000000 --- a/remoting/base/service_urls.cc +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright 2014 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 "remoting/base/service_urls.h" - -#include "base/command_line.h" -#include "base/logging.h" -#include "google_apis/google_api_keys.h" - -// Configurable service data. -const char kDirectoryBaseUrl[] = "https://www.googleapis.com/chromoting/v1"; -const char kGcdBaseUrl[] = "https://www.googleapis.com/clouddevices/v1"; -const char kXmppServerAddress[] = "talk.google.com:443"; -const char kXmppServerAddressForMe2MeHost[] = "talk.google.com:5222"; -const bool kXmppServerUseTls = true; -const char kDirectoryBotJid[] = "remoting@bot.talk.google.com"; -const char kGcdJid[] = "clouddevices.gserviceaccount.com"; -const char kNetworkTraversalApiUrlBase[] = - "https://networktraversal.googleapis.com/v1alpha/iceconfig?key="; - -// Command line switches. -#if !defined(NDEBUG) -const char kDirectoryBaseUrlSwitch[] = "directory-base-url"; -const char kGcdBaseUrlSwitch[] = "gcd-base-url"; -const char kXmppServerAddressSwitch[] = "xmpp-server-address"; -const char kXmppServerDisableTlsSwitch[] = "disable-xmpp-server-tls"; -const char kDirectoryBotJidSwitch[] = "directory-bot-jid"; -const char kGcdJidSwitch[] = "gcd-jid"; -const char kIceConfigUrl[] = "ice_config_url"; -#endif // !defined(NDEBUG) - -// Non-configurable service paths. -const char kDirectoryHostsSuffix[] = "/@me/hosts/"; - -namespace remoting { - -ServiceUrls::ServiceUrls() - : directory_base_url_(kDirectoryBaseUrl), - gcd_base_url_(kGcdBaseUrl), - xmpp_server_address_(kXmppServerAddress), - xmpp_server_address_for_me2me_host_(kXmppServerAddressForMe2MeHost), - xmpp_server_use_tls_(kXmppServerUseTls), - directory_bot_jid_(kDirectoryBotJid), - gcd_jid_(kGcdJid), - ice_config_url_(kNetworkTraversalApiUrlBase + - google_apis::GetRemotingAPIKey()) { -#if !defined(NDEBUG) - // Allow debug builds to override urls via command line. - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); - CHECK(command_line); - if (command_line->HasSwitch(kDirectoryBaseUrlSwitch)) { - directory_base_url_ = command_line->GetSwitchValueASCII( - kDirectoryBaseUrlSwitch); - } - if (command_line->HasSwitch(kGcdBaseUrlSwitch)) { - gcd_base_url_ = command_line->GetSwitchValueASCII(kGcdBaseUrlSwitch); - } - if (command_line->HasSwitch(kXmppServerAddressSwitch)) { - xmpp_server_address_ = command_line->GetSwitchValueASCII( - kXmppServerAddressSwitch); - xmpp_server_address_for_me2me_host_ = xmpp_server_address_; - } - if (command_line->HasSwitch(kXmppServerDisableTlsSwitch)) { - xmpp_server_use_tls_ = false; - } - if (command_line->HasSwitch(kDirectoryBotJidSwitch)) { - directory_bot_jid_ = command_line->GetSwitchValueASCII( - kDirectoryBotJidSwitch); - } - if (command_line->HasSwitch(kGcdJidSwitch)) { - gcd_jid_ = command_line->GetSwitchValueASCII(kGcdJidSwitch); - } - if (command_line->HasSwitch(kIceConfigUrl)) { - ice_config_url_ = command_line->GetSwitchValueASCII(kIceConfigUrl); - } -#endif // !defined(NDEBUG) - - directory_hosts_url_ = directory_base_url_ + kDirectoryHostsSuffix; -} - -ServiceUrls::~ServiceUrls() {} - -ServiceUrls* remoting::ServiceUrls::GetInstance() { - return base::Singleton::get(); -} - -} // namespace remoting diff --git a/remoting/base/service_urls.h b/remoting/base/service_urls.h deleted file mode 100644 index 5c47d65..0000000 --- a/remoting/base/service_urls.h +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright 2014 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. - -#ifndef REMOTING_BASE_SERVICE_URLS_H_ -#define REMOTING_BASE_SERVICE_URLS_H_ - -#include - -#include "base/macros.h" -#include "base/memory/singleton.h" - -namespace remoting { - -// This class contains the URLs to the services used by the host (except for -// Gaia, which has its own GaiaUrls class. In debug builds, it allows these URLs -// to be overriden by command line switches, allowing the host process to be -// pointed at alternate/test servers. -class ServiceUrls { - public: - static ServiceUrls* GetInstance(); - - // Remoting directory REST API URLs. - const std::string& directory_base_url() const { return directory_base_url_; } - const std::string& directory_hosts_url() const { - return directory_hosts_url_; - } - const std::string& gcd_base_url() const { return gcd_base_url_; } - - // XMPP Server configuration. - const std::string& xmpp_server_address() const { - return xmpp_server_address_; - } - const std::string& xmpp_server_address_for_me2me_host() const { - return xmpp_server_address_for_me2me_host_; - } - bool xmpp_server_use_tls() const { return xmpp_server_use_tls_; } - - // Remoting directory bot JID (for registering hosts, logging, heartbeats). - const std::string& directory_bot_jid() const { return directory_bot_jid_; } - - // JID for communicating with GCD. - const std::string& gcd_jid() const { return gcd_jid_; } - - // ICE config URL. - const std::string& ice_config_url() const { return ice_config_url_; } - - private: - friend struct base::DefaultSingletonTraits; - - ServiceUrls(); - virtual ~ServiceUrls(); - - std::string directory_base_url_; - std::string directory_hosts_url_; - std::string gcd_base_url_; - std::string xmpp_server_address_; - std::string xmpp_server_address_for_me2me_host_; - bool xmpp_server_use_tls_; - std::string directory_bot_jid_; - std::string gcd_jid_; - std::string ice_config_url_; - - DISALLOW_COPY_AND_ASSIGN(ServiceUrls); -}; - -} // namespace remoting - -#endif // REMOTING_BASE_SERVICE_URLS_H_ diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc index dd075a8..1af00bc 100644 --- a/remoting/client/jni/chromoting_jni_instance.cc +++ b/remoting/client/jni/chromoting_jni_instance.cc @@ -16,7 +16,6 @@ #include "jingle/glue/thread_wrapper.h" #include "net/socket/client_socket_factory.h" #include "remoting/base/chromium_url_request.h" -#include "remoting/base/service_urls.h" #include "remoting/client/audio_player.h" #include "remoting/client/client_status_logger.h" #include "remoting/client/jni/android_keymap.h" @@ -42,6 +41,8 @@ const char* const kXmppServer = "talk.google.com"; const int kXmppPort = 5222; const bool kXmppUseTls = true; +const char kDirectoryBotJid[] = "remoting@bot.talk.google.com"; + // Interval at which to log performance statistics, if enabled. const int kPerfStatsIntervalMs = 60000; @@ -395,9 +396,8 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() { new XmppSignalStrategy(net::ClientSocketFactory::GetDefaultFactory(), jni_runtime_->url_requester(), xmpp_config_)); - client_status_logger_.reset( - new ClientStatusLogger(ServerLogEntry::ME2ME, signaling_.get(), - ServiceUrls::GetInstance()->directory_bot_jid())); + client_status_logger_.reset(new ClientStatusLogger( + ServerLogEntry::ME2ME, signaling_.get(), kDirectoryBotJid)); scoped_refptr transport_context = new protocol::TransportContext( diff --git a/remoting/host/DEPS b/remoting/host/DEPS index 052a0c5c..f05283a 100644 --- a/remoting/host/DEPS +++ b/remoting/host/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+cc/output", "+components/policy/core/common", "+extensions/browser/api/messaging", + "+google_apis", "+jingle/glue", "+net", "+remoting/codec", diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc index 08eb7e1..0d51b3f 100644 --- a/remoting/host/it2me/it2me_host.cc +++ b/remoting/host/it2me/it2me_host.cc @@ -19,7 +19,6 @@ #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" @@ -29,6 +28,7 @@ #include "remoting/host/it2me_desktop_environment.h" #include "remoting/host/policy_watcher.h" #include "remoting/host/register_support_host_request.h" +#include "remoting/host/service_urls.h" #include "remoting/protocol/auth_util.h" #include "remoting/protocol/chromium_port_allocator_factory.h" #include "remoting/protocol/ice_transport.h" diff --git a/remoting/host/it2me/it2me_native_messaging_host.cc b/remoting/host/it2me/it2me_native_messaging_host.cc index 424e8b8..87ecea8 100644 --- a/remoting/host/it2me/it2me_native_messaging_host.cc +++ b/remoting/host/it2me/it2me_native_messaging_host.cc @@ -19,9 +19,9 @@ #include "build/build_config.h" #include "net/base/url_util.h" #include "net/url_request/url_request_context_getter.h" -#include "remoting/base/service_urls.h" #include "remoting/host/chromoting_host_context.h" #include "remoting/host/host_exit_codes.h" +#include "remoting/host/service_urls.h" #include "remoting/protocol/name_value_map.h" namespace remoting { diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index a1030dd..eac1eec 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -42,7 +42,6 @@ #include "remoting/base/constants.h" #include "remoting/base/logging.h" #include "remoting/base/rsa_key_pair.h" -#include "remoting/base/service_urls.h" #include "remoting/base/util.h" #include "remoting/host/branding.h" #include "remoting/host/chromoting_host.h" @@ -73,6 +72,7 @@ #include "remoting/host/policy_watcher.h" #include "remoting/host/security_key/gnubby_auth_handler.h" #include "remoting/host/security_key/gnubby_extension.h" +#include "remoting/host/service_urls.h" #include "remoting/host/shutdown_watchdog.h" #include "remoting/host/signaling_connector.h" #include "remoting/host/single_window_desktop_environment.h" diff --git a/remoting/host/service_urls.cc b/remoting/host/service_urls.cc new file mode 100644 index 0000000..d3f2876 --- /dev/null +++ b/remoting/host/service_urls.cc @@ -0,0 +1,88 @@ +// Copyright 2016 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 "remoting/host/service_urls.h" + +#include "base/command_line.h" +#include "base/logging.h" +#include "google_apis/google_api_keys.h" + +// Configurable service data. +const char kDirectoryBaseUrl[] = "https://www.googleapis.com/chromoting/v1"; +const char kGcdBaseUrl[] = "https://www.googleapis.com/clouddevices/v1"; +const char kXmppServerAddress[] = "talk.google.com:443"; +const char kXmppServerAddressForMe2MeHost[] = "talk.google.com:5222"; +const bool kXmppServerUseTls = true; +const char kDirectoryBotJid[] = "remoting@bot.talk.google.com"; +const char kGcdJid[] = "clouddevices.gserviceaccount.com"; +const char kNetworkTraversalApiUrlBase[] = + "https://networktraversal.googleapis.com/v1alpha/iceconfig?key="; + +// Command line switches. +#if !defined(NDEBUG) +const char kDirectoryBaseUrlSwitch[] = "directory-base-url"; +const char kGcdBaseUrlSwitch[] = "gcd-base-url"; +const char kXmppServerAddressSwitch[] = "xmpp-server-address"; +const char kXmppServerDisableTlsSwitch[] = "disable-xmpp-server-tls"; +const char kDirectoryBotJidSwitch[] = "directory-bot-jid"; +const char kGcdJidSwitch[] = "gcd-jid"; +const char kIceConfigUrl[] = "ice_config_url"; +#endif // !defined(NDEBUG) + +// Non-configurable service paths. +const char kDirectoryHostsSuffix[] = "/@me/hosts/"; + +namespace remoting { + +ServiceUrls::ServiceUrls() + : directory_base_url_(kDirectoryBaseUrl), + gcd_base_url_(kGcdBaseUrl), + xmpp_server_address_(kXmppServerAddress), + xmpp_server_address_for_me2me_host_(kXmppServerAddressForMe2MeHost), + xmpp_server_use_tls_(kXmppServerUseTls), + directory_bot_jid_(kDirectoryBotJid), + gcd_jid_(kGcdJid), + ice_config_url_(kNetworkTraversalApiUrlBase + + google_apis::GetRemotingAPIKey()) { +#if !defined(NDEBUG) + // Allow debug builds to override urls via command line. + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + CHECK(command_line); + if (command_line->HasSwitch(kDirectoryBaseUrlSwitch)) { + directory_base_url_ = command_line->GetSwitchValueASCII( + kDirectoryBaseUrlSwitch); + } + if (command_line->HasSwitch(kGcdBaseUrlSwitch)) { + gcd_base_url_ = command_line->GetSwitchValueASCII(kGcdBaseUrlSwitch); + } + if (command_line->HasSwitch(kXmppServerAddressSwitch)) { + xmpp_server_address_ = command_line->GetSwitchValueASCII( + kXmppServerAddressSwitch); + xmpp_server_address_for_me2me_host_ = xmpp_server_address_; + } + if (command_line->HasSwitch(kXmppServerDisableTlsSwitch)) { + xmpp_server_use_tls_ = false; + } + if (command_line->HasSwitch(kDirectoryBotJidSwitch)) { + directory_bot_jid_ = command_line->GetSwitchValueASCII( + kDirectoryBotJidSwitch); + } + if (command_line->HasSwitch(kGcdJidSwitch)) { + gcd_jid_ = command_line->GetSwitchValueASCII(kGcdJidSwitch); + } + if (command_line->HasSwitch(kIceConfigUrl)) { + ice_config_url_ = command_line->GetSwitchValueASCII(kIceConfigUrl); + } +#endif // !defined(NDEBUG) + + directory_hosts_url_ = directory_base_url_ + kDirectoryHostsSuffix; +} + +ServiceUrls::~ServiceUrls() {} + +ServiceUrls* remoting::ServiceUrls::GetInstance() { + return base::Singleton::get(); +} + +} // namespace remoting diff --git a/remoting/host/service_urls.h b/remoting/host/service_urls.h new file mode 100644 index 0000000..62d279b8 --- /dev/null +++ b/remoting/host/service_urls.h @@ -0,0 +1,69 @@ +// Copyright 2016 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. + +#ifndef REMOTING_HOST_SERVICE_URLS_H_ +#define REMOTING_HOST_SERVICE_URLS_H_ + +#include + +#include "base/macros.h" +#include "base/memory/singleton.h" + +namespace remoting { + +// This class contains the URLs to the services used by the host (except for +// Gaia, which has its own GaiaUrls class. In debug builds, it allows these URLs +// to be overriden by command line switches, allowing the host process to be +// pointed at alternate/test servers. +class ServiceUrls { + public: + static ServiceUrls* GetInstance(); + + // Remoting directory REST API URLs. + const std::string& directory_base_url() const { return directory_base_url_; } + const std::string& directory_hosts_url() const { + return directory_hosts_url_; + } + const std::string& gcd_base_url() const { return gcd_base_url_; } + + // XMPP Server configuration. + const std::string& xmpp_server_address() const { + return xmpp_server_address_; + } + const std::string& xmpp_server_address_for_me2me_host() const { + return xmpp_server_address_for_me2me_host_; + } + bool xmpp_server_use_tls() const { return xmpp_server_use_tls_; } + + // Remoting directory bot JID (for registering hosts, logging, heartbeats). + const std::string& directory_bot_jid() const { return directory_bot_jid_; } + + // JID for communicating with GCD. + const std::string& gcd_jid() const { return gcd_jid_; } + + // ICE config URL. + const std::string& ice_config_url() const { return ice_config_url_; } + + private: + friend struct base::DefaultSingletonTraits; + + ServiceUrls(); + virtual ~ServiceUrls(); + + std::string directory_base_url_; + std::string directory_hosts_url_; + std::string gcd_base_url_; + std::string xmpp_server_address_; + std::string xmpp_server_address_for_me2me_host_; + bool xmpp_server_use_tls_; + std::string directory_bot_jid_; + std::string gcd_jid_; + std::string ice_config_url_; + + DISALLOW_COPY_AND_ASSIGN(ServiceUrls); +}; + +} // namespace remoting + +#endif // REMOTING_HOST_SERVICE_URLS_H_ diff --git a/remoting/host/setup/start_host.cc b/remoting/host/setup/start_host.cc index 3009570..3c80d81 100644 --- a/remoting/host/setup/start_host.cc +++ b/remoting/host/setup/start_host.cc @@ -16,8 +16,8 @@ #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_context_getter.h" #include "remoting/base/logging.h" -#include "remoting/base/service_urls.h" #include "remoting/base/url_request_context_getter.h" +#include "remoting/host/service_urls.h" #include "remoting/host/setup/host_starter.h" #include "remoting/host/setup/oauth_helper.h" #include "remoting/host/setup/pin_validator.h" diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi index 7a79a72..61d4215 100644 --- a/remoting/remoting_android.gypi +++ b/remoting/remoting_android.gypi @@ -38,7 +38,6 @@ 'remoting_client', 'remoting_jni_headers', 'remoting_protocol', - '../google_apis/google_apis.gyp:google_apis', '../ui/events/events.gyp:dom_keycode_converter', '../ui/gfx/gfx.gyp:gfx', ], diff --git a/remoting/remoting_host_srcs.gypi b/remoting/remoting_host_srcs.gypi index 725c5b5..d768314 100644 --- a/remoting/remoting_host_srcs.gypi +++ b/remoting/remoting_host_srcs.gypi @@ -222,16 +222,18 @@ 'host/security_key/gnubby_extension_session.h', 'host/security_key/gnubby_socket.cc', 'host/security_key/gnubby_socket.h', - 'host/security_key/remote_security_key_ipc_constants.cc', - 'host/security_key/remote_security_key_ipc_constants.h', 'host/security_key/remote_security_key_ipc_client.cc', 'host/security_key/remote_security_key_ipc_client.h', + 'host/security_key/remote_security_key_ipc_constants.cc', + 'host/security_key/remote_security_key_ipc_constants.h', 'host/security_key/remote_security_key_ipc_server.cc', 'host/security_key/remote_security_key_ipc_server.h', 'host/security_key/remote_security_key_ipc_server_impl.cc', 'host/security_key/remote_security_key_ipc_server_impl.h', 'host/server_log_entry_host.cc', 'host/server_log_entry_host.h', + 'host/service_urls.cc', + 'host/service_urls.h', 'host/shaped_desktop_capturer.cc', 'host/shaped_desktop_capturer.h', 'host/shutdown_watchdog.cc', diff --git a/remoting/remoting_srcs.gypi b/remoting/remoting_srcs.gypi index 4ab5640..c6cd2e1 100644 --- a/remoting/remoting_srcs.gypi +++ b/remoting/remoting_srcs.gypi @@ -28,8 +28,6 @@ 'base/running_samples.cc', 'base/running_samples.h', 'base/scoped_sc_handle_win.h', - 'base/service_urls.cc', - 'base/service_urls.h', 'base/socket_reader.cc', 'base/socket_reader.h', 'base/typed_buffer.h', diff --git a/remoting/test/DEPS b/remoting/test/DEPS index 485d290..7a7eb3a 100644 --- a/remoting/test/DEPS +++ b/remoting/test/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+google_apis", "+jingle/glue", "+net", "+remoting/client", diff --git a/remoting/test/test_chromoting_client.cc b/remoting/test/test_chromoting_client.cc index d4d8c29..9bc33ca 100644 --- a/remoting/test/test_chromoting_client.cc +++ b/remoting/test/test_chromoting_client.cc @@ -14,7 +14,6 @@ #include "net/base/request_priority.h" #include "net/socket/client_socket_factory.h" #include "remoting/base/chromium_url_request.h" -#include "remoting/base/service_urls.h" #include "remoting/base/url_request_context_getter.h" #include "remoting/client/audio_player.h" #include "remoting/client/chromoting_client.h" @@ -126,8 +125,6 @@ void TestChromotingClient::StartConnection( make_scoped_ptr( new ChromiumUrlRequestFactory(request_context_getter)), network_settings, protocol::TransportRole::CLIENT)); - transport_context->set_ice_config_url( - ServiceUrls::GetInstance()->ice_config_url()); protocol::ClientAuthenticationConfig client_auth_config; client_auth_config.host_id = connection_setup_info.host_id; -- cgit v1.1