From 85d97f05f6f8e4c1d73cd2bb096806839d16f3b0 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 31 10月 2020 10:27:16 +0800
Subject: [PATCH] Pc identifier Mac address issues #108 & #107
---
src/library/hw_identifier/identification_strategy.cpp | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/library/hw_identifier/identification_strategy.cpp b/src/library/hw_identifier/identification_strategy.cpp
index 273c670..ad9cf46 100644
--- a/src/library/hw_identifier/identification_strategy.cpp
+++ b/src/library/hw_identifier/identification_strategy.cpp
@@ -22,7 +22,7 @@
return result;
}
-FUNCTION_RETURN IdentificationStrategy::identify_pc(HwIdentifier& pc_id) const {
+FUNCTION_RETURN IdentificationStrategy::generate_pc_id(HwIdentifier& pc_id) const {
vector<array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA>> data;
const vector<HwIdentifier> available_ids = alternative_ids();
FUNCTION_RETURN result = FUNC_RET_NOT_AVAIL;
@@ -33,7 +33,7 @@
return result;
}
-std::unique_ptr<IdentificationStrategy> IdentificationStrategy::get_strategy(LCC_API_IDENTIFICATION_STRATEGY strategy) {
+std::unique_ptr<IdentificationStrategy> IdentificationStrategy::get_strategy(LCC_API_HW_IDENTIFICATION_STRATEGY strategy) {
unique_ptr<IdentificationStrategy> result;
switch (strategy) {
case STRATEGY_DEFAULT:
@@ -45,11 +45,8 @@
case STRATEGY_IP_ADDRESS:
result = unique_ptr<IdentificationStrategy>(dynamic_cast<IdentificationStrategy*>(new Ethernet(true)));
break;
- case STRATEGY_DISK_NUM:
- result = unique_ptr<IdentificationStrategy>(dynamic_cast<IdentificationStrategy*>(new DiskStrategy(true)));
- break;
- case STRATEGY_DISK_LABEL:
- result = unique_ptr<IdentificationStrategy>(dynamic_cast<IdentificationStrategy*>(new DiskStrategy(false)));
+ case STRATEGY_DISK:
+ result = unique_ptr<IdentificationStrategy>(dynamic_cast<IdentificationStrategy*>(new DiskStrategy()));
break;
default:
throw logic_error("strategy not supported");
--
Gitblit v1.9.1