Use uint16 for port numbers, chrome/ edition

chrome/test/chromedriver/server/chromedriver_server.cc

 // Copyright (c) 2013 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 <stdio.h>
 #include <locale>
 #include <string>
 #include <vector>
 
 #include "base/at_exit.h"
@@ skipping 34 matching lines @@
     HttpRequestHandlerFunc;
 
 class HttpServer : public net::HttpServer::Delegate {
  public:
   explicit HttpServer(const HttpRequestHandlerFunc& handle_request_func)
       : handle_request_func_(handle_request_func),
         weak_factory_(this) {}
 
   virtual ~HttpServer() {}
 
-  bool Start(int port, bool allow_remote) {
+  bool Start(uint16 port, bool allow_remote) {
     std::string binding_ip = kLocalHostAddress;
     if (allow_remote)
       binding_ip = "0.0.0.0";
     scoped_ptr<net::ServerSocket> server_socket(
         new net::TCPServerSocket(NULL, net::NetLog::Source()));
     server_socket->ListenWithAddressAndPort(binding_ip, port, 1);
     server_.reset(new net::HttpServer(server_socket.Pass(), this));
     net::IPEndPoint address;
     return server_->GetLocalAddress(&address) == net::OK;
   }
@@ skipping 81 matching lines @@
 base::LazyInstance<base::ThreadLocalPointer<HttpServer> >
     lazy_tls_server = LAZY_INSTANCE_INITIALIZER;
 
 void StopServerOnIOThread() {
   // Note, |server| may be NULL.
   HttpServer* server = lazy_tls_server.Pointer()->Get();
   lazy_tls_server.Pointer()->Set(NULL);
   delete server;
 }
 
-void StartServerOnIOThread(int port,
+void StartServerOnIOThread(uint16 port,
                            bool allow_remote,
                            const HttpRequestHandlerFunc& handle_request_func) {
   scoped_ptr<HttpServer> temp_server(new HttpServer(handle_request_func));
   if (!temp_server->Start(port, allow_remote)) {
     printf("Port not available. Exiting...\n");
     exit(1);
   }
   lazy_tls_server.Pointer()->Set(temp_server.release());
 }
 
-void RunServer(int port,
+void RunServer(uint16 port,
                bool allow_remote,
                const std::vector<std::string>& whitelisted_ips,
                const std::string& url_base,
                int adb_port,
                scoped_ptr<PortServer> port_server) {
   base::Thread io_thread("ChromeDriver IO");
   CHECK(io_thread.StartWithOptions(
       base::Thread::Options(base::MessageLoop::TYPE_IO, 0)));
 
   base::MessageLoop cmd_loop;
@@ skipping 33 matching lines @@
   CommandLine* cmd_line = CommandLine::ForCurrentProcess();
 
 #if defined(OS_LINUX)
   // Select the locale from the environment by passing an empty string instead
   // of the default "C" locale. This is particularly needed for the keycode
   // conversion code to work.
   setlocale(LC_ALL, "");
 #endif
 
   // Parse command line flags.
-  int port = 9515;
+  uint16 port = 9515;
   int adb_port = 5037;
   bool allow_remote = false;
   std::vector<std::string> whitelisted_ips;
   std::string url_base;
   scoped_ptr<PortServer> port_server;
   if (cmd_line->HasSwitch("h") || cmd_line->HasSwitch("help")) {
     std::string options;
     const char* const kOptionAndDescriptions[] = {
         "port=PORT", "port to listen on",
         "adb-port=PORT", "adb server port",
@@ skipping 13 matching lines @@
           kOptionAndDescriptions[i], kOptionAndDescriptions[i + 1]);
     }
     printf("Usage: %s [OPTIONS]\n\nOptions\n%s", argv[0], options.c_str());
     return 0;
   }
   if (cmd_line->HasSwitch("v") || cmd_line->HasSwitch("version")) {
     printf("ChromeDriver %s\n", kChromeDriverVersion);
     return 0;
   }
   if (cmd_line->HasSwitch("port")) {
-    if (!base::StringToInt(cmd_line->GetSwitchValueASCII("port"), &port)) {
+    int cmd_line_port;
+    if (!base::StringToInt(cmd_line->GetSwitchValueASCII("port"),
+                           &cmd_line_port) ||
+        cmd_line_port < 0 || cmd_line_port > 65535) {

[Peter Kasting, 2014/11/12 23:54:00]

Again, the old code probably should have had these checks already.

       printf("Invalid port. Exiting...\n");
       return 1;
     }
+    port = static_cast<uint16>(cmd_line_port);
   }
   if (cmd_line->HasSwitch("adb-port")) {
     if (!base::StringToInt(cmd_line->GetSwitchValueASCII("adb-port"),
                            &adb_port)) {
       printf("Invalid adb-port. Exiting...\n");
       return 1;
     }
   }
   if (cmd_line->HasSwitch("port-server")) {
 #if defined(OS_LINUX)
@@ skipping 16 matching lines @@
   if (url_base.empty() || url_base[0] != '/')
     url_base = "/" + url_base;
   if (url_base[url_base.length() - 1] != '/')
     url_base = url_base + "/";
   if (cmd_line->HasSwitch("whitelisted-ips")) {
     allow_remote = true;
     std::string whitelist = cmd_line->GetSwitchValueASCII("whitelisted-ips");
     base::SplitString(whitelist, ',', &whitelisted_ips);
   }
   if (!cmd_line->HasSwitch("silent")) {
-    printf("Starting ChromeDriver %s on port %d\n", kChromeDriverVersion, port);
+    printf("Starting ChromeDriver %s on port %u\n", kChromeDriverVersion, port);
     if (!allow_remote) {
       printf("Only local connections are allowed.\n");
     } else if (!whitelisted_ips.empty()) {
       printf("Remote connections are allowed by a whitelist (%s).\n",
              cmd_line->GetSwitchValueASCII("whitelisted-ips").c_str());
     } else {
       printf("All remote connections are allowed. Use a whitelist instead!\n");
     }
     fflush(stdout);
   }
 
   if (!InitLogging()) {
     printf("Unable to initialize logging. Exiting...\n");
     return 1;
   }
   RunServer(port, allow_remote, whitelisted_ips,
             url_base, adb_port, port_server.Pass());
   return 0;
 }