Allow transport candidates to arrive before the authentication accepted message.

BUG=259598

Review URL: https://chromiumcodereview.appspot.com/18295009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211558 0039d316-1c4b-4281-b951-d872f2087c98

Author: rmsousa@chromium.org

remoting/protocol/jingle_session.cc

@@ -226,6 +226,20 @@ void JingleSession::Close() {
   CloseInternal(OK);
 }
 
+void JingleSession::AddPendingRemoteCandidates(Transport* channel,
+                                               const std::string& name) {
+  std::list<JingleMessage::NamedCandidate>::iterator it =
+      pending_remote_candidates_.begin();
+  while(it != pending_remote_candidates_.end()) {
+    if (it->name == name) {
+      channel->AddRemoteCandidate(it->candidate);
+      it = pending_remote_candidates_.erase(it);
+    } else {
+      ++it;
+    }
+  }
+}
+
 void JingleSession::CreateStreamChannel(
       const std::string& name,
       const StreamChannelCallback& callback) {
@@ -237,6 +251,7 @@ void JingleSession::CreateStreamChannel(
       session_manager_->transport_factory_->CreateStreamTransport();
   channel->Initialize(name, this, channel_authenticator.Pass());
   channel->Connect(callback);
+  AddPendingRemoteCandidates(channel.get(), name);
   channels_[name] = channel.release();
 }
 
@@ -251,6 +266,7 @@ void JingleSession::CreateDatagramChannel(
       session_manager_->transport_factory_->CreateDatagramTransport();
   channel->Initialize(name, this, channel_authenticator.Pass());
   channel->Connect(callback);
+  AddPendingRemoteCandidates(channel.get(), name);
   channels_[name] = channel.release();
 }
 
@@ -489,11 +505,13 @@ void JingleSession::ProcessTransportInfo(const JingleMessage& message) {
            message.candidates.begin();
        it != message.candidates.end(); ++it) {
     ChannelsMap::iterator channel = channels_.find(it->name);
-    if (channel == channels_.end()) {
-      LOG(WARNING) << "Received candidate for unknown channel " << it->name;
-      continue;
+    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);
     }
-    channel->second->AddRemoteCandidate(it->candidate);
   }
 }
 

remoting/protocol/jingle_session.h

@@ -86,6 +86,9 @@ class JingleSession : public Session,
                        scoped_ptr<Authenticator> authenticator,
                        scoped_ptr<CandidateSessionConfig> config);
 
+  // Adds to a new channel the remote candidates received before it was created.
+  void AddPendingRemoteCandidates(Transport* channel, const std::string& name);
+
   // Called by JingleSessionManager for incoming connections.
   void InitializeIncomingConnection(const JingleMessage& initiate_message,
                                     scoped_ptr<Authenticator> authenticator);
@@ -166,6 +169,9 @@ class JingleSession : public Session,
   base::OneShotTimer<JingleSession> transport_infos_timer_;
   std::list<JingleMessage::NamedCandidate> pending_candidates_;
 
+  // Pending remote candidates, received before the local channels were created.
+  std::list<JingleMessage::NamedCandidate> pending_remote_candidates_;
+
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };