summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/sys_byteorder.h6
-rw-r--r--components/nacl/browser/nacl_process_host.cc2
-rw-r--r--content/browser/indexed_db/indexed_db_leveldb_coding.cc4
-rw-r--r--net/dns/dns_config_service_posix_unittest.cc7
-rw-r--r--net/spdy/fuzzing/hpack_fuzz_util.cc5
-rw-r--r--net/spdy/spdy_frame_builder.cc4
-rw-r--r--net/spdy/spdy_frame_builder.h10
-rw-r--r--net/spdy/spdy_frame_reader.cc12
-rw-r--r--net/spdy/spdy_frame_reader_test.cc4
-rw-r--r--net/spdy/spdy_framer.cc12
-rw-r--r--net/spdy/spdy_framer_test.cc3
-rw-r--r--net/spdy/spdy_headers_block_parser.cc6
-rw-r--r--net/spdy/spdy_headers_block_parser_test.cc4
13 files changed, 45 insertions, 34 deletions
diff --git a/base/sys_byteorder.h b/base/sys_byteorder.h
index 704ed568..efdf7df 100644
--- a/base/sys_byteorder.h
+++ b/base/sys_byteorder.h
@@ -14,12 +14,6 @@
#include "base/basictypes.h"
#include "build/build_config.h"
-#if defined(OS_WIN)
-#include <winsock2.h>
-#else
-#include <arpa/inet.h>
-#endif
-
namespace base {
// Returns a value with all bytes in |x| swapped, i.e. reverses the endianness.
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
index 3dfc1d8..6d44c35 100644
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
@@ -60,6 +60,7 @@
#if defined(OS_POSIX)
+#include <arpa/inet.h>
#include <fcntl.h>
#include <netinet/in.h>
#include <sys/socket.h>
@@ -67,6 +68,7 @@
#include "ipc/ipc_channel_posix.h"
#elif defined(OS_WIN)
#include <windows.h>
+#include <winsock2.h>
#include "base/threading/thread.h"
#include "base/win/scoped_handle.h"
diff --git a/content/browser/indexed_db/indexed_db_leveldb_coding.cc b/content/browser/indexed_db/indexed_db_leveldb_coding.cc
index 45656a8..f4d01de 100644
--- a/content/browser/indexed_db/indexed_db_leveldb_coding.cc
+++ b/content/browser/indexed_db/indexed_db_leveldb_coding.cc
@@ -290,7 +290,7 @@ void EncodeString(const base::string16& value, std::string* into) {
base::char16* dst =
reinterpret_cast<base::char16*>(&*into->begin() + current);
for (unsigned i = 0; i < length; ++i)
- *dst++ = htons(*src++);
+ *dst++ = base::HostToNet16(*src++);
}
void EncodeBinary(const std::string& value, std::string* into) {
@@ -455,7 +455,7 @@ bool DecodeString(StringPiece* slice, base::string16* value) {
const base::char16* encoded =
reinterpret_cast<const base::char16*>(slice->begin());
for (unsigned i = 0; i < length; ++i)
- decoded.push_back(ntohs(*encoded++));
+ decoded.push_back(base::NetToHost16(*encoded++));
*value = decoded;
slice->remove_prefix(length * sizeof(base::char16));
diff --git a/net/dns/dns_config_service_posix_unittest.cc b/net/dns/dns_config_service_posix_unittest.cc
index 03a1391..04384d4 100644
--- a/net/dns/dns_config_service_posix_unittest.cc
+++ b/net/dns/dns_config_service_posix_unittest.cc
@@ -18,6 +18,13 @@
#include "base/android/path_utils.h"
#endif // defined(OS_ANDROID)
+// Required for inet_pton()
+#if defined(OS_WIN)
+#include <winsock2.h>
+#else
+#include <arpa/inet.h>
+#endif
+
namespace net {
#if !defined(OS_ANDROID)
diff --git a/net/spdy/fuzzing/hpack_fuzz_util.cc b/net/spdy/fuzzing/hpack_fuzz_util.cc
index 45f3def..fc9a84a 100644
--- a/net/spdy/fuzzing/hpack_fuzz_util.cc
+++ b/net/spdy/fuzzing/hpack_fuzz_util.cc
@@ -121,7 +121,8 @@ bool HpackFuzzUtil::NextHeaderBlock(Input* input,
return false;
}
- size_t length = ntohl(*reinterpret_cast<const uint32*>(input->ptr()));
+ size_t length =
+ base::NetToHost32(*reinterpret_cast<const uint32*>(input->ptr()));
input->offset += sizeof(uint32);
if (input->remaining() < length) {
@@ -134,7 +135,7 @@ bool HpackFuzzUtil::NextHeaderBlock(Input* input,
// static
string HpackFuzzUtil::HeaderBlockPrefix(size_t block_size) {
- uint32 length = htonl(block_size);
+ uint32 length = base::HostToNet32(static_cast<uint32>(block_size));
return string(reinterpret_cast<char*>(&length), sizeof(uint32));
}
diff --git a/net/spdy/spdy_frame_builder.cc b/net/spdy/spdy_frame_builder.cc
index 5015c9a..3d8d2e5 100644
--- a/net/spdy/spdy_frame_builder.cc
+++ b/net/spdy/spdy_frame_builder.cc
@@ -24,7 +24,7 @@ union FlagsAndLength {
FlagsAndLength CreateFlagsAndLength(uint8 flags, size_t length) {
DCHECK_EQ(0u, length & ~static_cast<size_t>(kLengthMask));
FlagsAndLength flags_length;
- flags_length.length = htonl(static_cast<uint32>(length));
+ flags_length.length = base::HostToNet32(static_cast<uint32>(length));
DCHECK_EQ(0, flags & ~kControlFlagsMask);
flags_length.flags[0] = flags;
return flags_length;
@@ -89,7 +89,7 @@ bool SpdyFrameBuilder::WriteDataFrameHeader(const SpdyFramer& framer,
size_t length_field = capacity_ - framer.GetDataFrameMinimumSize();
DCHECK_EQ(0u, length_field & ~static_cast<size_t>(kLengthMask));
FlagsAndLength flags_length;
- flags_length.length = htonl(length_field);
+ flags_length.length = base::HostToNet32(static_cast<uint32>(length_field));
DCHECK_EQ(0, flags & ~kDataFlagsMask);
flags_length.flags[0] = flags;
success &= WriteBytes(&flags_length, sizeof(flags_length));
diff --git a/net/spdy/spdy_frame_builder.h b/net/spdy/spdy_frame_builder.h
index 2cecd65..a91659e 100644
--- a/net/spdy/spdy_frame_builder.h
+++ b/net/spdy/spdy_frame_builder.h
@@ -92,21 +92,21 @@ class NET_EXPORT_PRIVATE SpdyFrameBuilder {
return WriteBytes(&value, sizeof(value));
}
bool WriteUInt16(uint16 value) {
- value = htons(value);
+ value = base::HostToNet16(value);
return WriteBytes(&value, sizeof(value));
}
bool WriteUInt24(uint32 value) {
- value = htonl(value);
+ value = base::HostToNet32(value);
return WriteBytes(reinterpret_cast<char*>(&value) + 1,
sizeof(value) - 1);
}
bool WriteUInt32(uint32 value) {
- value = htonl(value);
+ value = base::HostToNet32(value);
return WriteBytes(&value, sizeof(value));
}
bool WriteUInt64(uint64 value) {
- uint32 upper = htonl(value >> 32);
- uint32 lower = htonl(static_cast<uint32>(value));
+ uint32 upper = base::HostToNet32(static_cast<uint32>(value >> 32));
+ uint32 lower = base::HostToNet32(static_cast<uint32>(value));
return (WriteBytes(&upper, sizeof(upper)) &&
WriteBytes(&lower, sizeof(lower)));
}
diff --git a/net/spdy/spdy_frame_reader.cc b/net/spdy/spdy_frame_reader.cc
index 3ecce43..be972ec 100644
--- a/net/spdy/spdy_frame_reader.cc
+++ b/net/spdy/spdy_frame_reader.cc
@@ -40,7 +40,7 @@ bool SpdyFrameReader::ReadUInt16(uint16* result) {
}
// Read into result.
- *result = ntohs(*(reinterpret_cast<const uint16*>(data_ + ofs_)));
+ *result = base::NetToHost16(*(reinterpret_cast<const uint16*>(data_ + ofs_)));
// Iterate.
ofs_ += 2;
@@ -56,7 +56,7 @@ bool SpdyFrameReader::ReadUInt32(uint32* result) {
}
// Read into result.
- *result = ntohl(*(reinterpret_cast<const uint32*>(data_ + ofs_)));
+ *result = base::NetToHost32(*(reinterpret_cast<const uint32*>(data_ + ofs_)));
// Iterate.
ofs_ += 4;
@@ -72,8 +72,10 @@ bool SpdyFrameReader::ReadUInt64(uint64* result) {
}
// Read into result. Network byte order is big-endian.
- uint64 upper = ntohl(*(reinterpret_cast<const uint32*>(data_ + ofs_)));
- uint64 lower = ntohl(*(reinterpret_cast<const uint32*>(data_ + ofs_ + 4)));
+ uint64 upper =
+ base::NetToHost32(*(reinterpret_cast<const uint32*>(data_ + ofs_)));
+ uint64 lower =
+ base::NetToHost32(*(reinterpret_cast<const uint32*>(data_ + ofs_ + 4)));
*result = (upper << 32) + lower;
// Iterate.
@@ -103,7 +105,7 @@ bool SpdyFrameReader::ReadUInt24(uint32* result) {
// Read into result.
*result = 0;
memcpy(reinterpret_cast<char*>(result) + 1, data_ + ofs_, 3);
- *result = ntohl(*result);
+ *result = base::NetToHost32(*result);
// Iterate.
ofs_ += 3;
diff --git a/net/spdy/spdy_frame_reader_test.cc b/net/spdy/spdy_frame_reader_test.cc
index 8db2d99..867d97c 100644
--- a/net/spdy/spdy_frame_reader_test.cc
+++ b/net/spdy/spdy_frame_reader_test.cc
@@ -15,7 +15,7 @@ namespace net {
TEST(SpdyFrameReaderTest, ReadUInt16) {
// Frame data in network byte order.
const uint16 kFrameData[] = {
- htons(1), htons(1<<15),
+ base::HostToNet16(1), base::HostToNet16(1 << 15),
};
SpdyFrameReader frame_reader(reinterpret_cast<const char*>(kFrameData),
@@ -35,7 +35,7 @@ TEST(SpdyFrameReaderTest, ReadUInt16) {
TEST(SpdyFrameReaderTest, ReadUInt32) {
// Frame data in network byte order.
const uint32 kFrameData[] = {
- htonl(1), htonl(0x80000000),
+ base::HostToNet32(1), base::HostToNet32(0x80000000),
};
SpdyFrameReader frame_reader(reinterpret_cast<const char *>(kFrameData),
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
index 3dff08f6..cd12aac 100644
--- a/net/spdy/spdy_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -139,7 +139,8 @@ SettingsFlagsAndId SettingsFlagsAndId::FromWireFormat(
if (version < SPDY3) {
ConvertFlagsAndIdForSpdy2(&wire);
}
- return SettingsFlagsAndId(ntohl(wire) >> 24, ntohl(wire) & 0x00ffffff);
+ return SettingsFlagsAndId(base::NetToHost32(wire) >> 24,
+ base::NetToHost32(wire) & 0x00ffffff);
}
SettingsFlagsAndId::SettingsFlagsAndId(uint8 flags, uint32 id)
@@ -149,7 +150,8 @@ SettingsFlagsAndId::SettingsFlagsAndId(uint8 flags, uint32 id)
uint32 SettingsFlagsAndId::GetWireFormat(SpdyMajorVersion version)
const {
- uint32 wire = htonl(id_ & 0x00ffffff) | htonl(flags_ << 24);
+ uint32 wire =
+ base::HostToNet32(id_ & 0x00ffffff) | base::HostToNet32(flags_ << 24);
if (version < SPDY3) {
ConvertFlagsAndIdForSpdy2(&wire);
}
@@ -1801,10 +1803,10 @@ bool SpdyFramer::ProcessSetting(const char* data) {
SettingsFlagsAndId::FromWireFormat(protocol_version(), id_and_flags_wire);
id_field = id_and_flags.id();
flags = id_and_flags.flags();
- value = ntohl(*(reinterpret_cast<const uint32*>(data + 4)));
+ value = base::NetToHost32(*(reinterpret_cast<const uint32*>(data + 4)));
} else {
- id_field = ntohs(*(reinterpret_cast<const uint16*>(data)));
- value = ntohl(*(reinterpret_cast<const uint32*>(data + 2)));
+ id_field = base::NetToHost16(*(reinterpret_cast<const uint16*>(data)));
+ value = base::NetToHost32(*(reinterpret_cast<const uint32*>(data + 2)));
}
// Validate id.
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
index 6b5f4d1..2758b5e 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -5534,7 +5534,8 @@ TEST_P(SpdyFramerTest, EmptySynStream) {
TEST_P(SpdyFramerTest, SettingsFlagsAndId) {
const uint32 kId = 0x020304;
const uint32 kFlags = 0x01;
- const uint32 kWireFormat = htonl(IsSpdy2() ? 0x04030201 : 0x01020304);
+ const uint32 kWireFormat =
+ base::HostToNet32(IsSpdy2() ? 0x04030201 : 0x01020304);
SettingsFlagsAndId id_and_flags =
SettingsFlagsAndId::FromWireFormat(spdy_version_, kWireFormat);
diff --git a/net/spdy/spdy_headers_block_parser.cc b/net/spdy/spdy_headers_block_parser.cc
index 10057dd..27f52e8 100644
--- a/net/spdy/spdy_headers_block_parser.cc
+++ b/net/spdy/spdy_headers_block_parser.cc
@@ -168,9 +168,11 @@ void SpdyHeadersBlockParser::ParseLength(Reader* reader,
}
// Convert from network to host order and return the parsed out integer.
if (length_field_size_ == sizeof(uint32_t)) {
- *parsed_length = ntohl(*reinterpret_cast<const uint32_t *>(buffer));
+ *parsed_length =
+ base::NetToHost32(*reinterpret_cast<const uint32_t *>(buffer));
} else {
- *parsed_length = ntohs(*reinterpret_cast<const uint16_t *>(buffer));
+ *parsed_length =
+ base::NetToHost16(*reinterpret_cast<const uint16_t *>(buffer));
}
}
diff --git a/net/spdy/spdy_headers_block_parser_test.cc b/net/spdy/spdy_headers_block_parser_test.cc
index 324a1e5..433fda0 100644
--- a/net/spdy/spdy_headers_block_parser_test.cc
+++ b/net/spdy/spdy_headers_block_parser_test.cc
@@ -81,10 +81,10 @@ class SpdyHeadersBlockParserTest :
string EncodeLength(uint32_t len) {
char buffer[4];
if (length_field_size_ == sizeof(uint32_t)) {
- uint32_t net_order_len = htonl(len);
+ uint32_t net_order_len = base::HostToNet32(len);
memcpy(buffer, &net_order_len, length_field_size_);
} else if (length_field_size_ == sizeof(uint16_t)) {
- uint16_t net_order_len = htons(len);
+ uint16_t net_order_len = base::HostToNet16(static_cast<uint16_t>(len));
memcpy(buffer, &net_order_len, length_field_size_);
} else {
CHECK(false) << "Invalid length field size";
generated by cgit v1.1 at 2025-02-02 04:53:23 +0000