From cef67a1c8e7d01930dcf318c498bc6bdaca5449b Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Wed, 30 Jan 2019 13:03:37 -0800 Subject: [PATCH] Updated, so if ignoreProxyFile is specified in db, it will not try to use a proxy --- meshcore/agentcore.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meshcore/agentcore.c b/meshcore/agentcore.c index 9c2e62c..8e70807 100644 --- a/meshcore/agentcore.c +++ b/meshcore/agentcore.c @@ -2965,8 +2965,7 @@ void MeshServer_ConnectEx(MeshAgentHostContainer *agent) ILibWebClient_Request_SetHTTPS(reqToken, result == ILibParseUriResult_TLS ? ILibWebClient_RequestToken_USE_HTTPS : ILibWebClient_RequestToken_USE_HTTP); ILibWebClient_Request_SetSNI(reqToken, host, (int)strnlen_s(host, serverUrlLen)); #endif - - if ((len = ILibSimpleDataStore_Get(agent->masterDb, "WebProxy", ILibScratchPad, sizeof(ILibScratchPad))) != 0 || (len = MeshAgent_GetSystemProxy(agent, ILibScratchPad, sizeof(ILibScratchPad))) != 0) + if ((ILibSimpleDataStore_GetEx(agent->masterDb, "ignoreProxyFile", 15, ILibScratchPad, sizeof(ILibScratchPad)) == 0) && ((len = ILibSimpleDataStore_Get(agent->masterDb, "WebProxy", ILibScratchPad, sizeof(ILibScratchPad))) != 0 || (len = MeshAgent_GetSystemProxy(agent, ILibScratchPad, sizeof(ILibScratchPad))) != 0)) { #ifdef MICROSTACK_PROXY unsigned short proxyPort = 80;