Limit the ports used by IT2Me when NAT traversal is disabled.

remoting/host/plugin/host_script_object.cc

 // 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.
 
 #include "remoting/host/plugin/host_script_object.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
@@ skipping 56 matching lines @@
 const char* kAttrNameDisconnected = "DISCONNECTED";
 const char* kAttrNameStarting = "STARTING";
 const char* kAttrNameRequestedAccessCode = "REQUESTED_ACCESS_CODE";
 const char* kAttrNameReceivedAccessCode = "RECEIVED_ACCESS_CODE";
 const char* kAttrNameConnected = "CONNECTED";
 const char* kAttrNameDisconnecting = "DISCONNECTING";
 const char* kAttrNameError = "ERROR";
 
 const int kMaxLoginAttempts = 5;
 
+const int kMinPortNumber = 12400;

[Sergey Ulanov, 2012/08/22 23:50:34]

Maybe put these values somewhere where they can be shared between hosts? E.g. in
remoting/host/network_settings.h?

[Wez, 2012/08/23 23:26:26]

Done.

+const int kMaxPortNumber = 12409;
+
 // We may need to have more than one task running at the same time
 // (e.g. key generation and status update), yet unlikely to ever need
 // more than 2 threads.
 const int kMaxWorkerPoolThreads = 2;
 
 }  // namespace
 
 HostNPScriptObject::HostNPScriptObject(
     NPP plugin,
     NPObject* parent,
@@ skipping 482 matching lines @@
   scoped_ptr<RegisterSupportHostRequest> register_request(
       new RegisterSupportHostRequest(
           signal_strategy.get(), &host_key_pair_,
           base::Bind(&HostNPScriptObject::OnReceivedSupportID,
                      base::Unretained(this))));
 
   // Beyond this point nothing can fail, so save the config and request.
   signal_strategy_.reset(signal_strategy.release());
   register_request_.reset(register_request.release());
 
+  // If NAT traversal is off then limit port range to allow firewall pin-holing.
+  LOG(INFO) << "NAT state: " << nat_traversal_enabled_;
+  NetworkSettings network_settings(
+     nat_traversal_enabled_ ?
+     NetworkSettings::NAT_TRAVERSAL_ENABLED :
+     NetworkSettings::NAT_TRAVERSAL_DISABLED);
+  if (!nat_traversal_enabled_) {
+    network_settings.min_port = kMinPortNumber;
+    network_settings.max_port = kMaxPortNumber;
+  }
+
   // Create the Host.
-  LOG(INFO) << "NAT state: " << nat_traversal_enabled_;
   host_ = new ChromotingHost(
       host_context_.get(), signal_strategy_.get(), desktop_environment_.get(),
-      CreateHostSessionManager(
-          NetworkSettings(nat_traversal_enabled_ ?
-                          NetworkSettings::NAT_TRAVERSAL_ENABLED :
-                          NetworkSettings::NAT_TRAVERSAL_DISABLED),
-          host_context_->url_request_context_getter()));
+      CreateHostSessionManager(network_settings,
+                               host_context_->url_request_context_getter()));
   host_->AddStatusObserver(this);
   log_to_server_.reset(
       new LogToServer(host_, ServerLogEntry::IT2ME, signal_strategy_.get()));
   base::Closure disconnect_callback = base::Bind(
       &ChromotingHost::Shutdown, base::Unretained(host_.get()),
       base::Closure());
   it2me_host_user_interface_->Start(host_.get(), disconnect_callback);
   host_event_logger_ = HostEventLogger::Create(host_, kApplicationName);
 
   {
@@ skipping 693 matching lines @@
   return is_good;
 }
 
 void HostNPScriptObject::SetException(const std::string& exception_string) {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
   g_npnetscape_funcs->setexception(parent_, exception_string.c_str());
   LOG(INFO) << exception_string;
 }
 
 }  // namespace remoting