diff options
author | sergeyu <sergeyu@chromium.org> | 2015-04-23 10:44:11 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 17:44:28 +0000 |
commit | da3ba0c9e7d2f0ae81f4d89097a6df56b3ec0df1 (patch) | |
tree | 86d9897125f1ef05a9095b8ca49fe2997b59d8e2 /remoting/host/chromoting_host.cc | |
parent | 0df00e0661defe6707ad888dd9146aa25bfed63a (diff) | |
download | chromium_src-da3ba0c9e7d2f0ae81f4d89097a6df56b3ec0df1.zip chromium_src-da3ba0c9e7d2f0ae81f4d89097a6df56b3ec0df1.tar.gz chromium_src-da3ba0c9e7d2f0ae81f4d89097a6df56b3ec0df1.tar.bz2 |
Revert of Use standard ICE in Chromoting. (patchset #7 id:160001 of https://codereview.chromium.org/1085703003/)
Reason for revert:
This change did cause test failure: http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20Mac%20%28valgrind%29%282%29/builds/34169/ (the link in the first revert was incorrect)
Original issue's description:
> Use standard ICE in Chromoting.
>
> Previously we were using legacy, non-standard version of ICE. This
> change adds ICE version negotiation and enabled standard ICE by default,
> when both peers support it.
>
> BUG=473758
>
> Committed: https://crrev.com/5a5854ee3e1c5760b422f26d31909bfb5dca631f
> Cr-Commit-Position: refs/heads/master@{#326560}
TBR=rmsousa@chromium.org,wez@chromium.org,dcaiafa@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=473758
Review URL: https://codereview.chromium.org/1089253005
Cr-Commit-Position: refs/heads/master@{#326570}
Diffstat (limited to 'remoting/host/chromoting_host.cc')
-rw-r--r-- | remoting/host/chromoting_host.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc index 57f0f9b..346e887 100644 --- a/remoting/host/chromoting_host.cc +++ b/remoting/host/chromoting_host.cc @@ -285,17 +285,15 @@ void ChromotingHost::OnIncomingSession( return; } - scoped_ptr<protocol::SessionConfig> config = - protocol::SessionConfig::SelectCommon(session->candidate_config(), - protocol_config_.get()); - if (!config) { + protocol::SessionConfig config; + if (!protocol_config_->Select(session->candidate_config(), &config)) { LOG(WARNING) << "Rejecting connection from " << session->jid() << " because no compatible configuration has been found."; *response = protocol::SessionManager::INCOMPATIBLE; return; } - session->set_config(config.Pass()); + session->set_config(config); *response = protocol::SessionManager::ACCEPT; |