Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "net/dns/mojo_type_converters.h" | 5 #include "net/dns/mojo_type_converters.h" |
| 6 | 6 |
| 7 #include "net/base/address_list.h" | 7 #include "net/base/address_list.h" |
| 8 #include "net/base/net_util.h" | 8 #include "net/base/net_util.h" |
| 9 #include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" | 9 #include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" |
| 10 | 10 |
| 11 namespace net { | |
| 12 namespace { | |
| 13 | |
| 14 AddressFamily AddressFamilyFromMojo(interfaces::AddressFamily address_family) { | |
| 15 switch (address_family) { | |
| 16 case interfaces::ADDRESS_FAMILY_UNSPECIFIED: | |
| 17 return ADDRESS_FAMILY_UNSPECIFIED; | |
| 18 case interfaces::ADDRESS_FAMILY_IPV4: | |
| 19 return ADDRESS_FAMILY_IPV4; | |
| 20 case interfaces::ADDRESS_FAMILY_IPV6: | |
| 21 return ADDRESS_FAMILY_IPV6; | |
| 22 } | |
| 23 NOTREACHED(); | |
| 24 return ADDRESS_FAMILY_UNSPECIFIED; | |
| 25 } | |
| 26 | |
| 27 interfaces::AddressFamily AddressFamilyToMojo(AddressFamily address_family) { | |
| 28 switch (address_family) { | |
| 29 case ADDRESS_FAMILY_UNSPECIFIED: | |
| 30 return interfaces::ADDRESS_FAMILY_UNSPECIFIED; | |
| 31 case ADDRESS_FAMILY_IPV4: | |
| 32 return interfaces::ADDRESS_FAMILY_IPV4; | |
| 33 case ADDRESS_FAMILY_IPV6: | |
| 34 return interfaces::ADDRESS_FAMILY_IPV6; | |
| 35 } | |
| 36 NOTREACHED(); | |
| 37 return interfaces::ADDRESS_FAMILY_UNSPECIFIED; | |
| 38 } | |
| 39 | |
| 40 } // namespace | |
| 41 } // namespace net | |
| 42 | |
| 11 namespace mojo { | 43 namespace mojo { |
| 12 | 44 |
| 13 // static | 45 // static |
| 14 net::HostResolver::RequestInfo | 46 net::HostResolver::RequestInfo |
| 15 TypeConverter<net::HostResolver::RequestInfo, | 47 TypeConverter<net::HostResolver::RequestInfo, |
| 16 net::interfaces::HostResolverRequestInfo>:: | 48 net::interfaces::HostResolverRequestInfo>:: |
| 17 Convert(const net::interfaces::HostResolverRequestInfo& obj) { | 49 Convert(const net::interfaces::HostResolverRequestInfo& obj) { |
| 18 net::HostResolver::RequestInfo result(net::HostPortPair(obj.host, obj.port)); | 50 net::HostResolver::RequestInfo result(net::HostPortPair(obj.host, obj.port)); |
| 19 result.set_address_family( | 51 result.set_address_family(net::AddressFamilyFromMojo(obj.address_family)); |
|
Anand Mistry (off Chromium)
2015/02/16 06:32:44
Oops. I missed setting result.set_is_my_ip_address
Sam McNally
2015/02/16 07:24:44
Done.
| |
| 20 static_cast<net::AddressFamily>(obj.address_family)); | |
| 21 return result; | 52 return result; |
| 22 } | 53 } |
| 23 | 54 |
| 24 // static | 55 // static |
| 56 net::interfaces::HostResolverRequestInfoPtr | |
| 57 TypeConverter<net::interfaces::HostResolverRequestInfoPtr, | |
| 58 net::HostResolver::RequestInfo>:: | |
| 59 Convert(const net::HostResolver::RequestInfo& obj) { | |
| 60 net::interfaces::HostResolverRequestInfoPtr result( | |
| 61 net::interfaces::HostResolverRequestInfo::New()); | |
| 62 result->host = obj.hostname(); | |
| 63 result->port = obj.port(); | |
| 64 result->address_family = net::AddressFamilyToMojo(obj.address_family()); | |
| 65 result->is_my_ip_address = obj.is_my_ip_address(); | |
| 66 return result.Pass(); | |
| 67 } | |
| 68 | |
| 69 // static | |
| 25 net::interfaces::AddressListPtr | 70 net::interfaces::AddressListPtr |
| 26 TypeConverter<net::interfaces::AddressListPtr, net::AddressList>::Convert( | 71 TypeConverter<net::interfaces::AddressListPtr, net::AddressList>::Convert( |
| 27 const net::AddressList& obj) { | 72 const net::AddressList& obj) { |
| 28 net::interfaces::AddressListPtr result(net::interfaces::AddressList::New()); | 73 net::interfaces::AddressListPtr result(net::interfaces::AddressList::New()); |
| 29 for (const auto& endpoint : obj) { | 74 for (const auto& endpoint : obj) { |
| 30 net::interfaces::IPEndPointPtr ep(net::interfaces::IPEndPoint::New()); | 75 net::interfaces::IPEndPointPtr ep(net::interfaces::IPEndPoint::New()); |
| 31 ep->port = endpoint.port(); | 76 ep->port = endpoint.port(); |
| 32 ep->address = mojo::Array<uint8_t>::From(endpoint.address()); | 77 ep->address = mojo::Array<uint8_t>::From(endpoint.address()); |
| 33 result->addresses.push_back(ep.Pass()); | 78 result->addresses.push_back(ep.Pass()); |
| 34 } | 79 } |
| 35 return result.Pass(); | 80 return result.Pass(); |
| 36 } | 81 } |
| 37 | 82 |
| 38 // static | 83 // static |
| 39 net::AddressList | 84 net::AddressList |
| 40 TypeConverter<net::AddressList, net::interfaces::AddressList>::Convert( | 85 TypeConverter<net::AddressList, net::interfaces::AddressList>::Convert( |
| 41 const net::interfaces::AddressList& obj) { | 86 const net::interfaces::AddressList& obj) { |
| 42 net::AddressList address_list; | 87 net::AddressList address_list; |
| 43 for (size_t i = 0; i < obj.addresses.size(); i++) { | 88 for (size_t i = 0; i < obj.addresses.size(); i++) { |
| 44 const net::interfaces::IPEndPointPtr& ep = obj.addresses[i]; | 89 const net::interfaces::IPEndPointPtr& ep = obj.addresses[i]; |
| 45 address_list.push_back( | 90 address_list.push_back( |
| 46 net::IPEndPoint(ep->address.To<net::IPAddressNumber>(), ep->port)); | 91 net::IPEndPoint(ep->address.To<net::IPAddressNumber>(), ep->port)); |
| 47 } | 92 } |
| 48 return address_list; | 93 return address_list; |
| 49 } | 94 } |
| 50 | 95 |
| 51 } // namespace mojo | 96 } // namespace mojo |
| OLD | NEW |