Add AUTHENTICATED session state.

remoting/protocol/pepper_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/pepper_session.h"
 
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 145 matching lines @@
 
 void PepperSession::set_config(const SessionConfig& config) {
   DCHECK(CalledOnValidThread());
   // set_config() should never be called on the client.
   NOTREACHED();
 }
 
 void PepperSession::Close() {
   DCHECK(CalledOnValidThread());
 
-  if (state_ == CONNECTING || state_ == CONNECTED) {
+  if (state_ == CONNECTING || state_ == CONNECTED || state_ == AUTHENTICATED) {
     // Send session-terminate message.
     JingleMessage message(peer_jid_, JingleMessage::SESSION_TERMINATE,
                           session_id_);
     scoped_ptr<IqRequest> terminate_request(
         session_manager_->iq_sender()->SendIq(
             message.ToXml(), IqSender::ReplyCallback()));
   }
 
   CloseInternal(false);
 }
@@ skipping 53 matching lines @@
     return;
   }
 
   if (!InitializeConfigFromDescription(message.description.get())) {
     OnError(INCOMPATIBLE_PROTOCOL);
     return;
   }
 
   SetState(CONNECTED);
 
+  if (authenticator_->state() == Authenticator::ACCEPTED)
+    SetState(AUTHENTICATED);
+
    // In case there is transport information in the accept message.
   ProcessTransportInfo(message);
 }
 
 void PepperSession::ProcessTransportInfo(const JingleMessage& message) {
   for (std::list<cricket::Candidate>::const_iterator it =
            message.candidates.begin();
        it != message.candidates.end(); ++it) {
     ChannelsMap::iterator channel = channels_.find(it->name());
     if (channel == channels_.end()) {
@@ skipping 17 matching lines @@
         break;
 
       default:
         LOG(WARNING) << "Received session-terminate message "
             "with an unexpected reason.";
         OnError(SESSION_REJECTED);
     }
     return;
   }
 
-  if (state_ == CONNECTED) {
+  if (state_ == CONNECTED || state_ == AUTHENTICATED) {
     if (message.reason == JingleMessage::GENERAL_ERROR) {
       OnError(CHANNEL_CONNECTION_ERROR);
     } else {
       CloseInternal(false);
     }
     return;
   }
 
   LOG(WARNING) << "Received unexpected session-terminate message.";
 }
@@ skipping 77 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