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

freebsd update for proxy detection, when running as service

Browse Source
This commit is contained in:
Bryan Roe
2019-06-24 15:02:10 -07:00
parent c054a38247
commit ddff71dd79
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meshcore/agentcore.c
View File

@@ -413,9 +413,9 @@ int MeshAgent_GetSystemProxy(MeshAgentHostContainer *agent, char *buffer, size_t
char getProxy[] = "(function getProxies(){\ char getProxy[] = "(function getProxies(){\
var child = require('child_process').execFile('/bin/sh', ['sh']);\ var child = require('child_process').execFile('/bin/sh', ['sh']);\
child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });\ child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });\
child.stdin.write('cat /etc/login.conf | grep :setenv = | awk - F\":setenv=\" \\'{ if(!($1 ~ /^#/)) { print $2 } }\\' | tr \\'\\,\\' \\'\\n\\' | awk -F= \\'{ if($1==\"https_proxy\") { gsub(/\\\\c/, \":\", $2); print $2 } }\\'\\n\\exit\\n');\ child.stdin.write('cat /etc/login.conf | grep :setenv= | awk -F\":setenv=\" \\'{ if(!($1 ~ /^#/)) { print $2 } }\\' | tr \"\\,\" \"\\n\" | awk -F= \\'{ if($1==\"https_proxy\") { gsub(/\\\\\\\\c/, \":\", $2); print $2 } }\\'\\n\\exit\\n');\
child.waitExit();\ child.waitExit();\
return(child.stdout.str.trim().split('\\n')[0]);\ return(child.stdout.str.trim().split('\\n')[0].split('//')[1]);\
})();"; })();";
#else #else
char getProxy[] = "(function getProxies(){\ char getProxy[] = "(function getProxies(){\
@@ -3376,6 +3376,10 @@ void MeshServer_ConnectEx(MeshAgentHostContainer *agent)
else else
{ {
printf("Using proxy: %s\n", ILibScratchPad); printf("Using proxy: %s\n", ILibScratchPad);
if(agent->logUpdate != 0)
{
ILIBLOGMESSAGEX("Using proxy: %s", ILibScratchPad);
}
if (delimiter > 0) if (delimiter > 0)
{ {
ILibScratchPad[delimiter] = 0; ILibScratchPad[delimiter] = 0;