Roll libjingle 132:133

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/string_number_conversions.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/content_description.h"
-#include "third_party/libjingle/source/talk/p2p/base/candidate.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
 using buzz::QName;
 using buzz::XmlElement;
 
 namespace remoting {
 namespace protocol {
 
 const char kJabberNamespace[] = "jabber:client";
 const char kJingleNamespace[] = "urn:xmpp:jingle:1";
@@ skipping 43 matching lines @@
 
 const NameMapElement<JingleMessage::Reason> kReasons[] = {
   { JingleMessage::SUCCESS, "success" },
   { JingleMessage::DECLINE, "decline" },
   { JingleMessage::CANCEL, "cancel" },
   { JingleMessage::GENERAL_ERROR, "general-error" },
   { JingleMessage::INCOMPATIBLE_PARAMETERS, "incompatible-parameters" },
 };
 
 bool ParseCandidate(const buzz::XmlElement* element,
-                    cricket::Candidate* candidate) {
+                    JingleMessage::NamedCandidate* candidate) {
   DCHECK(element->Name() == QName(kP2PTransportNamespace, "candidate"));
 
   const std::string& name = element->Attr(QName(kEmptyNamespace, "name"));
   const std::string& address = element->Attr(QName(kEmptyNamespace, "address"));
   const std::string& port_str = element->Attr(QName(kEmptyNamespace, "port"));
   const std::string& type = element->Attr(QName(kEmptyNamespace, "type"));
   const std::string& protocol =
       element->Attr(QName(kEmptyNamespace, "protocol"));
   const std::string& username =
       element->Attr(QName(kEmptyNamespace, "username"));
   const std::string& password =
       element->Attr(QName(kEmptyNamespace, "password"));
   const std::string& preference_str =
       element->Attr(QName(kEmptyNamespace, "preference"));
   const std::string& generation_str =
       element->Attr(QName(kEmptyNamespace, "generation"));
 
   int port;
   double preference;
   int generation;
   if (name.empty() || address.empty() || !base::StringToInt(port_str, &port) ||
       port < kPortMin || port > kPortMax || type.empty() || protocol.empty() ||
       username.empty() || password.empty() ||
       !base::StringToDouble(preference_str, &preference) ||
       !base::StringToInt(generation_str, &generation)) {
     return false;
   }
 
-  candidate->set_name(name);
-  candidate->set_address(talk_base::SocketAddress(address, port));
-  candidate->set_type(type);
-  candidate->set_protocol(protocol);
-  candidate->set_username(username);
-  candidate->set_password(password);
-  candidate->set_preference(static_cast<float>(preference));
-  candidate->set_generation(generation);
+  candidate->name = name;
+
+  candidate->candidate.set_address(talk_base::SocketAddress(address, port));
+  candidate->candidate.set_type(type);
+  candidate->candidate.set_protocol(protocol);
+  candidate->candidate.set_username(username);
+  candidate->candidate.set_password(password);
+  candidate->candidate.set_preference(static_cast<float>(preference));
+  candidate->candidate.set_generation(generation);
 
   return true;
 }
 
-XmlElement* FormatCandidate(const cricket::Candidate& candidate) {
+XmlElement* FormatCandidate(const JingleMessage::NamedCandidate& candidate) {
   XmlElement* result =
       new XmlElement(QName(kP2PTransportNamespace, "candidate"));
-  result->SetAttr(QName(kEmptyNamespace, "name"), candidate.name());
+  result->SetAttr(QName(kEmptyNamespace, "name"), candidate.name);
   result->SetAttr(QName(kEmptyNamespace, "address"),
-                  candidate.address().IPAsString());
+                  candidate.candidate.address().IPAsString());
   result->SetAttr(QName(kEmptyNamespace, "port"),
-                  base::IntToString(candidate.address().port()));
-  result->SetAttr(QName(kEmptyNamespace, "type"), candidate.type());
-  result->SetAttr(QName(kEmptyNamespace, "protocol"), candidate.protocol());
-  result->SetAttr(QName(kEmptyNamespace, "username"), candidate.username());
-  result->SetAttr(QName(kEmptyNamespace, "password"), candidate.password());
+                  base::IntToString(candidate.candidate.address().port()));
+  result->SetAttr(QName(kEmptyNamespace, "type"), candidate.candidate.type());
+  result->SetAttr(QName(kEmptyNamespace, "protocol"),
+                  candidate.candidate.protocol());
+  result->SetAttr(QName(kEmptyNamespace, "username"),
+                  candidate.candidate.username());
+  result->SetAttr(QName(kEmptyNamespace, "password"),
+                  candidate.candidate.password());
   result->SetAttr(QName(kEmptyNamespace, "preference"),
-                  base::DoubleToString(candidate.preference()));
+                  base::DoubleToString(candidate.candidate.preference()));
   result->SetAttr(QName(kEmptyNamespace, "generation"),
-                  base::IntToString(candidate.generation()));
+                  base::IntToString(candidate.candidate.generation()));
   return result;
 }
 
 }  // namespace
 
+JingleMessage::NamedCandidate::NamedCandidate() {
+}
+
+JingleMessage::NamedCandidate::NamedCandidate(
+    const std::string& name,
+    const cricket::Candidate& candidate)
+    : name(name),
+      candidate(candidate) {
+}
+
 // static
 bool JingleMessage::IsJingleMessage(const buzz::XmlElement* stanza) {
   return
       stanza->Name() == QName(kJabberNamespace, "iq") &&
       stanza->Attr(QName("", "type")) == "set" &&
       stanza->FirstNamed(QName(kJingleNamespace, "jingle")) != NULL;
 }
 
 // static
 std::string JingleMessage::GetActionName(ActionType action) {
@@ skipping 108 matching lines @@
 
   candidates.clear();
   const XmlElement* transport_tag = content_tag->FirstNamed(
       QName(kP2PTransportNamespace, "transport"));
   if (transport_tag) {
     QName qn_candidate(kP2PTransportNamespace, "candidate");
     for (const XmlElement* candidate_tag =
              transport_tag->FirstNamed(qn_candidate);
          candidate_tag != NULL;
          candidate_tag = candidate_tag->NextNamed(qn_candidate)) {
-      cricket::Candidate candidate;
+      NamedCandidate candidate;
       if (!ParseCandidate(candidate_tag, &candidate)) {
         *error = "Failed to parse candidates";
         return false;
       }
       candidates.push_back(candidate);
     }
   }
 
   return true;
 }
@@ skipping 47 matching lines @@
     content_tag->AddAttr(QName(kEmptyNamespace, "name"),
                          ContentDescription::kChromotingContentName);
     content_tag->AddAttr(QName(kEmptyNamespace, "creator"), "initiator");
 
     if (description.get())
       content_tag->AddElement(description->ToXml());
 
     XmlElement* transport_tag =
         new XmlElement(QName(kP2PTransportNamespace, "transport"), true);
     content_tag->AddElement(transport_tag);
-    for (std::list<cricket::Candidate>::const_iterator it = candidates.begin();
+    for (std::list<NamedCandidate>::const_iterator it = candidates.begin();
          it != candidates.end(); ++it) {
       transport_tag->AddElement(FormatCandidate(*it));
     }
   }
 
   return root.Pass();
 }
 
 JingleMessageReply::JingleMessageReply()
     : type(REPLY_RESULT),
@@ skipping 91 matching lines @@
     text_elem->SetAttr(QName(kXmlNamespace, "lang"), "en");
     text_elem->SetBodyText(error_text);
     error->AddElement(text_elem);
   }
 
   return iq.Pass();
 }
 
 }  // namespace protocol
 }  // namespace remoting