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

Unified Diff: mojo/services/network/net_address_type_converters.cc

Issue 645423003: Make Mojo's NetAddress use local endianness for the port. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | mojo/services/public/interfaces/network/net_address.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/network/net_address_type_converters.cc
diff --git a/mojo/services/network/net_address_type_converters.cc b/mojo/services/network/net_address_type_converters.cc
index 573c0ff1b48dea29b4b8a42ed75acaf25ebb7c4c..31dc9d942359d451ec05c030bbd7c8de14775a1a 100644
--- a/mojo/services/network/net_address_type_converters.cc
+++ b/mojo/services/network/net_address_type_converters.cc
@@ -4,8 +4,6 @@
#include "mojo/services/network/net_address_type_converters.h"
-#include "base/sys_byteorder.h"
-
namespace mojo {
// static
@@ -18,14 +16,12 @@ net::IPEndPoint TypeConverter<net::IPEndPoint, NetAddressPtr>::Convert(
case NET_ADDRESS_FAMILY_IPV4:
if (!obj->ipv4)
break;
- return net::IPEndPoint(
- obj->ipv4->addr.storage(), base::NetToHost16(obj->ipv4->port));
+ return net::IPEndPoint(obj->ipv4->addr.storage(), obj->ipv4->port);
case NET_ADDRESS_FAMILY_IPV6:
if (!obj->ipv6)
break;
- return net::IPEndPoint(
- obj->ipv6->addr.storage(), base::NetToHost16(obj->ipv6->port));
+ return net::IPEndPoint(obj->ipv6->addr.storage(), obj->ipv6->port);
default:
break;
@@ -43,15 +39,13 @@ NetAddressPtr TypeConverter<NetAddressPtr, net::IPEndPoint>::Convert(
case net::ADDRESS_FAMILY_IPV4:
net_address->family = NET_ADDRESS_FAMILY_IPV4;
net_address->ipv4 = NetAddressIPv4::New();
- net_address->ipv4->port =
- base::HostToNet16(static_cast<uint16>(obj.port()));
+ net_address->ipv4->port = static_cast<uint16>(obj.port());
net_address->ipv4->addr = Array<uint8_t>::From(obj.address());
break;
case NET_ADDRESS_FAMILY_IPV6:
net_address->ipv6 = NetAddressIPv6::New();
net_address->family = NET_ADDRESS_FAMILY_IPV6;
- net_address->ipv6->port =
- base::HostToNet16(static_cast<uint16>(obj.port()));
+ net_address->ipv6->port = static_cast<uint16>(obj.port());
net_address->ipv6->addr = Array<uint8_t>::From(obj.address());
break;
default:
« no previous file with comments | « no previous file | mojo/services/public/interfaces/network/net_address.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698