| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #ifndef JINGLE_GLUE_UTILS_H_ | 5 #ifndef JINGLE_GLUE_UTILS_H_ | 
| 6 #define JINGLE_GLUE_UTILS_H_ | 6 #define JINGLE_GLUE_UTILS_H_ | 
| 7 | 7 | 
| 8 #include <string> | 8 #include <string> | 
| 9 | 9 | 
|  | 10 #include "net/base/ip_address_number.h" | 
|  | 11 | 
| 10 namespace net { | 12 namespace net { | 
| 11 class IPEndPoint; | 13 class IPEndPoint; | 
| 12 }  // namespace net | 14 }  // namespace net | 
| 13 | 15 | 
| 14 namespace rtc { | 16 namespace rtc { | 
|  | 17 class IPAddress; | 
| 15 class SocketAddress; | 18 class SocketAddress; | 
| 16 }  // namespace rtc | 19 }  // namespace rtc | 
| 17 | 20 | 
| 18 namespace cricket { | 21 namespace cricket { | 
| 19 class Candidate; | 22 class Candidate; | 
| 20 }  // namespace cricket | 23 }  // namespace cricket | 
| 21 | 24 | 
| 22 namespace jingle_glue { | 25 namespace jingle_glue { | 
| 23 | 26 | 
| 24 // Chromium and libjingle represent socket addresses differently. The | 27 // Chromium and libjingle represent socket addresses differently. The | 
| 25 // following two functions are used to convert addresses from one | 28 // following two functions are used to convert addresses from one | 
| 26 // representation to another. | 29 // representation to another. | 
| 27 bool IPEndPointToSocketAddress(const net::IPEndPoint& ip_endpoint, | 30 bool IPEndPointToSocketAddress(const net::IPEndPoint& ip_endpoint, | 
| 28                                rtc::SocketAddress* address); | 31                                rtc::SocketAddress* address); | 
| 29 bool SocketAddressToIPEndPoint(const rtc::SocketAddress& address, | 32 bool SocketAddressToIPEndPoint(const rtc::SocketAddress& address, | 
| 30                                net::IPEndPoint* ip_endpoint); | 33                                net::IPEndPoint* ip_endpoint); | 
| 31 | 34 | 
|  | 35 bool IPAddressNumberToIPAddress(const net::IPAddressNumber& ip_address_number, | 
|  | 36                                 rtc::IPAddress* ip_address); | 
|  | 37 | 
| 32 // Helper functions to serialize and deserialize P2P candidates. | 38 // Helper functions to serialize and deserialize P2P candidates. | 
| 33 std::string SerializeP2PCandidate(const cricket::Candidate& candidate); | 39 std::string SerializeP2PCandidate(const cricket::Candidate& candidate); | 
| 34 bool DeserializeP2PCandidate(const std::string& address, | 40 bool DeserializeP2PCandidate(const std::string& address, | 
| 35                              cricket::Candidate* candidate); | 41                              cricket::Candidate* candidate); | 
| 36 | 42 | 
| 37 }  // namespace jingle_glue | 43 }  // namespace jingle_glue | 
| 38 | 44 | 
| 39 #endif  // JINGLE_GLUE_UTILS_H_ | 45 #endif  // JINGLE_GLUE_UTILS_H_ | 
| OLD | NEW | 
|---|