Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(536)

Unified Diff: remoting/protocol/chromium_socket_factory.cc

Issue 707713006: Update Chromium for webrtc r7656. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/chromium_socket_factory.h ('k') | remoting/protocol/chromium_socket_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/chromium_socket_factory.cc
diff --git a/remoting/protocol/chromium_socket_factory.cc b/remoting/protocol/chromium_socket_factory.cc
index 21ca9000d51af4eb06d144c234ca409d3d90c8cd..0cfa1ad706e3b6f7ca68da5229d5a3007589d966 100644
--- a/remoting/protocol/chromium_socket_factory.cc
+++ b/remoting/protocol/chromium_socket_factory.cc
@@ -36,7 +36,7 @@ class UdpPacketSocket : public rtc::AsyncPacketSocket {
~UdpPacketSocket() override;
bool Init(const rtc::SocketAddress& local_address,
- int min_port, int max_port);
+ uint16 min_port, uint16 max_port);
// rtc::AsyncPacketSocket interface.
rtc::SocketAddress GetLocalAddress() const override;
@@ -115,14 +115,14 @@ UdpPacketSocket::~UdpPacketSocket() {
}
bool UdpPacketSocket::Init(const rtc::SocketAddress& local_address,
- int min_port, int max_port) {
+ uint16 min_port, uint16 max_port) {
net::IPEndPoint local_endpoint;
if (!jingle_glue::SocketAddressToIPEndPoint(
local_address, &local_endpoint)) {
return false;
}
- for (int port = min_port; port <= max_port; ++port) {
+ for (uint16 port = min_port; port <= max_port; ++port) {
socket_.reset(new net::UDPServerSocket(NULL, net::NetLog::Source()));
int result = socket_->Listen(
net::IPEndPoint(local_endpoint.address(), port));
@@ -361,7 +361,7 @@ ChromiumPacketSocketFactory::~ChromiumPacketSocketFactory() {
rtc::AsyncPacketSocket* ChromiumPacketSocketFactory::CreateUdpSocket(
const rtc::SocketAddress& local_address,
- int min_port, int max_port) {
+ uint16 min_port, uint16 max_port) {
scoped_ptr<UdpPacketSocket> result(new UdpPacketSocket());
if (!result->Init(local_address, min_port, max_port))
return NULL;
@@ -371,7 +371,7 @@ rtc::AsyncPacketSocket* ChromiumPacketSocketFactory::CreateUdpSocket(
rtc::AsyncPacketSocket*
ChromiumPacketSocketFactory::CreateServerTcpSocket(
const rtc::SocketAddress& local_address,
- int min_port, int max_port,
+ uint16 min_port, uint16 max_port,
int opts) {
// We don't use TCP sockets for remoting connections.
NOTIMPLEMENTED();
« no previous file with comments | « remoting/protocol/chromium_socket_factory.h ('k') | remoting/protocol/chromium_socket_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698