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

Unified Diff: remoting/protocol/jingle_session_manager.cc

Issue 10160012: Pass TransportConfig to TransportFactory instead of Transport. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
Index: remoting/protocol/jingle_session_manager.cc
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index b5c0339952f1691f558a342a8569bdae85863606..c2e45adc5739727e3673d419c450431334941baf 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -12,6 +12,8 @@
#include "remoting/protocol/content_description.h"
#include "remoting/protocol/jingle_messages.h"
#include "remoting/protocol/jingle_session.h"
+#include "remoting/protocol/transport.h"
+#include "remoting/protocol/transport_config.h"
#include "third_party/libjingle/source/talk/base/socketaddress.h"
#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
@@ -52,14 +54,18 @@ void JingleSessionManager::OnJingleInfo(
const std::vector<talk_base::SocketAddress>& stun_hosts) {
DCHECK(CalledOnValidThread());
+ TransportConfig config;
Wez 2012/04/27 23:49:15 nit: Move this below the comment, to immediately p
Sergey Ulanov 2012/04/28 00:18:19 Done.
+
// TODO(sergeyu): Add support for multiple STUN/relay servers when
// it's implemented in libjingle and P2P Transport API.
- transport_config_.stun_server = stun_hosts[0].ToString();
- transport_config_.relay_server = relay_hosts[0];
- transport_config_.relay_token = relay_token;
- VLOG(1) << "STUN server: " << transport_config_.stun_server
- << " Relay server: " << transport_config_.relay_server
- << " Relay token: " << transport_config_.relay_token;
+ config.stun_server = stun_hosts[0].ToString();
+ config.relay_server = relay_hosts[0];
+ config.relay_token = relay_token;
+ VLOG(1) << "STUN server: " << config.stun_server
+ << " Relay server: " << config.relay_server
+ << " Relay token: " << config.relay_token;
+
+ transport_factory_->SetConfig(config);
Wez 2012/04/27 23:49:15 nit: Move this to immediately follow the setters,
Sergey Ulanov 2012/04/28 00:18:19 Done.
if (!ready_) {
ready_ = true;

Powered by Google App Engine
This is Rietveld 408576698