Revert of Add TransportSession interface to prepare for WebRTC-based transport.

remoting/protocol/jingle_session.cc

Index: remoting/protocol/jingle_session.cc
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index 79654d13cab7dd913be5d803bd479e175ec14b37..bff155d3d8518dc27b11925d6244f87906d334e8 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -13,11 +13,16 @@
 #include "base/time/time.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/authenticator.h"
+#include "remoting/protocol/channel_authenticator.h"
+#include "remoting/protocol/channel_multiplexer.h"
 #include "remoting/protocol/content_description.h"
 #include "remoting/protocol/jingle_messages.h"
 #include "remoting/protocol/jingle_session_manager.h"
+#include "remoting/protocol/pseudotcp_channel_factory.h"
 #include "remoting/protocol/quic_channel_factory.h"
+#include "remoting/protocol/secure_channel_factory.h"
 #include "remoting/protocol/session_config.h"
+#include "remoting/protocol/stream_channel_factory.h"
 #include "remoting/signaling/iq_sender.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 #include "third_party/webrtc/p2p/base/candidate.h"
@@ -28,6 +33,11 @@
 namespace protocol {
 
 namespace {
+
+// Delay after candidate creation before sending transport-info message to
+// accumulate multiple candidates. This is an optimization to reduce number of
+// transport-info messages.
+const int kTransportInfoSendDelayMs = 20;
 
 // How long we should wait for a response from the other end. This value is used
 // for all requests except |transport-info|.
@@ -41,6 +51,9 @@
 
 // Timeout for the transport-info messages.
 const int kTransportInfoTimeout = 10 * 60;
+
+// Name of the multiplexed channel.
+const char kMuxChannelName[] = "mux";
 
 ErrorCode AuthRejectionReasonToErrorCode(
     Authenticator::RejectionReason reason) {
@@ -65,13 +78,14 @@
 }
 
 JingleSession::~JingleSession() {
+  channel_multiplexer_.reset();
   quic_channel_factory_.reset();
-  transport_session_.reset();
-
   STLDeleteContainerPointers(pending_requests_.begin(),
                              pending_requests_.end());
   STLDeleteContainerPointers(transport_info_requests_.begin(),
                              transport_info_requests_.end());
+
+  DCHECK(channels_.empty());
 
   session_manager_->SessionDestroyed(this);
 }
@@ -102,8 +116,6 @@
   // clients generate the same session ID concurrently.
   session_id_ = base::Uint64ToString(base::RandGenerator(kuint64max));
 
-  transport_session_ =
-      session_manager_->transport_factory_->CreateTransportSession();
   quic_channel_factory_.reset(new QuicChannelFactory(session_id_, false));
 
   // Send session-initiate message.
@@ -150,9 +162,6 @@
       CloseInternal(INCOMPATIBLE_PROTOCOL);
     }
   }
-
-  transport_session_ =
-      session_manager_->transport_factory_->CreateTransportSession();
 }
 
 void JingleSession::AcceptIncomingConnection(
@@ -222,9 +231,18 @@
   return *config_;
 }
 
-TransportSession* JingleSession::GetTransportSession() {
-  DCHECK(CalledOnValidThread());
-  return transport_session_.get();
+StreamChannelFactory* JingleSession::GetTransportChannelFactory() {
+  DCHECK(CalledOnValidThread());
+  return secure_channel_factory_.get();
+}
+
+StreamChannelFactory* JingleSession::GetMultiplexedChannelFactory() {
+  DCHECK(CalledOnValidThread());
+  if (!channel_multiplexer_.get()) {
+    channel_multiplexer_.reset(
+        new ChannelMultiplexer(GetTransportChannelFactory(), kMuxChannelName));
+  }
+  return channel_multiplexer_.get();
 }
 
 StreamChannelFactory* JingleSession::GetQuicChannelFactory() {
@@ -236,6 +254,81 @@
   DCHECK(CalledOnValidThread());
 
   CloseInternal(OK);
+}
+
+void JingleSession::AddPendingRemoteTransportInfo(Transport* channel) {
+  std::list<JingleMessage::IceCredentials>::iterator credentials =
+      pending_remote_ice_credentials_.begin();
+  while (credentials != pending_remote_ice_credentials_.end()) {
+    if (credentials->channel == channel->name()) {
+      channel->SetRemoteCredentials(credentials->ufrag, credentials->password);
+      credentials = pending_remote_ice_credentials_.erase(credentials);
+    } else {
+      ++credentials;
+    }
+  }
+
+  std::list<JingleMessage::NamedCandidate>::iterator candidate =
+      pending_remote_candidates_.begin();
+  while (candidate != pending_remote_candidates_.end()) {
+    if (candidate->name == channel->name()) {
+      channel->AddRemoteCandidate(candidate->candidate);
+      candidate = pending_remote_candidates_.erase(candidate);
+    } else {
+      ++candidate;
+    }
+  }
+}
+
+void JingleSession::CreateChannel(const std::string& name,
+                                  const ChannelCreatedCallback& callback) {
+  DCHECK(!channels_[name]);
+
+  scoped_ptr<Transport> channel =
+      session_manager_->transport_factory_->CreateTransport();
+  channel->Connect(name, this, callback);
+  AddPendingRemoteTransportInfo(channel.get());
+  channels_[name] = channel.release();
+}
+
+void JingleSession::CancelChannelCreation(const std::string& name) {
+  ChannelsMap::iterator it = channels_.find(name);
+  if (it != channels_.end()) {
+    DCHECK(!it->second->is_connected());
+    delete it->second;
+    DCHECK(channels_.find(name) == channels_.end());
+  }
+}
+
+void JingleSession::OnTransportIceCredentials(Transport* transport,
+                                              const std::string& ufrag,
+                                              const std::string& password) {
+  EnsurePendingTransportInfoMessage();
+  pending_transport_info_message_->ice_credentials.push_back(
+      JingleMessage::IceCredentials(transport->name(), ufrag, password));
+}
+
+void JingleSession::OnTransportCandidate(Transport* transport,
+                                         const cricket::Candidate& candidate) {
+  EnsurePendingTransportInfoMessage();
+  pending_transport_info_message_->candidates.push_back(
+      JingleMessage::NamedCandidate(transport->name(), candidate));
+}
+
+void JingleSession::OnTransportRouteChange(Transport* transport,
+                                           const TransportRoute& route) {
+  if (event_handler_)
+    event_handler_->OnSessionRouteChange(transport->name(), route);
+}
+
+void JingleSession::OnTransportFailed(Transport* transport) {
+  CloseInternal(CHANNEL_CONNECTION_ERROR);
+}
+
+void JingleSession::OnTransportDeleted(Transport* transport) {
+  ChannelsMap::iterator it = channels_.find(transport->name());
+  DCHECK_EQ(it->second, transport);
+  channels_.erase(it);
 }
 
 void JingleSession::SendMessage(const JingleMessage& message) {
@@ -293,14 +386,31 @@
   }
 }
 
-void JingleSession::OnOutgoingTransportInfo(
-    scoped_ptr<XmlElement> transport_info) {
-  JingleMessage message(peer_jid_, JingleMessage::TRANSPORT_INFO, session_id_);
-  message.transport_info = transport_info.Pass();
+void JingleSession::EnsurePendingTransportInfoMessage() {
+  // |transport_info_timer_| must be running iff
+  // |pending_transport_info_message_| exists.
+  DCHECK_EQ(pending_transport_info_message_ != nullptr,
+            transport_info_timer_.IsRunning());
+
+  if (!pending_transport_info_message_) {
+    pending_transport_info_message_.reset(new JingleMessage(
+        peer_jid_, JingleMessage::TRANSPORT_INFO, session_id_));
+    // Delay sending the new candidates in case we get more candidates
+    // that we can send in one message.
+    transport_info_timer_.Start(
+        FROM_HERE, base::TimeDelta::FromMilliseconds(kTransportInfoSendDelayMs),
+        this, &JingleSession::SendTransportInfo);
+  }
+}
+
+void JingleSession::SendTransportInfo() {
+  DCHECK(pending_transport_info_message_);
 
   scoped_ptr<IqRequest> request = session_manager_->iq_sender()->SendIq(
-      message.ToXml(), base::Bind(&JingleSession::OnTransportInfoResponse,
-                                  base::Unretained(this)));
+      pending_transport_info_message_->ToXml(),
+      base::Bind(&JingleSession::OnTransportInfoResponse,
+                 base::Unretained(this)));
+  pending_transport_info_message_.reset();
   if (request) {
     request->SetTimeout(base::TimeDelta::FromSeconds(kTransportInfoTimeout));
     transport_info_requests_.push_back(request.release());
@@ -309,15 +419,6 @@
   }
 }
 
-void JingleSession::OnTransportRouteChange(const std::string& channel_name,
-                                           const TransportRoute& route) {
-  event_handler_->OnSessionRouteChange(channel_name, route);
-}
-
-void JingleSession::OnTransportError(ErrorCode error) {
-  CloseInternal(error);
-}
-
 void JingleSession::OnTransportInfoResponse(IqRequest* request,
                                             const buzz::XmlElement* response) {
   DCHECK(!transport_info_requests_.empty());
@@ -368,12 +469,8 @@
       break;
 
     case JingleMessage::TRANSPORT_INFO:
-      if (transport_session_->ProcessTransportInfo(
-              message.transport_info.get())) {
-        reply_callback.Run(JingleMessageReply::NONE);
-      } else {
-        reply_callback.Run(JingleMessageReply::BAD_REQUEST);
-      }
+      reply_callback.Run(JingleMessageReply::NONE);
+      ProcessTransportInfo(message);
       break;
 
     case JingleMessage::SESSION_TERMINATE:
@@ -445,6 +542,34 @@
 
   authenticator_->ProcessMessage(message.info.get(), base::Bind(
       &JingleSession::ProcessAuthenticationStep, base::Unretained(this)));
+}
+
+void JingleSession::ProcessTransportInfo(const JingleMessage& message) {
+  for (std::list<JingleMessage::IceCredentials>::const_iterator it =
+           message.ice_credentials.begin();
+       it != message.ice_credentials.end(); ++it) {
+    ChannelsMap::iterator channel = channels_.find(it->channel);
+    if (channel != channels_.end()) {
+      channel->second->SetRemoteCredentials(it->ufrag, it->password);
+    } else {
+      // Transport info was received before the channel was created.
+      // This could happen due to messages being reordered on the wire.
+      pending_remote_ice_credentials_.push_back(*it);
+    }
+  }
+
+  for (std::list<JingleMessage::NamedCandidate>::const_iterator it =
+           message.candidates.begin();
+       it != message.candidates.end(); ++it) {
+    ChannelsMap::iterator channel = channels_.find(it->name);
+    if (channel != channels_.end()) {
+      channel->second->AddRemoteCandidate(it->candidate);
+    } else {
+      // Transport info was received before the channel was created.
+      // This could happen due to messages being reordered on the wire.
+      pending_remote_candidates_.push_back(*it);
+    }
+  }
 }
 
 void JingleSession::OnTerminate(const JingleMessage& message,
@@ -547,13 +672,13 @@
 }
 
 void JingleSession::OnAuthenticated() {
-  transport_session_->Start(this, authenticator_.get());
-
-  if (quic_channel_factory_) {
-    quic_channel_factory_->Start(
-        transport_session_->GetDatagramChannelFactory(),
-        authenticator_->GetAuthKey());
-  }
+  pseudotcp_channel_factory_.reset(new PseudoTcpChannelFactory(this));
+  secure_channel_factory_.reset(
+      new SecureChannelFactory(pseudotcp_channel_factory_.get(),
+                               authenticator_.get()));
+
+  if (quic_channel_factory_)
+    quic_channel_factory_->Start(this, authenticator_->GetAuthKey());
 
   SetState(AUTHENTICATED);
 }