| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef WEBRTC_BASE_PROXYINFO_H__ | 11 #ifndef WEBRTC_BASE_PROXYINFO_H__ |
| 12 #define WEBRTC_BASE_PROXYINFO_H__ | 12 #define WEBRTC_BASE_PROXYINFO_H__ |
| 13 | 13 |
| 14 #include <string> | |
| 15 #include "webrtc/base/socketaddress.h" | |
| 16 #include "webrtc/base/cryptstring.h" | |
| 17 | |
| 18 namespace rtc { | 14 namespace rtc { |
| 19 | 15 |
| 16 // TODO(deadbeef): Remove this; it's not used any more but it's referenced in |
| 17 // some places, including chromium. |
| 20 enum ProxyType { | 18 enum ProxyType { |
| 21 PROXY_NONE, | 19 PROXY_NONE, |
| 22 PROXY_HTTPS, | |
| 23 PROXY_SOCKS5, | |
| 24 PROXY_UNKNOWN | |
| 25 }; | 20 }; |
| 26 const char * ProxyToString(ProxyType proxy); | |
| 27 | 21 |
| 28 struct ProxyInfo { | 22 struct ProxyInfo { |
| 29 ProxyType type; | |
| 30 SocketAddress address; | |
| 31 std::string autoconfig_url; | |
| 32 bool autodetect; | |
| 33 std::string bypass_list; | |
| 34 std::string username; | |
| 35 CryptString password; | |
| 36 | |
| 37 ProxyInfo(); | |
| 38 ~ProxyInfo(); | |
| 39 }; | 23 }; |
| 40 | 24 |
| 41 } // namespace rtc | 25 } // namespace rtc |
| 42 | 26 |
| 43 #endif // WEBRTC_BASE_PROXYINFO_H__ | 27 #endif // WEBRTC_BASE_PROXYINFO_H__ |
| OLD | NEW |