Multi-step authentication support in JingleSession.

remoting/protocol/content_description.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/content_description.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
+#include "remoting/protocol/authenticator.h"

[Wez, 2011/12/03 00:21:05]

This goes below remoting/base/constants.h

[Sergey Ulanov, 2011/12/06 19:37:07]

Done.

 #include "remoting/base/constants.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
 using buzz::QName;
 using buzz::XmlElement;
 
 namespace remoting {
 namespace protocol {
 
 const char ContentDescription::kChromotingContentName[] = "chromoting";
 
 namespace {
 
 const char kDefaultNs[] = "";
 
 // Following constants are used to format session description in XML.
 const char kDescriptionTag[] = "description";
 const char kControlTag[] = "control";
 const char kEventTag[] = "event";
 const char kVideoTag[] = "video";
 const char kResolutionTag[] = "initial-resolution";
-const char kAuthenticationTag[] = "authentication";
 
 const char kTransportAttr[] = "transport";
 const char kVersionAttr[] = "version";
 const char kCodecAttr[] = "codec";
 const char kWidthAttr[] = "width";
 const char kHeightAttr[] = "height";
 
 const char kStreamTransport[] = "stream";
 const char kDatagramTransport[] = "datagram";
 const char kSrtpTransport[] = "srtp";
@@ skipping 150 matching lines @@
       QName(kChromotingXmlNamespace, kResolutionTag));
   resolution_tag->AddAttr(QName(kDefaultNs, kWidthAttr),
                           base::IntToString(
                               config()->initial_resolution().width));
   resolution_tag->AddAttr(QName(kDefaultNs, kHeightAttr),
                           base::IntToString(
                               config()->initial_resolution().height));
   root->AddElement(resolution_tag);
 
   if (authenticator_message_.get()) {
-    DCHECK(authenticator_message_->Name() ==
-           QName(kChromotingXmlNamespace, kAuthenticationTag));
+    DCHECK(Authenticator::IsAuthenticatorMessage(authenticator_message_.get()));
     root->AddElement(new XmlElement(*authenticator_message_));
   }
 
   return root;
 }
 
 // static
 ContentDescription* ContentDescription::ParseXml(
     const XmlElement* element) {
   if (element->Name() == QName(kChromotingXmlNamespace, kDescriptionTag)) {
@@ skipping 46 matching lines @@
                            &height)) {
       return NULL;
     }
     ScreenResolution resolution(width, height);
     if (!resolution.IsValid())
       return NULL;
 
     *config->mutable_initial_resolution() = resolution;
 
     scoped_ptr<XmlElement> authenticator_message;
-    child = element->FirstNamed(QName(kChromotingXmlNamespace,
-                                      kAuthenticationTag));
+    child = Authenticator::FindAuthenticatorMessage(element);
     if (child)
       authenticator_message.reset(new XmlElement(*child));
 
     return new ContentDescription(
         config.release(), authenticator_message.release());
   }
   LOG(ERROR) << "Invalid description: " << element->Str();
   return NULL;
 }
 
 }  // namespace protocol
 }  // namespace remoting