Move SSL layer initialization into ChannelAuthenticator implementations.

remoting/protocol/jingle_session.cc

 // Copyright (c) 2011 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/protocol/jingle_session.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "crypto/hmac.h"
 #include "crypto/rsa_private_key.h"
 #include "net/base/net_errors.h"
 #include "net/socket/stream_socket.h"
 #include "remoting/base/constants.h"
+#include "remoting/protocol/simple_client_channel_authenticator.h"
+#include "remoting/protocol/simple_host_channel_authenticator.h"
 #include "remoting/protocol/jingle_datagram_connector.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/jingle_stream_connector.h"
 #include "third_party/libjingle/source/talk/base/thread.h"
 #include "third_party/libjingle/source/talk/p2p/base/p2ptransportchannel.h"
 #include "third_party/libjingle/source/talk/p2p/base/session.h"
 #include "third_party/libjingle/source/talk/p2p/base/transport.h"
 
 using cricket::BaseSession;
 
@@ skipping 393 matching lines @@
       cricket_session_->CreateChannel(content_name, name);
 
   if (!jingle_session_manager_->allow_nat_traversal_ &&
       !cricket_session_->initiator()) {
     // Don't make outgoing connections from the host to client when
     // NAT traversal is disabled.
     raw_channel->GetP2PChannel()->set_incoming_only(true);
   }
 
   channel_connectors_[name] = connector;
-  connector->Connect(cricket_session_->initiator(), local_cert_,
-                     remote_cert_, local_private_key_.get(), raw_channel);
+  ChannelAuthenticator* authenticator;
+  if (cricket_session_->initiator()) {
+    authenticator = new SimpleClientChannelAuthenticator(
+        remote_cert_, shared_secret_);
+  } else {
+    authenticator = new SimpleHostChannelAuthenticator(
+        local_cert_, local_private_key_.get(), shared_secret_);
+  }

[Wez, 2011/11/22 22:29:48]

Is the intent for this code to be replaced with calls to
Authenticator::CreateChannelAuthenticator() in a follow-up CL?

[Sergey Ulanov, 2011/11/23 01:23:42]

Yes, and I have it cooking: http://codereview.chromium.org/8619011/

+  connector->Connect(authenticator, raw_channel);
 
   // Workaround bug in libjingle - it doesn't connect channels if they
   // are created after the session is accepted. See crbug.com/89384.
   // TODO(sergeyu): Fix the bug and remove this line.
   cricket_session_->GetTransport(content_name)->ConnectChannels();
 }
 
 void JingleSession::OnChannelConnectorFinished(
     const std::string& name, JingleChannelConnector* connector) {
   DCHECK(CalledOnValidThread());
@@ skipping 51 matching lines @@
     DCHECK_NE(state_, FAILED);
 
     state_ = new_state;
     if (!state_change_callback_.is_null())
       state_change_callback_.Run(new_state);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting