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

Updated -info switch to include Host OS Info and Architecture

Browse Source
This commit is contained in:
Bryan Roe
2021-08-10 22:32:13 -07:00
parent 841642dec4
commit c60b067c00
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
meshconsole/main.c
View File

@@ -235,15 +235,16 @@ char* crashMemory = ILib_POSIX_InstallCrashHandler(argv[0]);
if (SOURCE_COMMIT_HASH != NULL && SOURCE_COMMIT_DATE != NULL) if (SOURCE_COMMIT_HASH != NULL && SOURCE_COMMIT_DATE != NULL)
{ {
printf(" Commit Hash: %s\n", SOURCE_COMMIT_HASH); printf(" Commit Hash: %s\n", SOURCE_COMMIT_HASH);
printf(" Commit Date: %s\n", SOURCE_COMMIT_DATE); printf(" Commit Date: %s\n", SOURCE_COMMIT_DATE);
} }
#ifndef MICROSTACK_NOTLS #ifndef MICROSTACK_NOTLS
printf("Using %s\n", SSLeay_version(SSLEAY_VERSION)); printf("Using %s\n", SSLeay_version(SSLEAY_VERSION));
#endif #endif
#ifdef WIN32
wmain_free(argv); printf("Agent ARCHID: %d\n", MESH_AGENTID);
#endif char script[] = "console.log('Detected platform: ' + require('os').Name + ' - ' + require('os').arch());process.exit();";
return(0); integratedJavaScript = ILibString_Copy(script, sizeof(script) - 1);
integratedJavaScriptLen = (int)sizeof(script) - 1;
} }
if (argc > 1 && strcasecmp(argv[1], "-updaterversion") == 0) if (argc > 1 && strcasecmp(argv[1], "-updaterversion") == 0)
{ {

17
meshservice/ServiceMain.c
View File

@@ -430,6 +430,9 @@ int wmain(int argc, char* wargv[])
#endif #endif
return(0); return(0);
} }
char *integratedJavaScript = NULL;
int integragedJavaScriptLen = 0;
if (argc > 1 && strcasecmp(argv[1], "-info") == 0) if (argc > 1 && strcasecmp(argv[1], "-info") == 0)
{ {
printf("Compiled on: %s, %s\n", __TIME__, __DATE__); printf("Compiled on: %s, %s\n", __TIME__, __DATE__);
@@ -441,8 +444,10 @@ int wmain(int argc, char* wargv[])
#ifndef MICROSTACK_NOTLS #ifndef MICROSTACK_NOTLS
printf("Using %s\n", SSLeay_version(SSLEAY_VERSION)); printf("Using %s\n", SSLeay_version(SSLEAY_VERSION));
#endif #endif
wmain_free(argv); printf("Agent ARCHID: %d\n", MESH_AGENTID);
return(0); char script[] = "console.log('Detected platform: ' + require('os').Name + ' - ' + require('os').arch());process.exit();";
integratedJavaScript = ILibString_Copy(script, sizeof(script) - 1);
integragedJavaScriptLen = (int)sizeof(script) - 1;
} }
if (argc > 2 && strcasecmp(argv[1], "-faddr") == 0) if (argc > 2 && strcasecmp(argv[1], "-faddr") == 0)
@@ -470,9 +475,11 @@ int wmain(int argc, char* wargv[])
return(0); return(0);
} }
char *integratedJavaScript; if (integratedJavaScript == NULL || integragedJavaScriptLen == 0)
int integragedJavaScriptLen; {
ILibDuktape_ScriptContainer_CheckEmbedded(&integratedJavaScript, &integragedJavaScriptLen); ILibDuktape_ScriptContainer_CheckEmbedded(&integratedJavaScript, &integragedJavaScriptLen);
}
if (argc > 2 && strcmp(argv[1], "-exec") == 0 && integragedJavaScriptLen == 0) if (argc > 2 && strcmp(argv[1], "-exec") == 0 && integragedJavaScriptLen == 0)
{ {
integratedJavaScript = ILibString_Copy(argv[2], 0); integratedJavaScript = ILibString_Copy(argv[2], 0);