f137e97adb
Also needed to revert these CLs, which removed code used by the
code being un-removed:
https://codereview.webrtc.org/2745523004
https://codereview.webrtc.org/2754033003
https://codereview.webrtc.org/2758943002
Reason for revert:
This code is still being used by native application developers, so we should send a PSA announcing the deprecation and suggest an alternative before removing it.
Original issue's description:
> Removing HTTPS and SOCKS proxy server code.
>
> This isn't used any more so there's no point in maintaining it.
>
> BUG=None
>
> Review-Url: https://codereview.webrtc.org/2731673002
> Cr-Commit-Position: refs/heads/master@{#17016}
> Committed: a1991c5175
TBR=pthatcher@webrtc.org
NOPRESUBMIT=true
NOTRY=true
BUG=None
Review-Url: https://codereview.webrtc.org/2766063005
Cr-Commit-Position: refs/heads/master@{#17369}
44 lines
996 B
C++
44 lines
996 B
C++
/*
|
|
* Copyright 2004 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_BASE_PROXYINFO_H__
|
|
#define WEBRTC_BASE_PROXYINFO_H__
|
|
|
|
#include <string>
|
|
#include "webrtc/base/socketaddress.h"
|
|
#include "webrtc/base/cryptstring.h"
|
|
|
|
namespace rtc {
|
|
|
|
enum ProxyType {
|
|
PROXY_NONE,
|
|
PROXY_HTTPS,
|
|
PROXY_SOCKS5,
|
|
PROXY_UNKNOWN
|
|
};
|
|
const char * ProxyToString(ProxyType proxy);
|
|
|
|
struct ProxyInfo {
|
|
ProxyType type;
|
|
SocketAddress address;
|
|
std::string autoconfig_url;
|
|
bool autodetect;
|
|
std::string bypass_list;
|
|
std::string username;
|
|
CryptString password;
|
|
|
|
ProxyInfo();
|
|
~ProxyInfo();
|
|
};
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // WEBRTC_BASE_PROXYINFO_H__
|