From 8e1bdfdca2ad2157fd74cedc1a6768a1b1c0849d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 09 2月 2020 04:48:55 +0800
Subject: [PATCH] identifiers next work
---
src/library/pc_identifier/pc_identifier_facade.cpp | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/src/library/pc_identifier/pc_identifier_facade.cpp b/src/library/pc_identifier/pc_identifier_facade.cpp
index 1e0e93c..a9aa9b8 100644
--- a/src/library/pc_identifier/pc_identifier_facade.cpp
+++ b/src/library/pc_identifier/pc_identifier_facade.cpp
@@ -10,47 +10,34 @@
#include <cstdlib>
#include <stdexcept>
-#include "../../../projects/DEFAULT/include/licensecc/DEFAULT/licensecc_properties.h"
#include "../base/base.h"
#include "../base/logger.h"
#include "../os/cpu_info.hpp"
#include "../os/execution_environment.hpp"
-#include "default_strategy.hpp"
-#include "ethernet.hpp"
+#include "identification_strategy.hpp"
#include "pc_identifier.hpp"
namespace license {
+namespace pc_identifier {
+
using namespace std;
-static std::unordered_map<LCC_API_IDENTIFICATION_STRATEGY, std::unique_ptr<IdentificationStrategy>> init() {
- unordered_map<LCC_API_IDENTIFICATION_STRATEGY, std::unique_ptr<IdentificationStrategy>> strategy_map;
- strategy_map[STRATEGY_DEFAULT] =
- unique_ptr<IdentificationStrategy>(dynamic_cast<IdentificationStrategy*>(new DefaultStrategy()));
- strategy_map[STRATEGY_ETHERNET] =
- unique_ptr<IdentificationStrategy>(dynamic_cast<IdentificationStrategy*>(new Ethernet(false)));
- strategy_map[STRATEGY_IP_ADDRESS] =
- unique_ptr<IdentificationStrategy>(dynamic_cast<IdentificationStrategy*>(new Ethernet(true)));
-
- return strategy_map;
-}
-
-std::unordered_map<LCC_API_IDENTIFICATION_STRATEGY, std::unique_ptr<IdentificationStrategy>>
- PcIdentifierFacade::STRATEGY_MAP = init();
LCC_EVENT_TYPE PcIdentifierFacade::validate_pc_signature(const std::string& str_code) {
PcIdentifier pc_id(str_code);
LCC_API_IDENTIFICATION_STRATEGY id_strategy = pc_id.get_identification_strategy();
- auto it = STRATEGY_MAP.find(id_strategy);
LCC_EVENT_TYPE result = IDENTIFIERS_MISMATCH;
- if (it != STRATEGY_MAP.end()) {
- result = it->second->validate_identifier(pc_id);
- } else {
- // TODO: log
+ try {
+ unique_ptr<IdentificationStrategy> strategy = IdentificationStrategy::get_strategy(id_strategy);
+ result = strategy->validate_identifier(pc_id);
+ } catch (logic_error& e) {
+ LOG_ERROR("Error validating identifier %s: %s", str_code.c_str(), e.what());
}
return result;
}
std::string PcIdentifierFacade::generate_user_pc_signature(LCC_API_IDENTIFICATION_STRATEGY strategy) {
bool use_env_var = false;
+ vector<LCC_API_IDENTIFICATION_STRATEGY> strategies_to_try;
if (strategy == STRATEGY_DEFAULT) {
char* env_var_value = getenv(LCC_IDENTIFICATION_STRATEGY_ENV_VAR);
if (env_var_value != nullptr && env_var_value[0] != '\0') {
@@ -63,15 +50,12 @@
}
}
}
- auto it = STRATEGY_MAP.find(strategy);
+
+ unique_ptr<IdentificationStrategy> strategy_ptr = IdentificationStrategy::get_strategy(strategy);
PcIdentifier pc_id;
- if (it != STRATEGY_MAP.end()) {
- FUNCTION_RETURN result = it->second->identify_pc(pc_id);
- if (result != FUNC_RET_OK) {
- /// FIXME
- }
- } else {
- throw logic_error("Specified identification strategy invalid");
+ FUNCTION_RETURN result = strategy_ptr->identify_pc(pc_id);
+ if (result != FUNC_RET_OK) {
+ /// FIXME
}
ExecutionEnvironment exec;
VIRTUALIZATION virtualization = exec.getVirtualization();
@@ -88,4 +72,6 @@
}
return pc_id.print();
}
+
+} // namespace pc_identifier
} /* namespace license */
--
Gitblit v1.9.1