Move PortAllocator creation out of LibjingleTransportFactory.

remoting/protocol/jingle_session_manager.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_PEPPER_SESSION_MANAGER_H_
 #define REMOTING_PROTOCOL_PEPPER_SESSION_MANAGER_H_
 
 #include <map>
 #include <list>
 #include <string>
@@ skipping 27 matching lines @@
 
 class JingleSession;
 
 // JingleSessionManager and JingleSession implement the subset of the
 // Jingle protocol used in Chromoting. JingleSessionManager provides
 // the protocol::SessionManager interface for accepting incoming and
 // creating outgoing sessions.
 class JingleSessionManager : public SessionManager,
                              public SignalStrategy::Listener {
  public:
+  // When |fetch_nat_traversal_config| is set to true then
+  // JingleSessionManager will also try to query configuration of STUN
+  // and Relay servers from the signaling server.
+  //
+  // TODO(sergeyu): Move NAT-traversal config fetching to a separate
+  // class.
   explicit JingleSessionManager(
-      scoped_ptr<TransportFactory> transport_factory);
+      scoped_ptr<TransportFactory> transport_factory,
+      bool fetch_nat_traversal_config);

[Wez, 2012/04/27 17:58:51]

nit: At a glance this name suggests it's fetching _our_ NAT traversal
configuration. How about |fetch_relay_and_stun_config|?

[Sergey Ulanov, 2012/04/27 22:51:14]

Renamed to fetch_stun_relay_config

   virtual ~JingleSessionManager();
 
   // SessionManager interface.
   virtual void Init(SignalStrategy* signal_strategy,
-                    SessionManager::Listener* listener,
-                    const NetworkSettings& network_settings) OVERRIDE;
+                    SessionManager::Listener* listener) OVERRIDE;
   virtual scoped_ptr<Session> Connect(
       const std::string& host_jid,
       scoped_ptr<Authenticator> authenticator,
       scoped_ptr<CandidateSessionConfig> config,
       const Session::StateChangeCallback& state_change_callback) OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual void set_authenticator_factory(
       scoped_ptr<AuthenticatorFactory> authenticator_factory) OVERRIDE;
 
   // SignalStrategy::Listener interface.
@@ skipping 13 matching lines @@
       const std::vector<talk_base::SocketAddress>& stun_hosts);
 
   IqSender* iq_sender() { return iq_sender_.get(); }
   void SendReply(const buzz::XmlElement* original_stanza,
                  JingleMessageReply::ErrorType error);
 
   // Called by JingleSession when it is being destroyed.
   void SessionDestroyed(JingleSession* session);
 
   scoped_ptr<TransportFactory> transport_factory_;
+  bool fetch_nat_traversal_config_;
 
   SignalStrategy* signal_strategy_;
+  bool nat_travesal_;

[Wez, 2012/04/27 17:58:51]

typo: nat_travesal_

[Wez, 2012/04/27 17:58:51]

Name this |allow_nat_traversal_| or similar, to express what it means.

[Wez, 2012/04/27 17:58:51]

Is this used?

[Sergey Ulanov, 2012/04/27 22:51:14]

Done.

[Sergey Ulanov, 2012/04/27 22:51:14]

Done.

[Sergey Ulanov, 2012/04/27 22:51:14]

No, removed it.

   scoped_ptr<AuthenticatorFactory> authenticator_factory_;
   scoped_ptr<IqSender> iq_sender_;
   SessionManager::Listener* listener_;
 
   bool ready_;
 
   TransportConfig transport_config_;
 
   scoped_ptr<JingleInfoRequest> jingle_info_request_;
 
   SessionsMap sessions_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSessionManager);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PEPPER_SESSION_MANAGER_H_