| Index: remoting/protocol/chromium_socket_factory.cc
|
| diff --git a/remoting/protocol/chromium_socket_factory.cc b/remoting/protocol/chromium_socket_factory.cc
|
| index 6b2c4fc69d8038b89f975251c5ab2d84ffe7f24a..6f9dfeb12a66f0cab431661528b235afdc248431 100644
|
| --- a/remoting/protocol/chromium_socket_factory.cc
|
| +++ b/remoting/protocol/chromium_socket_factory.cc
|
| @@ -4,8 +4,11 @@
|
|
|
| #include "remoting/protocol/chromium_socket_factory.h"
|
|
|
| +#include <stddef.h>
|
| +
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "jingle/glue/utils.h"
|
| #include "net/base/io_buffer.h"
|
| @@ -36,7 +39,8 @@ class UdpPacketSocket : public rtc::AsyncPacketSocket {
|
| ~UdpPacketSocket() override;
|
|
|
| bool Init(const rtc::SocketAddress& local_address,
|
| - uint16 min_port, uint16 max_port);
|
| + uint16_t min_port,
|
| + uint16_t max_port);
|
|
|
| // rtc::AsyncPacketSocket interface.
|
| rtc::SocketAddress GetLocalAddress() const override;
|
| @@ -115,17 +119,18 @@ UdpPacketSocket::~UdpPacketSocket() {
|
| }
|
|
|
| bool UdpPacketSocket::Init(const rtc::SocketAddress& local_address,
|
| - uint16 min_port, uint16 max_port) {
|
| + uint16_t min_port,
|
| + uint16_t max_port) {
|
| net::IPEndPoint local_endpoint;
|
| if (!jingle_glue::SocketAddressToIPEndPoint(
|
| local_address, &local_endpoint)) {
|
| return false;
|
| }
|
|
|
| - for (uint32 port = min_port; port <= max_port; ++port) {
|
| + for (uint32_t port = min_port; port <= max_port; ++port) {
|
| socket_.reset(new net::UDPServerSocket(nullptr, net::NetLog::Source()));
|
| int result = socket_->Listen(
|
| - net::IPEndPoint(local_endpoint.address(), static_cast<uint16>(port)));
|
| + net::IPEndPoint(local_endpoint.address(), static_cast<uint16_t>(port)));
|
| if (result == net::OK) {
|
| break;
|
| } else {
|
| @@ -360,18 +365,19 @@ ChromiumPacketSocketFactory::~ChromiumPacketSocketFactory() {
|
| }
|
|
|
| rtc::AsyncPacketSocket* ChromiumPacketSocketFactory::CreateUdpSocket(
|
| - const rtc::SocketAddress& local_address,
|
| - uint16 min_port, uint16 max_port) {
|
| + const rtc::SocketAddress& local_address,
|
| + uint16_t min_port,
|
| + uint16_t max_port) {
|
| scoped_ptr<UdpPacketSocket> result(new UdpPacketSocket());
|
| if (!result->Init(local_address, min_port, max_port))
|
| return nullptr;
|
| return result.release();
|
| }
|
|
|
| -rtc::AsyncPacketSocket*
|
| -ChromiumPacketSocketFactory::CreateServerTcpSocket(
|
| +rtc::AsyncPacketSocket* ChromiumPacketSocketFactory::CreateServerTcpSocket(
|
| const rtc::SocketAddress& local_address,
|
| - uint16 min_port, uint16 max_port,
|
| + uint16_t min_port,
|
| + uint16_t max_port,
|
| int opts) {
|
| // We don't use TCP sockets for remoting connections.
|
| NOTIMPLEMENTED();
|
|
|