Upstream the android python scripts changes that enable the new Forwarder2 to be used in our test f…

tools/android/forwarder2/host_forwarder_main.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 <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <vector>
@@ skipping 21 matching lines @@
 forwarder2::PipeNotifier* g_notifier;
 
 void KillHandler(int /* unused */) {
   static int s_kill_handler_count = 0;
   CHECK(g_notifier);
   // If for some reason the forwarder get stuck in any socket waiting forever,
   // we can send a SIGKILL or SIGINT three times to force it die
   // (non-nicely). This is useful when debugging.
   ++s_kill_handler_count;
   if (!g_notifier->Notify() || s_kill_handler_count > 2)
-    exit(-1);
+    exit(1);
 }
 
 // Format of arg: <Device port>[:<Forward to port>:<Forward to address>]
 bool ParseForwardArg(const std::string& arg,
                      int* device_port,
                      std::string* forward_to_host,
                      int* forward_to_port) {
   std::vector<std::string> arg_pieces;
   base::SplitString(arg, ':', &arg_pieces);
   if (arg_pieces.size() == 0 || !StringToInt(arg_pieces[0], device_port))
@@ skipping 17 matching lines @@
   printf("Like 'adb forward' but in the reverse direction\n");
 
   CommandLine command_line(argc, argv);
   bool show_help = tools::HasHelpSwitch(command_line);
   std::string adb_port_str = command_line.GetSwitchValueASCII("adb_port");
   int adb_port = kDefaultAdbPort;
   if (!adb_port_str.empty() && !StringToInt(adb_port_str, &adb_port)) {
     printf("Could not parse adb port number: %s\n", adb_port_str.c_str());
     show_help = true;
   }
+  if (adb_port <= 0) {
+    printf("Invalid adb port number: %s. Adb port must be a "
+           "postivie integer.\n", adb_port_str.c_str());
+    show_help = true;
+  }
   CommandLine::StringVector forward_args = command_line.GetArgs();
   if (show_help || forward_args.empty()) {
     tools::ShowHelp(
         argv[0],
         "[--adb_port=<adb port>] "
         "<Device port>[:<Forward to port>:<Forward to address>] ...",
         base::StringPrintf(
             "  <adb port> is the TCP port Adb is configured to forward to."
             " Default is %d\n"
             "  <Forward to port> default is <Device port>\n"
             "  <Forward to address> default is 127.0.0.1.",
             kDefaultAdbPort).c_str());
-    return 0;
+    return 1;
   }
 
   g_notifier = new forwarder2::PipeNotifier();
   ScopedVector<HostController> controllers;
   int failed_count = 0;
   for (size_t i = 0; i < forward_args.size(); ++i) {
     int device_port = 0;
     std::string forward_to_host;
     int forward_to_port = 0;
     if (ParseForwardArg(forward_args[i],
@@ skipping 34 matching lines @@
   }
 
   // TODO(felipeg): We should check if the controllers are really alive before
   // printing Ready.
   printf("Host Forwarder Ready.\n");
   for (int i = 0; i < controllers.size(); ++i)
     controllers[i]->Join();
 
   return 0;
 }