Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Unified Diff: remoting/host/chromoting_host.cc

Issue 1085703003: Use standard ICE in Chromoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix crash on memory bots Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/plugin/chromoting_instance.cc ('k') | remoting/host/chromoting_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromoting_host.cc
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 346e887fc46c48feeb636215fd889f0b6af92057..57f0f9b62302d051cb71997d20706c63ec3fcf3a 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -285,15 +285,17 @@ void ChromotingHost::OnIncomingSession(
return;
}
- protocol::SessionConfig config;
- if (!protocol_config_->Select(session->candidate_config(), &config)) {
+ scoped_ptr<protocol::SessionConfig> config =
+ protocol::SessionConfig::SelectCommon(session->candidate_config(),
+ protocol_config_.get());
+ if (!config) {
LOG(WARNING) << "Rejecting connection from " << session->jid()
<< " because no compatible configuration has been found.";
*response = protocol::SessionManager::INCOMPATIBLE;
return;
}
- session->set_config(config);
+ session->set_config(config.Pass());
*response = protocol::SessionManager::ACCEPT;
« no previous file with comments | « remoting/client/plugin/chromoting_instance.cc ('k') | remoting/host/chromoting_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698