MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-02-05 03:03:34 +00:00
Code Issues Releases Wiki Activity

Updated Windows, so GetHostNameW is dynamically bound, so that it can fallback to gethostname on platforms that lack support, such as Windows Server 2008 R2

Browse Source
This commit is contained in:
Bryan Roe
2019-08-29 09:56:12 -07:00
parent 48590a7dff
commit dabeb6e2ba
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
meshcore/agentcore.c
View File

@@ -3681,10 +3681,33 @@ MeshAgentHostContainer* MeshAgent_Create(MeshCommand_AuthInfo_CapabilitiesMask c
retVal->capabilities = capabilities | MeshCommand_AuthInfo_CapabilitiesMask_CONSOLE | MeshCommand_AuthInfo_CapabilitiesMask_JAVASCRIPT;
#ifdef WIN32
WCHAR whostname[MAX_PATH];
if (GetHostNameW(whostname, MAX_PATH) == 0)
HMODULE wsCORE = LoadLibraryExA((LPCSTR)"Ws2_32.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
GetHostNameWFunc ghnw = NULL;
if (wsCORE != NULL)
{
WideCharToMultiByte(CP_UTF8, 0, whostname, -1, retVal->hostname, (int)sizeof(retVal->hostname), NULL, NULL);
if ((ghnw = (GetHostNameWFunc)GetProcAddress(wsCORE, (LPCSTR)"GetHostNameW")) == NULL)
{
FreeLibrary(wsCORE);
wsCORE = NULL;
}
}
if (ghnw != NULL)
{
WCHAR whostname[MAX_PATH];
if (ghnw(whostname, MAX_PATH) == 0)
{
WideCharToMultiByte(CP_UTF8, 0, whostname, -1, retVal->hostname, (int)sizeof(retVal->hostname), NULL, NULL);
}
}
else
{
gethostname(retVal->hostname, (int)sizeof(retVal->hostname));
}
if (wsCORE != NULL)
{
FreeLibrary(wsCORE);
wsCORE = NULL;
}
#else
gethostname(retVal->hostname, (int)sizeof(retVal->hostname));

1
meshcore/agentcore.h
View File

@@ -141,6 +141,7 @@ extern char* MeshAgentHost_BatteryInfo_STRINGS[];
#ifdef WIN32
typedef HRESULT (__stdcall *DpiAwarenessFunc)(PROCESS_DPI_AWARENESS);
typedef int (WSAAPI *GetHostNameWFunc)(PWSTR name, int namelen);
#endif
typedef struct MeshAgentHostContainer