Log IP/port of host as well as client in Me2Me host

remoting/protocol/jingle_session.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_session.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 489 matching lines @@
 
 void JingleSession::OnChannelConnectorFinished(
     const std::string& name, JingleChannelConnector* connector) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(channel_connectors_[name], connector);
   channel_connectors_.erase(name);
 }
 
 void JingleSession::OnRouteChange(cricket::TransportChannel* channel,
                                   const cricket::Candidate& candidate) {
   net::IPEndPoint end_point;

[Sergey Ulanov, 2012/02/02 01:10:23]

s/end_point/remote_end_point/?

[Lambros, 2012/02/02 01:48:12]

Done.

   if (!jingle_glue::SocketAddressToIPEndPoint(candidate.address(),
                                               &end_point)) {
     NOTREACHED();
     return;
   }
 
+  const cricket::Candidate& local_candidate =
+      channel->GetP2PChannel()->best_connection()->local_candidate();

[Sergey Ulanov, 2012/02/02 01:10:23]

add DCHECK(channel->GetP2PChannel()) and
DCHECK(channel->GetP2PChannel()->best_connection())

[Lambros, 2012/02/02 01:48:12]

Done.

+  net::IPEndPoint local_end_point;
+  if (!jingle_glue::SocketAddressToIPEndPoint(local_candidate.address(),
+                                              &local_end_point)) {
+    NOTREACHED();
+    return;
+  }
+
   if (!route_change_callback_.is_null())
-    route_change_callback_.Run(channel->name(), end_point);
+    route_change_callback_.Run(channel->name(), end_point, local_end_point);
 }
 
 const cricket::ContentInfo* JingleSession::GetContentInfo() const {
   const cricket::SessionDescription* session_description;
   // If we initiate the session, we get to specify the content name. When
   // accepting one, the remote end specifies it.
   if (cricket_session_->initiator()) {
     session_description = cricket_session_->local_description();
   } else {
     session_description = cricket_session_->remote_description();
@@ skipping 37 matching lines @@
   scoped_ptr<cricket::SessionDescription> desc(
       new cricket::SessionDescription());
   desc->AddContent(
       ContentDescription::kChromotingContentName, kChromotingXmlNamespace,
       new ContentDescription(config.Pass(), authenticator_message.Pass()));
   return desc.Pass();
 }
 
 }  // namespace protocol
 }  // namespace remoting