From d0b85cf10415a378c11d385066bb27116f2c2df1 Mon Sep 17 00:00:00 2001
From: Shahar Hadas <shaharhd@gmail.com>
Date: 周日, 10 5月 2020 19:18:01 +0800
Subject: [PATCH] Fix network detection for Windows OS (#94)
---
src/library/hw_identifier/disk_strategy.cpp | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/library/hw_identifier/disk_strategy.cpp b/src/library/hw_identifier/disk_strategy.cpp
index cec5da8..64142f7 100644
--- a/src/library/hw_identifier/disk_strategy.cpp
+++ b/src/library/hw_identifier/disk_strategy.cpp
@@ -14,10 +14,9 @@
static FUNCTION_RETURN generate_disk_pc_id(vector<array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA>> &v_disk_id,
bool use_id) {
- size_t disk_num, available_disk_info = 0;
+ size_t disk_num = 0;
+ size_t available_disk_info = 0;
FUNCTION_RETURN result_diskinfos;
- unsigned int i;
- DiskInfo *diskInfos;
result_diskinfos = getDiskInfos(nullptr, &disk_num);
if (result_diskinfos != FUNC_RET_OK && result_diskinfos != FUNC_RET_BUFFER_TOO_SMALL) {
@@ -26,18 +25,19 @@
if (disk_num == 0) {
return FUNC_RET_NOT_AVAIL;
}
-
- diskInfos = (DiskInfo *)malloc(disk_num * sizeof(DiskInfo));
+ size_t mem = disk_num * sizeof(DiskInfo);
+ DiskInfo *diskInfos = (DiskInfo *)malloc(mem);
if (diskInfos == nullptr) {
return FUNC_RET_NOT_AVAIL;
}
- memset(diskInfos, 0, disk_num * sizeof(DiskInfo));
+ memset(diskInfos, 0, mem);
result_diskinfos = getDiskInfos(diskInfos, &disk_num);
+
if (result_diskinfos != FUNC_RET_OK) {
free(diskInfos);
return result_diskinfos;
}
- for (i = 0; i < disk_num; i++) {
+ for (unsigned int i = 0; i < disk_num; i++) {
char firstChar = use_id ? diskInfos[i].label[0] : diskInfos[i].disk_sn[0];
available_disk_info += firstChar == 0 ? 0 : 1;
}
@@ -46,18 +46,22 @@
return FUNC_RET_NOT_AVAIL;
}
v_disk_id.reserve(available_disk_info);
- for (i = 0; i < disk_num; i++) {
- array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA> a_disk_id;
- if (use_id) {
- if (diskInfos[i].disk_sn[0] != 0) {
- memcpy(&a_disk_id[0], &diskInfos[i].disk_sn[2], a_disk_id.size());
- v_disk_id.push_back(a_disk_id);
- }
- } else {
- if (diskInfos[i].label[0] != 0) {
- a_disk_id.fill(0);
- strncpy((char *)&a_disk_id[0], diskInfos[i].label, a_disk_id.size());
- v_disk_id.push_back(a_disk_id);
+ for (int j = 0; j < 2; j++) {
+ int preferred = (j == 0 ? 1 : 0);
+ for (unsigned int i = 0; i < disk_num; i++) {
+ array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA> a_disk_id;
+ a_disk_id.fill(0);
+ if (use_id) {
+ if (diskInfos[i].disk_sn[0] != 0 && diskInfos[i].preferred == preferred) {
+ size_t size = min(a_disk_id.size(), sizeof(&diskInfos[i].disk_sn));
+ memcpy(&a_disk_id[0], diskInfos[i].disk_sn, size);
+ v_disk_id.push_back(a_disk_id);
+ }
+ } else {
+ if (diskInfos[i].label[0] != 0 && diskInfos[i].preferred == preferred) {
+ strncpy((char *)&a_disk_id[0], diskInfos[i].label, a_disk_id.size() - 1);
+ v_disk_id.push_back(a_disk_id);
+ }
}
}
}
@@ -69,7 +73,7 @@
DiskStrategy::~DiskStrategy() {}
-LCC_API_IDENTIFICATION_STRATEGY DiskStrategy::identification_strategy() const {
+LCC_API_HW_IDENTIFICATION_STRATEGY DiskStrategy::identification_strategy() const {
return m_use_id ? STRATEGY_DISK_NUM : STRATEGY_DISK_LABEL;
}
@@ -78,7 +82,7 @@
FUNCTION_RETURN result = generate_disk_pc_id(data, m_use_id);
vector<HwIdentifier> identifiers;
if (result == FUNC_RET_OK) {
- identifiers.resize(data.size());
+ identifiers.reserve(data.size());
for (auto &it : data) {
HwIdentifier pc_id;
pc_id.set_identification_strategy(identification_strategy());
--
Gitblit v1.9.1