Enable QUIC support in chromoting

remoting/protocol/jingle_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_JINGLE_SESSION_H_
 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/timer/timer.h"
 #include "crypto/rsa_private_key.h"
 #include "net/base/completion_callback.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/datagram_channel_factory.h"
 #include "remoting/protocol/jingle_messages.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/transport.h"
 #include "remoting/signaling/iq_sender.h"
 
 namespace remoting {
 namespace protocol {
 
-class SecureChannelFactory;
 class ChannelMultiplexer;
 class JingleSessionManager;
 class PseudoTcpChannelFactory;
+class QuicChannelFactory;
+class SecureChannelFactory;
 
 // JingleSessionManager and JingleSession implement the subset of the
 // Jingle protocol used in Chromoting. Instances of this class are
 // created by the JingleSessionManager.
 class JingleSession : public base::NonThreadSafe,
                       public Session,
                       public DatagramChannelFactory,
                       public Transport::EventHandler {
  public:
   ~JingleSession() override;
 
   // Session interface.
   void SetEventHandler(Session::EventHandler* event_handler) override;
   ErrorCode error() override;
   const std::string& jid() override;
   const SessionConfig& config() override;
   StreamChannelFactory* GetTransportChannelFactory() override;
   StreamChannelFactory* GetMultiplexedChannelFactory() override;
+  StreamChannelFactory* GetQuicChannelFactory() override;
   void Close() override;
 
   // DatagramChannelFactory interface.
   void CreateChannel(const std::string& name,
                      const ChannelCreatedCallback& callback) override;
   void CancelChannelCreation(const std::string& name) override;
 
   // Transport::EventHandler interface.
   void OnTransportIceCredentials(Transport* transport,
                                  const std::string& ufrag,
@@ skipping 83 matching lines @@
   // session is being closed due to an error.
   void CloseInternal(ErrorCode error);
 
   // Sets |state_| to |new_state| and calls state change callback.
   void SetState(State new_state);
 
   // Returns true if the state of the session is not CLOSED or FAILED
   bool is_session_active();
 
   JingleSessionManager* session_manager_;
+  bool is_server_;

[dcaiafa, 2015/08/11 22:40:06]

Not used. Delete?

[Sergey Ulanov, 2015/08/14 18:44:25]

Done.

   std::string peer_jid_;
   Session::EventHandler* event_handler_;
 
   std::string session_id_;
   State state_;
   ErrorCode error_;
 
   scoped_ptr<SessionConfig> config_;
 
   scoped_ptr<Authenticator> authenticator_;
 
   // Pending Iq requests. Used for all messages except transport-info.
   std::set<IqRequest*> pending_requests_;
 
   // Pending transport-info requests.
   std::list<IqRequest*> transport_info_requests_;
 
   ChannelsMap channels_;
   scoped_ptr<PseudoTcpChannelFactory> pseudotcp_channel_factory_;
   scoped_ptr<SecureChannelFactory> secure_channel_factory_;
   scoped_ptr<ChannelMultiplexer> channel_multiplexer_;
+  scoped_ptr<QuicChannelFactory> quic_adapter_;

[dcaiafa, 2015/08/11 22:40:06]

This is not really an adapter, so why not quic_channel_factory_?

[Sergey Ulanov, 2015/08/14 18:44:25]

Done.

 
   scoped_ptr<JingleMessage> pending_transport_info_message_;
   base::OneShotTimer<JingleSession> transport_info_timer_;
 
   // Pending remote transport info received before the local channels were
   // created.
   std::list<JingleMessage::IceCredentials> pending_remote_ice_credentials_;
   std::list<JingleMessage::NamedCandidate> pending_remote_candidates_;
 
   base::WeakPtrFactory<JingleSession> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_SESSION_H_