Use uint16 for port numbers, misc edition

media/cast/test/receiver.cc

 // Copyright 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 <algorithm>
 #include <climits>
 #include <cstdarg>
 #include <cstdio>
 #include <deque>
 #include <map>
@@ skipping 47 matching lines @@
 #define DEFAULT_AUDIO_PAYLOAD_TYPE "127"
 #define DEFAULT_VIDEO_FEEDBACK_SSRC "12"
 #define DEFAULT_VIDEO_INCOMING_SSRC "11"
 #define DEFAULT_VIDEO_PAYLOAD_TYPE "96"
 
 #if defined(USE_X11)
 const char* kVideoWindowWidth = "1280";
 const char* kVideoWindowHeight = "720";
 #endif  // defined(USE_X11)
 
-void GetPorts(int* tx_port, int* rx_port) {
+void GetPorts(uint16* tx_port, uint16* rx_port) {
   test::InputBuilder tx_input(
-      "Enter send port.", DEFAULT_SEND_PORT, 1, INT_MAX);
-  *tx_port = tx_input.GetIntInput();
+      "Enter send port.", DEFAULT_SEND_PORT, 1, 65535);
+  *tx_port = static_cast<uint16>(tx_input.GetIntInput());
 
   test::InputBuilder rx_input(
-      "Enter receive port.", DEFAULT_RECEIVE_PORT, 1, INT_MAX);
-  *rx_port = rx_input.GetIntInput();
+      "Enter receive port.", DEFAULT_RECEIVE_PORT, 1, 65535);
+  *rx_port = static_cast<uint16>(rx_input.GetIntInput());
 }
 
 std::string GetIpAddress(const std::string display_text) {
   test::InputBuilder input(display_text, DEFAULT_SEND_IP, INT_MIN, INT_MAX);
   std::string ip_address = input.GetStringInput();
   // Ensure IP address is either the default value or in correct form.
   while (ip_address != DEFAULT_SEND_IP &&
          std::count(ip_address.begin(), ip_address.end(), '.') != 3) {
     ip_address = input.GetStringInput();
   }
@@ skipping 465 matching lines @@
   const scoped_ptr<media::AudioManager> audio_manager(
       media::AudioManager::Create(&fake_audio_log_factory_));
   CHECK(media::AudioManager::Get());
 
   media::cast::FrameReceiverConfig audio_config =
       media::cast::GetAudioReceiverConfig();
   media::cast::FrameReceiverConfig video_config =
       media::cast::GetVideoReceiverConfig();
 
   // Determine local and remote endpoints.
-  int remote_port, local_port;
+  uint16 remote_port, local_port;
   media::cast::GetPorts(&remote_port, &local_port);
   if (!local_port) {
     LOG(ERROR) << "Invalid local port.";
     return 1;
   }
   std::string remote_ip_address = media::cast::GetIpAddress("Enter remote IP.");
   std::string local_ip_address = media::cast::GetIpAddress("Enter local IP.");
   net::IPAddressNumber remote_ip_number;
   net::IPAddressNumber local_ip_number;
   if (!net::ParseIPLiteralToNumber(remote_ip_address, &remote_ip_number)) {
@@ skipping 19 matching lines @@
                                   audio_config,
                                   video_config,
                                   window_width,
                                   window_height);
   player.Start();
 
   base::MessageLoop().Run();  // Run forever (i.e., until SIGTERM).
   NOTREACHED();
   return 0;
 }