Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / p2p / base / port.cc

diff --git a/src/third_party/libjingle/source/talk/p2p/base/port.cc b/src/third_party/libjingle/source/talk/p2p/base/port.cc
index e054060..ad692ce 100644 (file)
--- a/src/third_party/libjingle/source/talk/p2p/base/port.cc
+++ b/src/third_party/libjingle/source/talk/p2p/base/port.cc
@@ -248,6 +248,7 @@ Connection* Port::GetConnection(const talk_base::SocketAddress& remote_addr) {
 
 void Port::AddAddress(const talk_base::SocketAddress& address,
                       const talk_base::SocketAddress& base_address,
+                      const talk_base::SocketAddress& related_address,
                       const std::string& protocol,
                       const std::string& type,
                       uint32 type_preference,
@@ -263,7 +264,7 @@ void Port::AddAddress(const talk_base::SocketAddress& address,
   c.set_password(password_);
   c.set_network_name(network_->name());
   c.set_generation(generation_);
-  c.set_related_address(related_address_);
+  c.set_related_address(related_address);
   c.set_foundation(ComputeFoundation(type, protocol, base_address));
   candidates_.push_back(c);
   SignalCandidateReady(this, c);
@@ -1197,15 +1198,14 @@ std::string Connection::ToString() const {
      << ":" << local.type() << ":" << local.protocol()
      << ":" << local.address().ToSensitiveString()
      << "->" << remote.id() << ":" << remote.component()
-     << ":" << remote.generation()
+     << ":" << remote.preference()
      << ":" << remote.type() << ":"
-     << remote.protocol() << ":" << remote.address().ToSensitiveString()
-     << "|"
+     << remote.protocol() << ":" << remote.address().ToSensitiveString() << "|"
      << CONNECT_STATE_ABBREV[connected()]
      << READ_STATE_ABBREV[read_state()]
      << WRITE_STATE_ABBREV[write_state()]
-     << ICESTATE[state()]
-     << "|";
+     << ICESTATE[state()] << "|"
+     << priority() << "|";
   if (rtt_ < DEFAULT_RTT) {
     ss << rtt_ << "]";
   } else {