Move PortAllocator creation out of LibjingleTransportFactory.

remoting/host/chromoting_host.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_HOST_CHROMOTING_HOST_H_
 #define REMOTING_HOST_CHROMOTING_HOST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 21 matching lines @@
 class SessionConfig;
 class CandidateSessionConfig;
 }  // namespace protocol
 
 class Capturer;
 class ChromotingHostContext;
 class DesktopEnvironment;
 class Encoder;
 class ScreenRecorder;
 
+struct NetworkSettings {
+  enum NatTraversalMode {
+    // Don't use STUN or relay servers. Accept incoming P2P connection
+    // attempts, but don't initiate any. This ensures that the peer is
+    // on the same network. Note that connection will always fail if
+    // both ends use this mode.
+    NAT_TRAVERSAL_DISABLED,
+
+    // Don't use STUN or relay servers but make outgoing connections.
+    NAT_TRAVERSAL_OUTGOING,
+
+    // Active NAT traversal using STUN and relay servers.
+    NAT_TRAVERSAL_ENABLED,
+  };
+
+  NetworkSettings()
+      : nat_traversal_mode(NAT_TRAVERSAL_DISABLED),
+        min_port(0),
+        max_port(0) {
+  }
+
+  explicit NetworkSettings(bool allow_nat_traversal)
+      : nat_traversal_mode(allow_nat_traversal ?
+                           NAT_TRAVERSAL_ENABLED :
+                           NAT_TRAVERSAL_DISABLED),
+        min_port(0),
+        max_port(0) {
+  }
+
+  explicit NetworkSettings(NatTraversalMode nat_traversal_mode)
+      : nat_traversal_mode(nat_traversal_mode),
+        min_port(0),
+        max_port(0) {
+  }
+
+  NatTraversalMode nat_traversal_mode;
+
+  // |min_port| and |max_port| specify range (inclusive) of ports used by
+  // P2P sessions. Any port can be used when both values are set to 0.
+  int min_port;
+  int max_port;
+};
+
 // A class to implement the functionality of a host process.
 //
 // Here's the work flow of this class:
 // 1. We should load the saved GAIA ID token or if this is the first
 //    time the host process runs we should prompt user for the
 //    credential. We will use this token or credentials to authenicate
 //    and register the host.
 //
 // 2. We listen for incoming connection using libjingle. We will create
 //    a ConnectionToClient object that wraps around linjingle for transport.
@@ skipping 12 matching lines @@
 //    incoming connection.
 class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
                        public ClientSession::EventHandler,
                        public protocol::SessionManager::Listener {
  public:
   // The caller must ensure that |context|, |signal_strategy| and
   // |environment| out-live the host.
   ChromotingHost(ChromotingHostContext* context,
                  SignalStrategy* signal_strategy,
                  DesktopEnvironment* environment,
-                 const protocol::NetworkSettings& network_settings);
+                 const NetworkSettings& network_settings);
 
   // Asynchronously start the host process.
   //
   // After this is invoked, the host process will connect to the talk
   // network and start listening for incoming connections.
   //
   // This method can only be called once during the lifetime of this object.
   void Start();
 
   // Asynchronously shutdown the host process. |shutdown_task| is
@@ skipping 84 matching lines @@
 
   // Called from Shutdown() or OnScreenRecorderStopped() to finish shutdown.
   void ShutdownFinish();
 
   // Unless specified otherwise all members of this class must be
   // used on the network thread only.
 
   // Parameters specified when the host was created.
   ChromotingHostContext* context_;
   DesktopEnvironment* desktop_environment_;
-  protocol::NetworkSettings network_settings_;
+  NetworkSettings network_settings_;
 
   // Connection objects.
   SignalStrategy* signal_strategy_;
   scoped_ptr<protocol::SessionManager> session_manager_;
 
   // Must be used on the network thread only.
   ObserverList<HostStatusObserver> status_observers_;
 
   // The connections to remote clients.
   ClientList clients_;
@@ skipping 28 matching lines @@
   // TODO(sergeyu): The following members do not belong to
   // ChromotingHost and should be moved elsewhere.
   UiStrings ui_strings_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_