mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added option to ignore proxy env.

Browse Source
This commit is contained in:
Armin Novak 2018-08-21 11:01:54 +02:00
parent a0facc329f
commit b5df39756d
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/common/cmdline.c
View File

@ -1876,7 +1876,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
*p = '\0'; *p = '\0';
if (_stricmp("no_proxy", arg->Value) == 0) if (_stricmp("no_proxy", arg->Value) == 0)
settings->ProxyType = PROXY_TYPE_NONE; settings->ProxyType = PROXY_TYPE_IGNORE;
if (_stricmp("http", arg->Value) == 0) if (_stricmp("http", arg->Value) == 0)
settings->ProxyType = PROXY_TYPE_HTTP; settings->ProxyType = PROXY_TYPE_HTTP;

1
include/freerdp/settings.h
View File

@ -475,6 +475,7 @@ typedef struct _RDPDR_PARALLEL RDPDR_PARALLEL;
#define PROXY_TYPE_NONE 0 #define PROXY_TYPE_NONE 0
#define PROXY_TYPE_HTTP 1 #define PROXY_TYPE_HTTP 1
#define PROXY_TYPE_SOCKS 2 #define PROXY_TYPE_SOCKS 2
#define PROXY_TYPE_IGNORE 0xFFFF
/* Settings */ /* Settings */

18
libfreerdp/core/proxy.c
View File

@ -75,20 +75,23 @@ void proxy_read_environment(rdpSettings* settings, char* envname);
BOOL proxy_prepare(rdpSettings* settings, const char** lpPeerHostname, UINT16* lpPeerPort, BOOL proxy_prepare(rdpSettings* settings, const char** lpPeerHostname, UINT16* lpPeerPort,
const char** lpProxyUsername, const char** lpProxyPassword) const char** lpProxyUsername, const char** lpProxyPassword)
{ {
if (settings->ProxyType == PROXY_TYPE_IGNORE)
return FALSE;
/* For TSGateway, find the system HTTPS proxy automatically */ /* For TSGateway, find the system HTTPS proxy automatically */
if (!settings->ProxyType) if (settings->ProxyType == PROXY_TYPE_NONE)
proxy_read_environment(settings, "https_proxy"); proxy_read_environment(settings, "https_proxy");
if (!settings->ProxyType) if (settings->ProxyType == PROXY_TYPE_NONE)
proxy_read_environment(settings, "HTTPS_PROXY"); proxy_read_environment(settings, "HTTPS_PROXY");
if (settings->ProxyType) if (settings->ProxyType != PROXY_TYPE_NONE)
proxy_read_environment(settings, "no_proxy"); proxy_read_environment(settings, "no_proxy");
if (settings->ProxyType) if (settings->ProxyType != PROXY_TYPE_NONE)
proxy_read_environment(settings, "NO_PROXY"); proxy_read_environment(settings, "NO_PROXY");
if (settings->ProxyType) if (settings->ProxyType != PROXY_TYPE_NONE)
{ {
*lpPeerHostname = settings->ProxyHostname; *lpPeerHostname = settings->ProxyHostname;
*lpPeerPort = settings->ProxyPort; *lpPeerPort = settings->ProxyPort;
@ -163,7 +166,7 @@ static BOOL check_no_proxy(rdpSettings* settings, const char* no_proxy)
if (!strncmp(current, settings->ServerHostname, currentlen)) if (!strncmp(current, settings->ServerHostname, currentlen))
result = TRUE; /* left-aligned match for IPs */ result = TRUE; /* left-aligned match for IPs */
} }
else if (current[0] == '.') /* Only compare if the no_proxy variable contains a whole domain. */ else if (current[0] == '.') /* Only compare if the no_proxy variable contains a whole domain. */
{ {
if (host_len >= currentlen) if (host_len >= currentlen)
{ {
@ -204,7 +207,7 @@ void proxy_read_environment(rdpSettings* settings, char* envname)
if (GetEnvironmentVariableA(envname, env, envlen) == envlen - 1) if (GetEnvironmentVariableA(envname, env, envlen) == envlen - 1)
{ {
if (_strnicmp("NO_PROXY", envname, 9) == 0) if (_strnicmp("NO_PROXY", envname, 9) == 0)
{ {
if (check_no_proxy(settings, env)) if (check_no_proxy(settings, env))
{ {
@ -303,6 +306,7 @@ BOOL proxy_connect(rdpSettings* settings, BIO* bufferedBio, const char* proxyUse
switch (settings->ProxyType) switch (settings->ProxyType)
{ {
case PROXY_TYPE_NONE: case PROXY_TYPE_NONE:
case PROXY_TYPE_IGNORE:
return TRUE; return TRUE;
case PROXY_TYPE_HTTP: case PROXY_TYPE_HTTP: