From 469d6ff29ebc8bed44458695186d57bfed0edb6c Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周四, 20 5月 2021 13:51:10 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop

---
 src/library/hw_identifier/disk_strategy.cpp |   75 +++++++++++++++----------------------
 1 files changed, 30 insertions(+), 45 deletions(-)

diff --git a/src/library/hw_identifier/disk_strategy.cpp b/src/library/hw_identifier/disk_strategy.cpp
index 64142f7..c93f559 100644
--- a/src/library/hw_identifier/disk_strategy.cpp
+++ b/src/library/hw_identifier/disk_strategy.cpp
@@ -12,74 +12,59 @@
 namespace license {
 namespace hw_identifier {
 
-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 = 0;
-	size_t available_disk_info = 0;
-	FUNCTION_RETURN result_diskinfos;
+static array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA> generate_id_by_sn(const DiskInfo &disk_info) {
+	array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA> a_disk_id = {};
+	size_t size = min((size_t) HW_IDENTIFIER_PROPRIETARY_DATA,
+			sizeof(disk_info.disk_sn));
+	memcpy(&a_disk_id[0], disk_info.disk_sn, size);
 
-	result_diskinfos = getDiskInfos(nullptr, &disk_num);
-	if (result_diskinfos != FUNC_RET_OK && result_diskinfos != FUNC_RET_BUFFER_TOO_SMALL) {
-		return result_diskinfos;
-	}
-	if (disk_num == 0) {
-		return FUNC_RET_NOT_AVAIL;
-	}
-	size_t mem = disk_num * sizeof(DiskInfo);
-	DiskInfo *diskInfos = (DiskInfo *)malloc(mem);
-	if (diskInfos == nullptr) {
-		return FUNC_RET_NOT_AVAIL;
-	}
-	memset(diskInfos, 0, mem);
-	result_diskinfos = getDiskInfos(diskInfos, &disk_num);
+	return a_disk_id;
+}
 
+static array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA> generate_id_by_label(const DiskInfo &disk_info) {
+	array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA> a_disk_id = {};
+	strncpy((char *)&a_disk_id[0], disk_info.label, a_disk_id.size() - 1);
+	return a_disk_id;
+}
+
+static FUNCTION_RETURN generate_disk_pc_id(vector<array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA>> &v_disk_id) {
+	std::vector<DiskInfo> disk_infos;
+	FUNCTION_RETURN result_diskinfos = getDiskInfos(disk_infos);
 	if (result_diskinfos != FUNC_RET_OK) {
-		free(diskInfos);
 		return result_diskinfos;
 	}
-	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;
-	}
-	if (available_disk_info == 0) {
-		free(diskInfos);
+	if (disk_infos.size() == 0) {
 		return FUNC_RET_NOT_AVAIL;
 	}
-	v_disk_id.reserve(available_disk_info);
+
+	v_disk_id.reserve(disk_infos.size() * 2);
 	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);
+		bool preferred = (j == 0);
+		for (size_t i = 0; i < disk_infos.size(); i++) {
+			if (disk_infos[i].preferred == preferred) {
+				if (disk_infos[i].sn_initialized) {
+					array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA> a_disk_id = generate_id_by_sn(disk_infos[i]);
 					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);
+				if (disk_infos[i].label_initialized) {
+					array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA> l_disk_id = generate_id_by_label(disk_infos[i]);
+					v_disk_id.push_back(l_disk_id);
 				}
 			}
 		}
 	}
-	free(diskInfos);
-	return FUNC_RET_OK;
+	return v_disk_id.size() > 0 ? FUNC_RET_OK : FUNC_RET_NOT_AVAIL;
 }
-
-DiskStrategy::DiskStrategy(bool use_id) : m_use_id(use_id) {}
 
 DiskStrategy::~DiskStrategy() {}
 
 LCC_API_HW_IDENTIFICATION_STRATEGY DiskStrategy::identification_strategy() const {
-	return m_use_id ? STRATEGY_DISK_NUM : STRATEGY_DISK_LABEL;
+	return LCC_API_HW_IDENTIFICATION_STRATEGY::STRATEGY_DISK;
 }
 
 std::vector<HwIdentifier> DiskStrategy::alternative_ids() const {
 	vector<array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA>> data;
-	FUNCTION_RETURN result = generate_disk_pc_id(data, m_use_id);
+	FUNCTION_RETURN result = generate_disk_pc_id(data);
 	vector<HwIdentifier> identifiers;
 	if (result == FUNC_RET_OK) {
 		identifiers.reserve(data.size());

--
Gitblit v1.9.1