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

Unified Diff: content/browser/renderer_host/p2p/socket_host_tcp.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: Rebase. 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: content/browser/renderer_host/p2p/socket_host_tcp.cc
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.cc b/content/browser/renderer_host/p2p/socket_host_tcp.cc
index 6bbe2d1e489ef90761d20eece186ae38cc3918c5..35307d4aaca6ac6385f02b6af0a78e882f946d05 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp.cc
@@ -168,8 +168,8 @@ void P2PSocketHostTcp::DidCompleteRead(int result) {
read_buffer_->set_offset(read_buffer_->offset() + result);
if (read_buffer_->offset() > kPacketHeaderSize) {
- int packet_size =
- ntohs(*reinterpret_cast<uint16*>(read_buffer_->StartOfBuffer()));
+ int packet_size = base::NetToHost16(
+ *reinterpret_cast<uint16*>(read_buffer_->StartOfBuffer()));
if (packet_size + kPacketHeaderSize <= read_buffer_->offset()) {
// We've got a full packet!
char* start = read_buffer_->StartOfBuffer() + kPacketHeaderSize;
@@ -221,7 +221,8 @@ void P2PSocketHostTcp::Send(const net::IPEndPoint& to,
int size = kPacketHeaderSize + data.size();
write_buffer_ = new net::DrainableIOBuffer(new net::IOBuffer(size), size);
- *reinterpret_cast<uint16*>(write_buffer_->data()) = htons(data.size());
+ *reinterpret_cast<uint16*>(write_buffer_->data()) =
+ base::HostToNet16(data.size());
memcpy(write_buffer_->data() + kPacketHeaderSize, &data[0], data.size());
DoWrite();
« no previous file with comments | « content/browser/renderer_host/p2p/socket_host.cc ('k') | content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698