OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "remoting/client/plugin/pepper_util.h" | 5 #include "remoting/client/plugin/pepper_util.h" |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/sys_byteorder.h" | 9 #include "base/sys_byteorder.h" |
10 #include "ppapi/cpp/module.h" | 10 #include "ppapi/cpp/module.h" |
11 #include "ppapi/cpp/net_address.h" | 11 #include "ppapi/cpp/net_address.h" |
12 #include "third_party/webrtc/base/socketaddress.h" | 12 #include "third_party/libjingle/source/talk/base/socketaddress.h" |
13 | 13 |
14 namespace remoting { | 14 namespace remoting { |
15 | 15 |
16 bool SocketAddressToPpNetAddressWithPort( | 16 bool SocketAddressToPpNetAddressWithPort( |
17 const pp::InstanceHandle& instance, | 17 const pp::InstanceHandle& instance, |
18 const rtc::SocketAddress& address, | 18 const talk_base::SocketAddress& address, |
19 pp::NetAddress* pp_address, | 19 pp::NetAddress* pp_address, |
20 uint16_t port) { | 20 uint16_t port) { |
21 switch (address.ipaddr().family()) { | 21 switch (address.ipaddr().family()) { |
22 case AF_INET: { | 22 case AF_INET: { |
23 in_addr ipv4_addr = address.ipaddr().ipv4_address(); | 23 in_addr ipv4_addr = address.ipaddr().ipv4_address(); |
24 PP_NetAddress_IPv4 ip_addr; | 24 PP_NetAddress_IPv4 ip_addr; |
25 ip_addr.port = base::HostToNet16(port); | 25 ip_addr.port = base::HostToNet16(port); |
26 memcpy(&ip_addr.addr, &ipv4_addr, sizeof(ip_addr.addr)); | 26 memcpy(&ip_addr.addr, &ipv4_addr, sizeof(ip_addr.addr)); |
27 *pp_address = pp::NetAddress(instance, ip_addr); | 27 *pp_address = pp::NetAddress(instance, ip_addr); |
28 return true; | 28 return true; |
29 } | 29 } |
30 case AF_INET6: { | 30 case AF_INET6: { |
31 in6_addr ipv6_addr = address.ipaddr().ipv6_address(); | 31 in6_addr ipv6_addr = address.ipaddr().ipv6_address(); |
32 PP_NetAddress_IPv6 ip_addr; | 32 PP_NetAddress_IPv6 ip_addr; |
33 ip_addr.port = base::HostToNet16(port); | 33 ip_addr.port = base::HostToNet16(port); |
34 memcpy(&ip_addr.addr, &ipv6_addr, sizeof(ip_addr.addr)); | 34 memcpy(&ip_addr.addr, &ipv6_addr, sizeof(ip_addr.addr)); |
35 *pp_address = pp::NetAddress(instance, ip_addr); | 35 *pp_address = pp::NetAddress(instance, ip_addr); |
36 return true; | 36 return true; |
37 } | 37 } |
38 default: { | 38 default: { |
39 LOG(WARNING) << "Unknown address family: " << address.ipaddr().family(); | 39 LOG(WARNING) << "Unknown address family: " << address.ipaddr().family(); |
40 return false; | 40 return false; |
41 } | 41 } |
42 } | 42 } |
43 } | 43 } |
44 | 44 |
45 bool SocketAddressToPpNetAddress(const pp::InstanceHandle& instance, | 45 bool SocketAddressToPpNetAddress(const pp::InstanceHandle& instance, |
46 const rtc::SocketAddress& address, | 46 const talk_base::SocketAddress& address, |
47 pp::NetAddress* pp_net_address) { | 47 pp::NetAddress* pp_net_address) { |
48 return SocketAddressToPpNetAddressWithPort(instance, | 48 return SocketAddressToPpNetAddressWithPort(instance, |
49 address, | 49 address, |
50 pp_net_address, | 50 pp_net_address, |
51 address.port()); | 51 address.port()); |
52 } | 52 } |
53 | 53 |
54 void PpNetAddressToSocketAddress(const pp::NetAddress& pp_net_address, | 54 void PpNetAddressToSocketAddress(const pp::NetAddress& pp_net_address, |
55 rtc::SocketAddress* address) { | 55 talk_base::SocketAddress* address) { |
56 switch (pp_net_address.GetFamily()) { | 56 switch (pp_net_address.GetFamily()) { |
57 case PP_NETADDRESS_FAMILY_IPV4: { | 57 case PP_NETADDRESS_FAMILY_IPV4: { |
58 PP_NetAddress_IPv4 ipv4_addr; | 58 PP_NetAddress_IPv4 ipv4_addr; |
59 CHECK(pp_net_address.DescribeAsIPv4Address(&ipv4_addr)); | 59 CHECK(pp_net_address.DescribeAsIPv4Address(&ipv4_addr)); |
60 address->SetIP(rtc::IPAddress( | 60 address->SetIP(talk_base::IPAddress( |
61 bit_cast<in_addr>(ipv4_addr.addr))); | 61 bit_cast<in_addr>(ipv4_addr.addr))); |
62 address->SetPort(base::NetToHost16(ipv4_addr.port)); | 62 address->SetPort(base::NetToHost16(ipv4_addr.port)); |
63 return; | 63 return; |
64 } | 64 } |
65 case PP_NETADDRESS_FAMILY_IPV6: { | 65 case PP_NETADDRESS_FAMILY_IPV6: { |
66 PP_NetAddress_IPv6 ipv6_addr; | 66 PP_NetAddress_IPv6 ipv6_addr; |
67 CHECK(pp_net_address.DescribeAsIPv6Address(&ipv6_addr)); | 67 CHECK(pp_net_address.DescribeAsIPv6Address(&ipv6_addr)); |
68 address->SetIP(rtc::IPAddress( | 68 address->SetIP(talk_base::IPAddress( |
69 bit_cast<in6_addr>(ipv6_addr.addr))); | 69 bit_cast<in6_addr>(ipv6_addr.addr))); |
70 address->SetPort(base::NetToHost16(ipv6_addr.port)); | 70 address->SetPort(base::NetToHost16(ipv6_addr.port)); |
71 return; | 71 return; |
72 } | 72 } |
73 case PP_NETADDRESS_FAMILY_UNSPECIFIED: { | 73 case PP_NETADDRESS_FAMILY_UNSPECIFIED: { |
74 break; | 74 break; |
75 } | 75 } |
76 }; | 76 }; |
77 | 77 |
78 NOTREACHED(); | 78 NOTREACHED(); |
79 address->Clear(); | 79 address->Clear(); |
80 } | 80 } |
81 | 81 |
82 } // namespace remoting | 82 } // namespace remoting |
OLD | NEW |