juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-09 10:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature remove the mac address on bury point

Browse Source
This commit is contained in:
alves
2025-12-24 14:26:00 +08:00
parent ed81bf6cbe
commit a6b6151b0f
3 changed files with 5 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/common_func/common_func.cpp
View File

@@ -8,12 +8,12 @@
#pragma comment(lib, "iphlpapi.lib") #pragma comment(lib, "iphlpapi.lib")
#elif __APPLE__ #elif __APPLE__
#include <stdlib.h> #include <stdlib.h>
#import <IOKit/IOKitLib.h> #include <IOKit/IOKitLib.h>
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <unistd.h> #include <IOKit/IOKitLib.h>
#include <dlfcn.h> #include <IOKit/network/IONetworkInterface.h>
#include <IOKit/network/IONetworkController.h>
#include <CoreServices/CoreServices.h> #include <AvailabilityMacros.h>
#endif #endif
#include <fstream> #include <fstream>
@@ -72,78 +72,6 @@ namespace common
return machineId; return machineId;
} }
std::string getMacAddress()
{
std::string macAddress = std::string();
#ifndef __APPLE__
ULONG ulBufferSize = 0;
DWORD dwResult = ::GetAdaptersInfo(NULL, &ulBufferSize);
if (ERROR_BUFFER_OVERFLOW != dwResult) {
return std::string();
}
PIP_ADAPTER_INFO pAdapterInfo = (PIP_ADAPTER_INFO) new BYTE[ulBufferSize];
if (!pAdapterInfo) {
return std::string();
}
dwResult = ::GetAdaptersInfo(pAdapterInfo, &ulBufferSize);
if (ERROR_SUCCESS != dwResult) {
delete[] pAdapterInfo;
return std::string();
}
BYTE pMac[MAX_ADAPTER_ADDRESS_LENGTH] = {0};
int nLen = MAX_ADAPTER_ADDRESS_LENGTH;
if (NULL != pAdapterInfo) {
PIP_ADDR_STRING pAddTemp = &(pAdapterInfo->IpAddressList);
if (NULL != pAddTemp) {
for (int i = 0; i < (int) pAdapterInfo->AddressLength; ++i) {
pMac[i] = pAdapterInfo->Address[i];
}
nLen = pAdapterInfo->AddressLength;
}
}
delete[] pAdapterInfo;
auto Encode16 = [](const BYTE* buf, int len) -> std::wstring {
const WCHAR strHex[] = L"0123456789ABCDEF";
std::wstring wstr;
wstr.resize(len * 2);
for (int i = 0; i < len; ++i) {
wstr[i * 2 + 0] = strHex[buf[i] >> 4];
wstr[i * 2 + 1] = strHex[buf[i] & 0xf];
}
return wstr;
};
auto wstringTostring = [](std::wstring wTmpStr) -> std::string {
std::string resStr = std::string();
int len = WideCharToMultiByte(CP_UTF8, 0, wTmpStr.c_str(), -1, nullptr, 0, nullptr, nullptr);
if (len <= 0)
return std::string();
std::string desStr(len, 0);
WideCharToMultiByte(CP_UTF8, 0, wTmpStr.c_str(), -1, &desStr[0], len, nullptr, nullptr);
resStr = desStr;
return resStr;
};
std::wstring strMac = Encode16(pMac, nLen);
macAddress = wstringTostring(strMac);
#else
// todo get mac macaddress
#endif
return macAddress;
}
std::string get_flutter_version() std::string get_flutter_version()
{ {

1
src/common_func/common_func.hpp
View File

@@ -25,7 +25,6 @@ namespace common
std::string getMachineId(); std::string getMachineId();
std::string getMacAddress();
} // namespace common } // namespace common
#endif #endif

4
src/sentry_wrapper/SentryWrapper.cpp
View File

@@ -220,10 +220,6 @@ void initSentryEx()
if (!machineID.empty()) if (!machineID.empty())
sentry_set_tag("machine_id", machineID.c_str()); sentry_set_tag("machine_id", machineID.c_str());
std::string macAdress = common::getMacAddress();
if (!macAdress.empty())
sentry_set_tag("macaddress", macAdress.c_str());
std::string pcName = common::get_pc_name(); std::string pcName = common::get_pc_name();
if (!pcName.empty()) if (!pcName.empty())
sentry_set_tag("pc_name", pcName.c_str()); sentry_set_tag("pc_name", pcName.c_str());