Move the routing-info inside the jingle element.

remoting/signaling/xmpp_signal_strategy.cc

 // Copyright 2014 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/signaling/xmpp_signal_strategy.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 241 matching lines @@
 }
 
 void XmppSignalStrategy::Core::SetAuthInfo(const std::string& username,
                                            const std::string& auth_token) {
   DCHECK(thread_checker_.CalledOnValidThread());
   xmpp_server_config_.username = username;
   xmpp_server_config_.auth_token = auth_token;
 }
 
 void XmppSignalStrategy::Core::SendMessage(const std::string& message) {
+  HOST_LOG(INFO) << "============= Outgoing Stanza ==========================";
+  HOST_LOG(INFO) << message;
+
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(tls_state_ == TlsState::NOT_REQUESTED ||
          tls_state_ == TlsState::CONNECTED);
 
   scoped_refptr<net::IOBufferWithSize> buffer =
       new net::IOBufferWithSize(message.size());
   memcpy(buffer->data(), message.data(), message.size());
   writer_->Write(buffer,
                  base::Bind(&Core::OnMessageSent, base::Unretained(this)));
 }
@@ skipping 68 matching lines @@
 
   if (tls_state_ == TlsState::WAITING_FOR_FLUSH &&
       !writer_->has_data_pending()) {
     StartTls();
   }
 }
 
 void XmppSignalStrategy::Core::OnStanza(
     const std::unique_ptr<buzz::XmlElement> stanza) {
   DCHECK(thread_checker_.CalledOnValidThread());
-
+  HOST_LOG(INFO) << "============= Incoming Stanza ==========================";
+  HOST_LOG(INFO) << stanza->Str();
   base::ObserverListBase<Listener>::Iterator it(&listeners_);
   for (Listener* listener = it.GetNext(); listener; listener = it.GetNext()) {
     if (listener->OnSignalStrategyIncomingStanza(stanza.get()))
       return;
   }
 }
 
 void XmppSignalStrategy::Core::OnParserError() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ skipping 172 matching lines @@
 std::string XmppSignalStrategy::GetNextId() {
   return base::Uint64ToString(base::RandUint64());
 }
 
 void XmppSignalStrategy::SetAuthInfo(const std::string& username,
                                      const std::string& auth_token) {
   core_->SetAuthInfo(username, auth_token);
 }
 
 }  // namespace remoting