From 79b1b57045e86d9845e352c3f2aa0efbab6111a9 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 14 3月 2020 10:19:09 +0800
Subject: [PATCH] tests and improvements
---
src/library/licensecc.cpp | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp
index 27f3ac7..5378638 100644
--- a/src/library/licensecc.cpp
+++ b/src/library/licensecc.cpp
@@ -1,5 +1,5 @@
//============================================================================
-// Name : license-manager-cpp.cpp
+// Name : licensecc.cpp
// Author :
// Version :
// Copyright : BSD
@@ -17,24 +17,35 @@
#include <licensecc/licensecc.h>
#include <licensecc_properties.h>
+#include "base/logger.h"
+#include "hw_identifier/hw_identifier_facade.hpp"
#include "limits/license_verifier.hpp"
#include "base/StringUtils.h"
#include "LicenseReader.hpp"
-#include "pc-identifiers.h"
using namespace std;
-void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {}
-bool identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char* chbuffer, size_t* bufSize) {
- FUNCTION_RETURN result = FUNC_RET_BUFFER_TOO_SMALL;
- if (*bufSize >= sizeof(PcSignature)) {
- PcSignature identifier_out;
- result = generate_user_pc_signature(identifier_out, pc_id_method);
- strncpy(chbuffer, identifier_out, *bufSize);
+
+void print_error(char out_buffer[LCC_API_ERROR_BUFFER_SIZE], LicenseInfo* licenseInfo) {}
+
+bool identify_pc(LCC_API_IDENTIFICATION_STRATEGY pc_id_method, char* chbuffer, size_t* bufSize) {
+ bool result = false;
+ if (*bufSize > LCC_API_PC_IDENTIFIER_SIZE && chbuffer != nullptr) {
+ try {
+ string pc_id = license::hw_identifier::HwIdentifierFacade::generate_user_pc_signature(pc_id_method);
+ strncpy(chbuffer, pc_id.c_str(), *bufSize);
+ result = true;
+ } catch (const std::exception& ex) {
+ LOG_ERROR("Error calculating hw_identifier: %s", ex.what());
+#ifdef _DEBUG
+ cout
+ << "Error occurred: " << ex.what() << std::endl;
+#endif
+ }
} else {
- *bufSize = sizeof(PcSignature);
+ *bufSize = LCC_API_PC_IDENTIFIER_SIZE + 1;
}
- return result == FUNC_RET_OK;
+ return result;
}
static void mergeLicenses(const vector<LicenseInfo>& licenses, LicenseInfo* license_out) {
@@ -53,8 +64,8 @@
}
}
-EVENT_TYPE acquire_license(const CallerInformations* callerInformation, const LicenseLocation* licenseLocation,
- LicenseInfo* license_out) {
+LCC_EVENT_TYPE acquire_license(const CallerInformations* callerInformation,
+ const LicenseLocation* licenseLocation, LicenseInfo* license_out) {
const license::LicenseReader lr = license::LicenseReader(licenseLocation);
vector<license::FullLicenseInfo> licenses;
string project;
@@ -66,7 +77,7 @@
project = string(LCC_PROJECT_NAME);
}
license::EventRegistry er = lr.readLicenses(string(project), licenses);
- EVENT_TYPE result;
+ LCC_EVENT_TYPE result;
if (licenses.size() > 0) {
vector<LicenseInfo> licenses_with_errors;
vector<LicenseInfo> licenses_ok;
@@ -110,11 +121,12 @@
#endif
if (license_out != nullptr) {
- er.exportLastEvents(license_out->status, AUDIT_EVENT_NUM);
+ er.exportLastEvents(license_out->status, LCC_API_AUDIT_EVENT_NUM);
}
return result;
}
-EVENT_TYPE confirm_license(char* product, LicenseLocation licenseLocation) { return LICENSE_OK; }
+LCC_EVENT_TYPE confirm_license(char* product, LicenseLocation licenseLocation) { return LICENSE_OK; }
-EVENT_TYPE release_license(char* product, LicenseLocation licenseLocation) { return LICENSE_OK; }
+LCC_EVENT_TYPE release_license(char* product, LicenseLocation licenseLocation) { return LICENSE_OK; }
+
--
Gitblit v1.9.1