Use uint16 for port numbers, misc edition

media/cast/test/sender.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.
 
 // Test application that simulates a cast sender - Data can be either generated
 // or read from a file.
 
 #include <queue>
 
 #include "base/at_exit.h"
@@ skipping 137 matching lines @@
                                                   it->frame_id);
   }
 }
 
 void InitializationResult(media::cast::CastInitializationStatus result) {
   bool end_result = result == media::cast::STATUS_AUDIO_INITIALIZED ||
                     result == media::cast::STATUS_VIDEO_INITIALIZED;
   CHECK(end_result) << "Cast sender uninitialized";
 }
 
-net::IPEndPoint CreateUDPAddress(std::string ip_str, int port) {
+net::IPEndPoint CreateUDPAddress(std::string ip_str, uint16 port) {
   net::IPAddressNumber ip_number;
   CHECK(net::ParseIPLiteralToNumber(ip_str, &ip_number));
   return net::IPEndPoint(ip_number, port);
 }
 
 void DumpLoggingData(const media::cast::proto::LogMetadata& log_metadata,
                      const media::cast::FrameEventList& frame_events,
                      const media::cast::PacketEventList& packet_events,
                      base::ScopedFILE log_file) {
   VLOG(0) << "Frame map size: " << frame_events.size();
@@ skipping 99 matching lines @@
   video_thread.Start();
 
   base::MessageLoopForIO io_message_loop;
 
   // Default parameters.
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   std::string remote_ip_address = cmd->GetSwitchValueASCII(kSwitchAddress);
   if (remote_ip_address.empty())
     remote_ip_address = "127.0.0.1";
   int remote_port = 0;
-  if (!base::StringToInt(cmd->GetSwitchValueASCII(kSwitchPort),
-                         &remote_port)) {
+  if (!base::StringToInt(cmd->GetSwitchValueASCII(kSwitchPort), &remote_port) ||
+      remote_port < 0 || remote_port > 65535) {

[Peter Kasting, 2014/11/12 23:53:55]

These conditions could have been violated before as well; we probably should
have had such conditionals already.

     remote_port = 2344;
   }
   LOG(INFO) << "Sending to " << remote_ip_address << ":" << remote_port
             << ".";
 
   media::cast::AudioSenderConfig audio_config = GetAudioSenderConfig();
   media::cast::VideoSenderConfig video_config = GetVideoSenderConfig();
 
   // Running transport on the main thread.
   // Setting up transport config.
   net::IPEndPoint remote_endpoint =
-      CreateUDPAddress(remote_ip_address, remote_port);
+      CreateUDPAddress(remote_ip_address, static_cast<uint16>(remote_port));
 
   // Enable raw event and stats logging.
   // Running transport on the main thread.
   scoped_refptr<media::cast::CastEnvironment> cast_environment(
       new media::cast::CastEnvironment(
           make_scoped_ptr<base::TickClock>(new base::DefaultTickClock()),
           io_message_loop.message_loop_proxy(),
           audio_thread.message_loop_proxy(),
           video_thread.message_loop_proxy()));
 
@@ skipping 100 matching lines @@
                  base::Passed(&audio_stats_subscriber),
                  base::Passed(&offset_estimator)),
       base::TimeDelta::FromSeconds(logging_duration_seconds));
 
   fake_media_source->Start(cast_sender->audio_frame_input(),
                            cast_sender->video_frame_input());
 
   io_message_loop.Run();
   return 0;
 }