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

Side by Side Diff: content/browser/renderer_host/pepper/pepper_socket_utils.cc

Issue 1565303002: Change IPEndpoint::address() to return a net::IPAddress (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase for ChromeOS Created 4 years, 11 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/pepper/pepper_socket_utils.h" 5 #include "content/browser/renderer_host/pepper/pepper_socket_utils.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 } 174 }
175 175
176 return net::IPAddressToString(address); 176 return net::IPAddressToString(address);
177 } 177 }
178 178
179 } // namespace 179 } // namespace
180 180
181 void OpenFirewallHole(const net::IPEndPoint& address, 181 void OpenFirewallHole(const net::IPEndPoint& address,
182 chromeos::FirewallHole::PortType type, 182 chromeos::FirewallHole::PortType type,
183 FirewallHoleOpenCallback callback) { 183 FirewallHoleOpenCallback callback) {
184 if (IsLoopbackAddress(address.address())) { 184 if (IsLoopbackAddress(address.address().bytes())) {
185 callback.Run(nullptr); 185 callback.Run(nullptr);
186 return; 186 return;
187 } 187 }
188 std::string address_string = AddressToFirewallString(address.address()); 188 std::string address_string =
189 AddressToFirewallString(address.address().bytes());
189 190
190 chromeos::FirewallHole::Open(type, address.port(), address_string, callback); 191 chromeos::FirewallHole::Open(type, address.port(), address_string, callback);
191 } 192 }
192 193
193 void OpenTCPFirewallHole(const net::IPEndPoint& address, 194 void OpenTCPFirewallHole(const net::IPEndPoint& address,
194 FirewallHoleOpenCallback callback) { 195 FirewallHoleOpenCallback callback) {
195 OpenFirewallHole(address, chromeos::FirewallHole::PortType::TCP, callback); 196 OpenFirewallHole(address, chromeos::FirewallHole::PortType::TCP, callback);
196 } 197 }
197 198
198 void OpenUDPFirewallHole(const net::IPEndPoint& address, 199 void OpenUDPFirewallHole(const net::IPEndPoint& address,
199 FirewallHoleOpenCallback callback) { 200 FirewallHoleOpenCallback callback) {
200 OpenFirewallHole(address, chromeos::FirewallHole::PortType::UDP, callback); 201 OpenFirewallHole(address, chromeos::FirewallHole::PortType::UDP, callback);
201 } 202 }
202 #endif // defined(OS_CHROMEOS) 203 #endif // defined(OS_CHROMEOS)
203 204
204 } // namespace pepper_socket_utils 205 } // namespace pepper_socket_utils
205 } // namespace content 206 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698