MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-14 15:23:39 +00:00
Code Issues Releases Wiki Activity

Fixed bug where clearing proxy setting, didn't clear all the settings

Browse Source
This commit is contained in:
Bryan Roe
2019-01-17 22:59:27 -08:00
parent 335ff51bfe
commit 2366122d58
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meshcore/agentcore.c
View File

@@ -2763,7 +2763,7 @@ void MeshServer_ConnectEx(MeshAgentHostContainer *agent)
{ {
printf("Disabling Proxy: %s\n", ILibScratchPad); printf("Disabling Proxy: %s\n", ILibScratchPad);
agent->triedNoProxy_Index++; agent->triedNoProxy_Index++;
agent->proxyServer = NULL; agent->proxyServer = ILibWebClient_SetProxy(reqToken, NULL, 0, NULL, NULL);;
if (duk_peval_string(agent->meshCoreCtx, "require('global-tunnel');") == 0) if (duk_peval_string(agent->meshCoreCtx, "require('global-tunnel');") == 0)
{ {

1
microstack/ILibAsyncSocket.c
View File

@@ -1010,6 +1010,7 @@ void ILibAsyncSocket_ClearProxySettings(void *socketModule)
{ {
struct ILibAsyncSocketModule *module = (struct ILibAsyncSocketModule*)socketModule; struct ILibAsyncSocketModule *module = (struct ILibAsyncSocketModule*)socketModule;
memset(&(module->ProxyAddress), 0, sizeof(struct sockaddr_in6)); memset(&(module->ProxyAddress), 0, sizeof(struct sockaddr_in6));
module->ProxyState = 0;
} }
//! Connect using an HTTPS proxy. If "proxyAddress" is set to NULL, this call acts just to a normal connect call without a proxy. //! Connect using an HTTPS proxy. If "proxyAddress" is set to NULL, this call acts just to a normal connect call without a proxy.

5
microstack/ILibWebClient.c
View File

@@ -3797,6 +3797,11 @@ struct sockaddr_in6* ILibWebClient_SetProxy(ILibWebClient_RequestToken token, ch
{ {
ILibWebClientDataObject *wcdo = ILibWebClient_GetStateObjectFromRequestToken(token); ILibWebClientDataObject *wcdo = ILibWebClient_GetStateObjectFromRequestToken(token);
if (wcdo == NULL) { return(NULL); } if (wcdo == NULL) { return(NULL); }
if (proxyHost == NULL)
{
memset(&(wcdo->proxy), 0, sizeof(struct sockaddr_in6));
return(NULL);
}
if (ILibResolveEx(proxyHost, proxyPort, &(wcdo->proxy)) != 0 || wcdo->proxy.sin6_family == AF_UNSPEC) if (ILibResolveEx(proxyHost, proxyPort, &(wcdo->proxy)) != 0 || wcdo->proxy.sin6_family == AF_UNSPEC)
{ {