Add JingleSession::OnRouteChange(), and pass IP endpoint information to a

remoting/protocol/session.h

 // Copyright (c) 2011 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.
 
 #ifndef REMOTING_PROTOCOL_SESSION_H_
 #define REMOTING_PROTOCOL_SESSION_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/threading/non_thread_safe.h"
 #include "remoting/protocol/buffered_socket_writer.h"
 #include "remoting/protocol/session_config.h"
 
 namespace net {
+class IPEndPoint;
 class Socket;
 class StreamSocket;
 }  // namespace net
 
 namespace remoting {
 namespace protocol {
 
 // Generic interface for Chromotocol connection used by both client and host.
 // Provides access to the connection channels, but doesn't depend on the
 // protocol used for each channel.
@@ skipping 35 matching lines @@
     AUTHENTICATION_FAILED,
     CHANNEL_CONNECTION_ERROR,
     UNKNOWN_ERROR,
   };
 
   // State change callbacks are called after session state has
   // changed. It is not safe to destroy the session from within the
   // handler unless |state| is CLOSED or FAILED.
   typedef base::Callback<void(State state)> StateChangeCallback;
 
+  typedef base::Callback<void(

[Sergey Ulanov, 2012/01/23 20:33:37]

maybe add TODO to merge these two callbacks to a single interface. Just to make
this code consistent with everything else.

[Lambros, 2012/01/24 19:50:50]

Done.

+      const std::string& channel_name,
+      const net::IPEndPoint& end_point)> RouteChangeCallback;
+
   // TODO(sergeyu): Specify connection error code when channel
   // connection fails.
   typedef base::Callback<void(net::StreamSocket*)> StreamChannelCallback;
   typedef base::Callback<void(net::Socket*)> DatagramChannelCallback;
 
   Session() { }
   virtual ~Session() { }
 
   // Set callback that is called when state of the connection is changed.
   // Must be called on the jingle thread only.

[Sergey Ulanov, 2012/01/23 20:33:37]

This comment is not necessary anymore, Session interface is not thread-safe now,
and it is not necessary to state it here.

[Lambros, 2012/01/24 19:50:50]

Done.

   virtual void SetStateChangeCallback(const StateChangeCallback& callback) = 0;
 
+  // Set callback that is called when the route for a channel is changed.

[Sergey Ulanov, 2012/01/23 20:33:37]

It's also worth mentioning that the callback must be registered immediately
after JingleSessionManager::Connect() or from OnIncomingSession() callback.

[Lambros, 2012/01/24 19:50:50]

Done.

+  // Must be called on the jingle thread only.

[Sergey Ulanov, 2012/01/23 20:33:37]

remove this comments

[Lambros, 2012/01/24 19:50:50]

Done.

+  virtual void SetRouteChangeCallback(const RouteChangeCallback& callback) = 0;
+
   // Returns error code for a failed session.
   virtual Error error() = 0;
 
   // Creates new channels for this connection. The specified callback
   // is called when then new channel is created and connected. The
   // callback is called with NULL if connection failed for any reason.
   // Ownership of the channel socket is given to the caller when the
   // callback is called. All channels must be destroyed before the
   // session is destroyed. Can be called only when in CONNECTING,
   // CONNECTED or AUTHENTICATED states.
@@ skipping 31 matching lines @@
   virtual void Close() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Session);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_SESSION_H_