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

Unified Diff: native_client_sdk/src/build_tools/debug_server/debug_stub/transport_common.cc

Issue 9716020: Add base::HostToNetXX() & NetToHostXX(), and use them to replace htonX() & ntohX() in Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Switch a few remaining call-sites. Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: native_client_sdk/src/build_tools/debug_server/debug_stub/transport_common.cc
diff --git a/native_client_sdk/src/build_tools/debug_server/debug_stub/transport_common.cc b/native_client_sdk/src/build_tools/debug_server/debug_stub/transport_common.cc
index 4d442f09cb02cc8673626e2a765ebfb0036adff1..3055585a6611a24660eb95f68b80e6645ea790bb 100644
--- a/native_client_sdk/src/build_tools/debug_server/debug_stub/transport_common.cc
+++ b/native_client_sdk/src/build_tools/debug_server/debug_stub/transport_common.cc
@@ -157,7 +157,7 @@ static bool StringToIPv4(const std::string &instr, uint32_t *addr,
if (portstr.size()) {
int val = atoi(portstr.data());
if ((val < 0) || (val > 65535)) return false;
- outport = ntohs(static_cast<uint16_t>(val));
+ outport = base::NetToHost16(static_cast<uint16_t>(val));
}
// We haven't failed, so set the values
@@ -223,8 +223,8 @@ ITransport* ITransport::Connect(const char *addr) {
struct sockaddr_in saddr;
saddr.sin_family = AF_INET;
- saddr.sin_addr.s_addr = htonl(0x7F000001);
- saddr.sin_port = htons(4014);
+ saddr.sin_addr.s_addr = base::HostToNet32(0x7F000001);
+ saddr.sin_port = base::HostToNet16(4014);
// Override portions address that are provided
if (addr) BuildSockAddr(addr, &saddr);
@@ -249,8 +249,8 @@ ITransport* ITransport::Accept(const char *addr) {
struct sockaddr_in saddr;
socklen_t addrlen = static_cast<socklen_t>(sizeof(saddr));
saddr.sin_family = AF_INET;
- saddr.sin_addr.s_addr = htonl(0x7F000001);
- saddr.sin_port = htons(4014);
+ saddr.sin_addr.s_addr = base::HostToNet32(0x7F000001);
+ saddr.sin_port = base::HostToNet16(4014);
// Override portions address that are provided
printf("---> %d %s\n", __LINE__, __FILE__); fflush(stdout);
@@ -291,4 +291,3 @@ void ITransport::Free(ITransport* itrans) {
}
} // namespace port
-

Powered by Google App Engine
This is Rietveld 408576698