From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: ćšć, 29 5æ 2025 18:14:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop
---
src/library/licensecc.cpp | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp
index dd377e1..948603a 100644
--- a/src/library/licensecc.cpp
+++ b/src/library/licensecc.cpp
@@ -18,12 +18,14 @@
#include <licensecc_properties.h>
#include "base/logger.h"
+#include "base/string_utils.h"
#include "hw_identifier/hw_identifier_facade.hpp"
#include "os/execution_environment.hpp"
#include "limits/license_verifier.hpp"
-#include "base/StringUtils.h"
+#include "base/string_utils.h"
#include "LicenseReader.hpp"
-
+#include "../test/functional/generate-license.h"
+using namespace license;
using namespace std;
void print_error(char out_buffer[LCC_API_ERROR_BUFFER_SIZE], LicenseInfo* licenseInfo) {}
@@ -34,19 +36,19 @@
if (*bufSize > LCC_API_PC_IDENTIFIER_SIZE && chbuffer != nullptr) {
try {
const string pc_id = license::hw_identifier::HwIdentifierFacade::generate_user_pc_signature(pc_id_method);
- strncpy(chbuffer, pc_id.c_str(), *bufSize);
+ license::mstrlcpy(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;
+#ifndef NDEBUG
+ cerr << "Error occurred in identify_pc: " << ex.what() << std::endl;
#endif
}
} else {
*bufSize = LCC_API_PC_IDENTIFIER_SIZE + 1;
}
+ static const license::os::ExecutionEnvironment exec_env;
if (execution_environment_info != nullptr) {
- const license::os::ExecutionEnvironment exec_env;
execution_environment_info->cloud_provider = exec_env.cloud_provider();
execution_environment_info->virtualization = exec_env.virtualization();
execution_environment_info->virtualization_detail = exec_env.virtualization_detail();
@@ -55,6 +57,7 @@
}
static void mergeLicenses(const vector<LicenseInfo>& licenses, LicenseInfo* license_out) {
+
if (license_out != nullptr) {
int days_left = INT_MIN;
for (auto it = licenses.begin(); it != licenses.end(); it++) {
@@ -69,7 +72,6 @@
}
}
}
-
LCC_EVENT_TYPE acquire_license(const CallerInformations* callerInformation, const LicenseLocation* licenseLocation,
LicenseInfo* license_out) {
const license::LicenseReader lr = license::LicenseReader(licenseLocation);
@@ -77,8 +79,8 @@
string project;
size_t str_size;
if (callerInformation != nullptr &&
- (str_size = license::mstrnlen_s(callerInformation->project_name, sizeof callerInformation->project_name)) > 0) {
- project = string(callerInformation->project_name, str_size);
+ (str_size = license::mstrnlen_s(callerInformation->feature_name, sizeof callerInformation->feature_name)) > 0) {
+ project = string(callerInformation->feature_name, str_size);
} else {
project = string(LCC_PROJECT_NAME);
}
@@ -122,16 +124,20 @@
license_out->days_left = 0;
}
}
-#ifdef _DEBUG
- cout << er << endl;
+#ifndef NDEBUG
+ const string evlog = er.to_string();
+ LOG_DEBUG("License status %s", evlog.c_str());
#endif
if (license_out != nullptr) {
er.exportLastEvents(license_out->status, LCC_API_AUDIT_EVENT_NUM);
}
+
return result;
}
+
+
LCC_EVENT_TYPE confirm_license(char* product, LicenseLocation licenseLocation) { return LICENSE_OK; }
LCC_EVENT_TYPE release_license(char* product, LicenseLocation licenseLocation) { return LICENSE_OK; }
--
Gitblit v1.9.1