Skip to content

Commit

Permalink
Fix compilation errors round 1
Browse files Browse the repository at this point in the history
  • Loading branch information
@grasmanek94
grasmanek94 committed Sep 17, 2023
1 parent 853e844 commit b31e6f8
Show file tree
Hide file tree
Showing 2 changed files with 163 additions and 162 deletions.
2 changes: 1 addition & 1 deletion Source/Shared/Lobby.hxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace universelan {
using messages_t = std::map<uint32_t, Message>;
using view_members_t = std::ranges::elements_view<
std::ranges::ref_view<const universelan::Lobby::user_data_t>,
0Ui64
0ULL
>;

using data_by_index_t = std::pair<std::string, std::string>;
Expand Down
323 changes: 162 additions & 161 deletions Source/Shared/MachineInfo.cxx
View file
Original file line number Diff line number Diff line change
@@ -1,161 +1,162 @@
#include "MachineInfo.hxx"

#ifdef _WIN32
#include <Windows.h>
#include <winsock2.h>
#include <iphlpapi.h>
#endif

#include <iomanip>
#include <sstream>
#include <string>

namespace universelan {
MachineInfo::MachineInfo() :
machine_name{ "" }, user_name{ "" }, macs{}
{
}

static std::string hexStr(const uint8_t* data, int len);
#ifdef _WIN32
static int RetriveLocalMacAddress(ULONG ulFlags, ULONG ulFamily, unsigned char** pszAddress);
#endif

std::string MachineInfo::GetLocalMachineName()
{
#ifdef _WIN32
if (machine_name.length() == 0) {
const size_t INFO_BUFFER_SIZE = 32;
TCHAR infoBuf[INFO_BUFFER_SIZE];
DWORD bufCharCount = INFO_BUFFER_SIZE;

// Get the computer name.
if (!GetComputerName(infoBuf, &bufCharCount)) {
machine_name.assign((const char* const)infoBuf, (const size_t)bufCharCount);
}
}
#else
machine_name = "GetLocalMachineNameNotImplemented";
#endif

return machine_name;
}

std::string MachineInfo::GetLocalUserName()
{
#ifdef _WIN32
if (user_name.length() == 0) {
const size_t INFO_BUFFER_SIZE = 256;
TCHAR infoBuf[INFO_BUFFER_SIZE];
DWORD bufCharCount = INFO_BUFFER_SIZE;

// Get the user name.
if (!GetUserName(infoBuf, &bufCharCount)) {
user_name.assign((const char* const)infoBuf, (const size_t)bufCharCount);
}
}
#else
user_name = "GetLocalUserNameNotImplemented";
#endif

return user_name;
}

std::vector<std::string> MachineInfo::GetLocalMACs()
{
if (macs.size() == 0) {
#ifdef _WIN32
unsigned char* pszBuff = NULL;
int nCount = 0;
int idx = 0;
int chPos = 0;
nCount = RetriveLocalMacAddress(GAA_FLAG_INCLUDE_ALL_COMPARTMENTS, AF_UNSPEC, &pszBuff);

for (idx = 0; idx < nCount; ++idx)
{
chPos = MAX_ADAPTER_ADDRESS_LENGTH * idx;
std::string str(hexStr((pszBuff + chPos), 6));
if (str != "000000000000") {
macs.push_back(str);
}
}

HeapFree(GetProcessHeap(), 0x00, pszBuff);
pszBuff = NULL;
#else
macs.push_back("12345678abcd");
#endif
}

return macs;
}

static std::string hexStr(const uint8_t* data, int len)
{
std::stringstream ss;
ss << std::hex;

for (int i(0); i < len; ++i)
ss << std::setw(2) << std::setfill('0') << (int)data[i];

return ss.str();
}

#ifdef _WIN32
static int RetriveLocalMacAddress(ULONG ulFlags, ULONG ulFamily, unsigned char** pszAddress)
{
PIP_ADAPTER_ADDRESSES pCurrAddresses = NULL;
PIP_ADAPTER_ADDRESSES pAddresses = NULL;

int nAddressCount = 0;
DWORD dwRetVal = 0;
ULONG ulBufLen = sizeof(IP_ADAPTER_ADDRESSES);
HANDLE hHeap = NULL;

hHeap = GetProcessHeap();
pAddresses = (PIP_ADAPTER_ADDRESSES)HeapAlloc(hHeap, 0x00, ulBufLen);
if (pAddresses == NULL) {
return 0;
}

dwRetVal = GetAdaptersAddresses(ulFamily, ulFlags, NULL, pAddresses, &ulBufLen);
if (dwRetVal == ERROR_BUFFER_OVERFLOW)
{
HeapFree(hHeap, 0x00, pAddresses);
pAddresses = (PIP_ADAPTER_ADDRESSES)HeapAlloc(hHeap, 0x00, ulBufLen);
}

if (pAddresses == NULL) {
return 0;
}

dwRetVal = GetAdaptersAddresses(ulFamily, ulFlags, NULL, pAddresses, &ulBufLen);
if (dwRetVal == NO_ERROR)
{
pCurrAddresses = pAddresses;
while (pCurrAddresses)
{
pCurrAddresses = pCurrAddresses->Next;
++nAddressCount;
}

*pszAddress = (unsigned char*)HeapAlloc(hHeap, 0x00, MAX_ADAPTER_ADDRESS_LENGTH * nAddressCount);
pCurrAddresses = pAddresses;
nAddressCount = 0;
while (pCurrAddresses)
{
RtlCopyMemory(*pszAddress + (MAX_ADAPTER_ADDRESS_LENGTH * nAddressCount++),
pCurrAddresses->PhysicalAddress,
MAX_ADAPTER_ADDRESS_LENGTH);
pCurrAddresses = pCurrAddresses->Next;
}
}

if (pAddresses) {
HeapFree(hHeap, 0x00, pAddresses);
pAddresses = NULL;
}
return nAddressCount;
}
#endif
}
#include "MachineInfo.hxx"

#ifdef _WIN32
#include <Windows.h>
#include <winsock2.h>
#include <iphlpapi.h>
#endif

#include <cstdint>
#include <iomanip>
#include <sstream>
#include <string>

namespace universelan {
MachineInfo::MachineInfo() :
machine_name{ "" }, user_name{ "" }, macs{}
{
}

static std::string hexStr(const uint8_t* data, int len);
#ifdef _WIN32
static int RetriveLocalMacAddress(ULONG ulFlags, ULONG ulFamily, unsigned char** pszAddress);
#endif

std::string MachineInfo::GetLocalMachineName()
{
#ifdef _WIN32
if (machine_name.length() == 0) {
const size_t INFO_BUFFER_SIZE = 32;
TCHAR infoBuf[INFO_BUFFER_SIZE];
DWORD bufCharCount = INFO_BUFFER_SIZE;

// Get the computer name.
if (!GetComputerName(infoBuf, &bufCharCount)) {
machine_name.assign((const char* const)infoBuf, (const size_t)bufCharCount);
}
}
#else
machine_name = "GetLocalMachineNameNotImplemented";
#endif

return machine_name;
}

std::string MachineInfo::GetLocalUserName()
{
#ifdef _WIN32
if (user_name.length() == 0) {
const size_t INFO_BUFFER_SIZE = 256;
TCHAR infoBuf[INFO_BUFFER_SIZE];
DWORD bufCharCount = INFO_BUFFER_SIZE;

// Get the user name.
if (!GetUserName(infoBuf, &bufCharCount)) {
user_name.assign((const char* const)infoBuf, (const size_t)bufCharCount);
}
}
#else
user_name = "GetLocalUserNameNotImplemented";
#endif

return user_name;
}

std::vector<std::string> MachineInfo::GetLocalMACs()
{
if (macs.size() == 0) {
#ifdef _WIN32
unsigned char* pszBuff = NULL;
int nCount = 0;
int idx = 0;
int chPos = 0;
nCount = RetriveLocalMacAddress(GAA_FLAG_INCLUDE_ALL_COMPARTMENTS, AF_UNSPEC, &pszBuff);

for (idx = 0; idx < nCount; ++idx)
{
chPos = MAX_ADAPTER_ADDRESS_LENGTH * idx;
std::string str(hexStr((pszBuff + chPos), 6));
if (str != "000000000000") {
macs.push_back(str);
}
}

HeapFree(GetProcessHeap(), 0x00, pszBuff);
pszBuff = NULL;
#else
macs.push_back("12345678abcd");
#endif
}

return macs;
}

static std::string hexStr(const uint8_t* data, int len)
{
std::stringstream ss;
ss << std::hex;

for (int i(0); i < len; ++i)
ss << std::setw(2) << std::setfill('0') << (int)data[i];

return ss.str();
}

#ifdef _WIN32
static int RetriveLocalMacAddress(ULONG ulFlags, ULONG ulFamily, unsigned char** pszAddress)
{
PIP_ADAPTER_ADDRESSES pCurrAddresses = NULL;
PIP_ADAPTER_ADDRESSES pAddresses = NULL;

int nAddressCount = 0;
DWORD dwRetVal = 0;
ULONG ulBufLen = sizeof(IP_ADAPTER_ADDRESSES);
HANDLE hHeap = NULL;

hHeap = GetProcessHeap();
pAddresses = (PIP_ADAPTER_ADDRESSES)HeapAlloc(hHeap, 0x00, ulBufLen);
if (pAddresses == NULL) {
return 0;
}

dwRetVal = GetAdaptersAddresses(ulFamily, ulFlags, NULL, pAddresses, &ulBufLen);
if (dwRetVal == ERROR_BUFFER_OVERFLOW)
{
HeapFree(hHeap, 0x00, pAddresses);
pAddresses = (PIP_ADAPTER_ADDRESSES)HeapAlloc(hHeap, 0x00, ulBufLen);
}

if (pAddresses == NULL) {
return 0;
}

dwRetVal = GetAdaptersAddresses(ulFamily, ulFlags, NULL, pAddresses, &ulBufLen);
if (dwRetVal == NO_ERROR)
{
pCurrAddresses = pAddresses;
while (pCurrAddresses)
{
pCurrAddresses = pCurrAddresses->Next;
++nAddressCount;
}

*pszAddress = (unsigned char*)HeapAlloc(hHeap, 0x00, MAX_ADAPTER_ADDRESS_LENGTH * nAddressCount);
pCurrAddresses = pAddresses;
nAddressCount = 0;
while (pCurrAddresses)
{
RtlCopyMemory(*pszAddress + (MAX_ADAPTER_ADDRESS_LENGTH * nAddressCount++),
pCurrAddresses->PhysicalAddress,
MAX_ADAPTER_ADDRESS_LENGTH);
pCurrAddresses = pCurrAddresses->Next;
}
}

if (pAddresses) {
HeapFree(hHeap, 0x00, pAddresses);
pAddresses = NULL;
}
return nAddressCount;
}
#endif
}

0 comments on commit b31e6f8

Please sign in to comment.