[Chromoting] Plugin message in JingleMessage

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 324 matching lines @@
     *error = "Unknown action " + action_str;
     return false;
   }
 
   sid = jingle_tag->Attr(QName(kEmptyNamespace, "sid"));
   if (sid.empty()) {
     *error = "sid attribute is missing";
     return false;
   }
 
+  const XmlElement* plugin_tag =
+      jingle_tag->FirstNamed(QName(kChromotingXmlNamespace, "plugin"));
+  if (plugin_tag) {
+    plugin_message.reset(new XmlElement(*plugin_tag));
+  } else {
+    plugin_message.reset(nullptr);

[Sergey Ulanov, 2016/12/14 01:31:50]

don't need nullptr.

[Hzj_jie, 2016/12/14 20:03:48]

Done, also several other resets.

+  }
+
   if (action == SESSION_INFO) {
     // session-info messages may contain arbitrary information not
     // defined by the Jingle protocol. We don't need to parse it.
     const XmlElement* child = jingle_tag->FirstElement();
+    // Plugin messages are action independent, which should not be considered as
+    // session-info.
+    if (child == plugin_tag) {
+      child = child->NextElement();
+    }
     if (child) {
       // session-info is allowed to be empty.
       info.reset(new XmlElement(*child));
     } else {
       info.reset(nullptr);
     }
     return true;
   }
 
   const XmlElement* reason_tag =
@@ skipping 77 matching lines @@
   root->AddElement(jingle_tag);
   jingle_tag->AddAttr(QName(kEmptyNamespace, "sid"), sid);
   SetAddress(root.get(), jingle_tag, to, false);
   SetAddress(root.get(), jingle_tag, from, true);
 
   const char* action_attr = ValueToName(kActionTypes, action);
   if (!action_attr)
     LOG(FATAL) << "Invalid action value " << action;
   jingle_tag->AddAttr(QName(kEmptyNamespace, "action"), action_attr);
 
+  if (plugin_message) {
+    jingle_tag->AddElement(new XmlElement(*plugin_message));
+  }
+
   if (action == SESSION_INFO) {
     if (info.get())
       jingle_tag->AddElement(new XmlElement(*info.get()));
     return root;
   }
 
   if (action == SESSION_INITIATE)
     jingle_tag->AddAttr(QName(kEmptyNamespace, "initiator"), initiator);
 
   if (reason != UNKNOWN_REASON) {
@@ skipping 183 matching lines @@
     result->AddElement(FormatIceCredentials(credentials));
   }
   for (const NamedCandidate& candidate : candidates) {
     result->AddElement(FormatIceCandidate(candidate));
   }
   return result;
 }
 
 }  // namespace protocol
 }  // namespace remoting