Implement ChannelMultiplexer.

remoting/protocol/session.h

 // 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.
 
 #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/channel_factory.h"
 #include "remoting/protocol/errors.h"
 #include "remoting/protocol/session_config.h"
 
 namespace net {
 class IPEndPoint;
-class Socket;
-class StreamSocket;
 }  // namespace net
 
 namespace remoting {
 namespace protocol {
 
 struct TransportRoute;
 
 // 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.
-class Session : public base::NonThreadSafe {
+class Session : public ChannelFactory {
  public:
   enum State {
     // Created, but not connecting yet.
     INITIALIZING,
 
     // Sent or received session-initiate, but haven't sent or received
     // session-accept.
     // TODO(sergeyu): Do we really need this state?
     CONNECTING,
 
@@ skipping 26 matching lines @@
     virtual void OnSessionRouteChange(const std::string& channel_name,
                                       const TransportRoute& route) = 0;
 
     // Called when ready state on one of the channels changes. See
     // comments in transport.h for explanation on what this state
     // means and how it can used.
     virtual void OnSessionChannelReady(const std::string& channel_name,
                                        bool ready) {}
   };
 
-  // TODO(sergeyu): Specify connection error code when channel
-  // connection fails.
-  typedef base::Callback<void(scoped_ptr<net::StreamSocket>)>
-      StreamChannelCallback;
-  typedef base::Callback<void(scoped_ptr<net::Socket>)>
-      DatagramChannelCallback;
 
   Session() {}
   virtual ~Session() {}
 
   // Set event handler for this session. |event_handler| must outlive
   // this object.
   virtual void SetEventHandler(EventHandler* event_handler) = 0;
 
   // Returns error code for a failed session.
   virtual ErrorCode 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.
-  // All channels must be destroyed before the session is
-  // destroyed. Can be called only when in CONNECTING, CONNECTED or
-  // AUTHENTICATED states.
-  virtual void CreateStreamChannel(
-      const std::string& name, const StreamChannelCallback& callback) = 0;
-  virtual void CreateDatagramChannel(
-      const std::string& name, const DatagramChannelCallback& callback) = 0;
-
   // Cancels a pending CreateStreamChannel() or CreateDatagramChannel()
   // operation for the named channel. If the channel creation already
   // completed then cancelling it has no effect. When shutting down
   // this method must be called for each channel pending creation.
   virtual void CancelChannelCreation(const std::string& name) = 0;

[Wez, 2012/08/06 23:14:07]

Why does this not belong on ChannelFactory?

[Sergey Ulanov, 2012/08/07 20:12:22]

Done.

 
   // JID of the other side.
   virtual const std::string& jid() = 0;
 
   // Configuration of the protocol that was sent or received in the
   // session-initiate jingle message. Returned pointer is valid until
   // connection is closed.
   virtual const CandidateSessionConfig* candidate_config() = 0;
 
   // Protocol configuration. Can be called only after session has been accepted.
@@ skipping 11 matching lines @@
   virtual void Close() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Session);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_SESSION_H_