[Chromoting] Use google:remoting namespace to export remoting specific error codes

remoting/protocol/jingle_messages.cc

 // Copyright (c) 2012 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_messages.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/content_description.h"
@@ skipping 31 matching lines @@
   { JingleMessage::SESSION_INITIATE, "session-initiate" },
   { JingleMessage::SESSION_ACCEPT, "session-accept" },
   { JingleMessage::SESSION_TERMINATE, "session-terminate" },
   { JingleMessage::SESSION_INFO, "session-info" },
   { JingleMessage::TRANSPORT_INFO, "transport-info" },
 };
 
 const NameMapElement<JingleMessage::Reason> kReasons[] = {
   { JingleMessage::SUCCESS, "success" },
   { JingleMessage::DECLINE, "decline" },
-  { JingleMessage::SECURITY_ERROR, "security-error" },
   { JingleMessage::CANCEL, "cancel" },
   { JingleMessage::EXPIRED, "expired" },
   { JingleMessage::GENERAL_ERROR, "general-error" },
   { JingleMessage::FAILED_APPLICATION, "failed-application" },
   { JingleMessage::INCOMPATIBLE_PARAMETERS, "incompatible-parameters" },
 };
 
 bool ParseIceCredentials(const buzz::XmlElement* element,
                          IceTransportInfo::IceCredentials* credentials) {
   DCHECK(element->Name() == QName(kIceTransportNamespace, "credentials"));
@@ skipping 273 matching lines @@
 
   const XmlElement* reason_tag =
       jingle_tag->FirstNamed(QName(kJingleNamespace, "reason"));
   if (reason_tag && reason_tag->FirstElement()) {
     if (!NameToValue(kReasons, reason_tag->FirstElement()->Name().LocalPart(),
                      &reason)) {
       reason = UNKNOWN_REASON;
     }
   }
 
+  const XmlElement* error_code_tag =
+      jingle_tag->FirstNamed(QName(kChromotingXmlNamespace, "error-code"));
+  if (error_code_tag && !error_code_tag->BodyText().empty()) {
+    if (!ParseErrorCode(error_code_tag->BodyText(), &error_code)) {
+      LOG(WARNING) << "Unknown error-code received "
+                   << error_code_tag->BodyText();
+      error_code = UNKNOWN_ERROR;
+    }
+  }
+
   if (action == SESSION_TERMINATE)
     return true;
 
   const XmlElement* content_tag =
       jingle_tag->FirstNamed(QName(kJingleNamespace, "content"));
   if (!content_tag) {
     *error = "content tag is missing";
     return false;
   }
 
   std::string content_name = content_tag->Attr(QName(kEmptyNamespace, "name"));
   if (content_name != ContentDescription::kChromotingContentName) {
     *error = "Unexpected content name: " + content_name;
     return false;
   }
 
   const XmlElement* webrtc_transport_tag = content_tag->FirstNamed(
-      QName("google:remoting:webrtc", "transport"));
+      QName(kWebrtcTransportNamespace, "transport"));
   if (webrtc_transport_tag) {
     transport_info.reset(new buzz::XmlElement(*webrtc_transport_tag));
   }
 
   description.reset(nullptr);
   if (action == SESSION_INITIATE || action == SESSION_ACCEPT) {
     const XmlElement* description_tag = content_tag->FirstNamed(
         QName(kChromotingXmlNamespace, "description"));
     if (!description_tag) {
       *error = "Missing chromoting content description";
@@ skipping 43 matching lines @@
       jingle_tag->AddElement(new XmlElement(*info.get()));
     return root;
   }
 
   if (action == SESSION_INITIATE)
     jingle_tag->AddAttr(QName(kEmptyNamespace, "initiator"), initiator);
 
   if (reason != UNKNOWN_REASON) {
     XmlElement* reason_tag = new XmlElement(QName(kJingleNamespace, "reason"));
     jingle_tag->AddElement(reason_tag);
-    const char* reason_string =
-        ValueToName(kReasons, reason);
+    const char* reason_string = ValueToName(kReasons, reason);
     if (!reason_string)
       LOG(FATAL) << "Invalid reason: " << reason;
     reason_tag->AddElement(new XmlElement(
         QName(kJingleNamespace, reason_string)));
+
+    if (error_code != UNKNOWN_ERROR) {
+      XmlElement* error_code_tag =
+          new XmlElement(QName(kChromotingXmlNamespace, "error-code"));
+      jingle_tag->AddElement(error_code_tag);
+      const char* error_code_string = ErrorCodeToString(error_code);
+      DCHECK(error_code_string);

[Sergey Ulanov, 2016/06/07 16:22:23]

nit: don't need this. There is already NOTREACHED() in ValueToName() which would
fail for unknown error_code values. And then you can remove error_code_string
variable, and move ErrorCodeToString() inline.

[Hzj_jie, 2016/06/07 19:29:57]

I copied the similar logic from reason node above. I would prefer to change them
both.

[Sergey Ulanov, 2016/06/07 20:17:21]

I think that check for reason_string was added before ValueToName() had that
NOTREACHED() statement. See
https://codereview.chromium.org/8046018/diff/9013/remoting/protocol/jingle_me...
- that's where it was added. But it doesn't make sense there anymore. 

[Hzj_jie, 2016/06/07 20:20:43]

Yes, both have been removed in the latest iteration.

+      error_code_tag->SetBodyText(error_code_string);
+    }
   }
 
   if (action != SESSION_TERMINATE) {
     XmlElement* content_tag =
         new XmlElement(QName(kJingleNamespace, "content"));
     jingle_tag->AddElement(content_tag);
 
     content_tag->AddAttr(QName(kEmptyNamespace, "name"),
                          ContentDescription::kChromotingContentName);
     content_tag->AddAttr(QName(kEmptyNamespace, "creator"), "initiator");
@@ skipping 158 matching lines @@
     result->AddElement(FormatIceCredentials(credentials));
   }
   for (const NamedCandidate& candidate : candidates) {
     result->AddElement(FormatIceCandidate(candidate));
   }
   return result;
 }
 
 }  // namespace protocol
 }  // namespace remoting