Remove XML FROM element in JingleSession::StartConnection

This element caused an assertion failure in libjingle at xmpp/xmppengineimpl.cc:367 when used from the client-side code.

Review URL: https://chromiumcodereview.appspot.com/16975019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207814 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 5 insertions, 2 deletions

diff --git a/remoting/protocol/jingle_messages.cc b/remoting/protocol/jingle_messages.cc
index 9fd8757..2a5b2f0 100644
--- a/remoting/protocol/jingle_messages.cc
+++ b/remoting/protocol/jingle_messages.cc
@@ -168,6 +168,7 @@ bool JingleMessage::ParseXml(const buzz::XmlElement* stanza,
 
   from = stanza->Attr(QName(kEmptyNamespace, "from"));
   to = stanza->Attr(QName(kEmptyNamespace, "to"));
+  initiator = jingle_tag->Attr(QName(kEmptyNamespace, "initiator"));
 
   std::string action_str = jingle_tag->Attr(QName(kEmptyNamespace, "action"));
   if (action_str.empty()) {
@@ -287,7 +288,7 @@ scoped_ptr<buzz::XmlElement> JingleMessage::ToXml() const {
   }
 
   if (action == SESSION_INITIATE)
-    jingle_tag->AddAttr(QName(kEmptyNamespace, "initiator"), from);
+    jingle_tag->AddAttr(QName(kEmptyNamespace, "initiator"), initiator);
 
   if (reason != UNKNOWN_REASON) {
     XmlElement* reason_tag = new XmlElement(QName(kJingleNamespace, "reason"));
diff --git a/remoting/protocol/jingle_messages.h b/remoting/protocol/jingle_messages.h
index 43dca4a..2b5feaa 100644
--- a/remoting/protocol/jingle_messages.h
+++ b/remoting/protocol/jingle_messages.h
@@ -71,6 +71,8 @@ struct JingleMessage {
   ActionType action;
   std::string sid;
 
+  std::string initiator;
+
   scoped_ptr<ContentDescription> description;
   std::list<NamedCandidate> candidates;
 
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index 6c91fac..ac67d4e 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -108,7 +108,7 @@ void JingleSession::StartConnection(
   // Send session-initiate message.
   JingleMessage message(peer_jid_, JingleMessage::SESSION_INITIATE,
                         session_id_);
-  message.from = session_manager_->signal_strategy_->GetLocalJid();
+  message.initiator = session_manager_->signal_strategy_->GetLocalJid();
   message.description.reset(
       new ContentDescription(candidate_config_->Clone(),
                              authenticator_->GetNextMessage()));