From baa4e86bae8bb6a2884d74b21dc374e68dad8bbd Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 05 12月 2020 23:37:23 +0800
Subject: [PATCH] minor changes
---
src/inspector/inspector.cpp | 100 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 81 insertions(+), 19 deletions(-)
diff --git a/src/inspector/inspector.cpp b/src/inspector/inspector.cpp
index 3ec672c..7af061e 100644
--- a/src/inspector/inspector.cpp
+++ b/src/inspector/inspector.cpp
@@ -1,19 +1,23 @@
#include <iostream>
+#include <vector>
#include <map>
#include <unordered_map>
#include <licensecc/licensecc.h>
#include <fstream>
+#include <string.h>
+#include <iomanip>
+#include "../library/base/string_utils.h"
+#include "../library/ini/SimpleIni.h"
+#include "../library/os/dmi_info.hpp"
#include "../library/os/cpu_info.hpp"
#include "../library/os/dmi_info.hpp"
+#include "../library/os/network.hpp"
using namespace std;
using namespace license::os;
-const map<int, string> stringByStrategyId = {{STRATEGY_DEFAULT, "DEFAULT"},
- {STRATEGY_ETHERNET, "MAC"},
- {STRATEGY_IP_ADDRESS, "IP"},
- {STRATEGY_DISK_NUM, "Disk1"},
- {STRATEGY_DISK_LABEL, "Disk2"}};
+const map<int, string> stringByStrategyId = {
+ {STRATEGY_DEFAULT, "DEFAULT"}, {STRATEGY_ETHERNET, "MAC"}, {STRATEGY_IP_ADDRESS, "IP"}, {STRATEGY_DISK, "Disk"}};
const unordered_map<int, string> descByVirtDetail = {{BARE_TO_METAL, "No virtualization"},
{VMWARE, "Vmware"},
@@ -21,12 +25,12 @@
{V_XEN, "XEN"},
{KVM, "KVM"},
{HV, "Microsoft Hypervisor"},
+ {PARALLELS, "Parallels Desktop"},
{V_OTHER, "Other type of vm"}};
-const unordered_map<int, string> descByVirt = {
- {LCC_API_VIRTUALIZATION_SUMMARY::NONE, "No virtualization"},
- {LCC_API_VIRTUALIZATION_SUMMARY::VM, "Virtual machine"},
- {LCC_API_VIRTUALIZATION_SUMMARY::CONTAINER, "Container"}};
+const unordered_map<int, string> descByVirt = {{LCC_API_VIRTUALIZATION_SUMMARY::NONE, "No virtualization"},
+ {LCC_API_VIRTUALIZATION_SUMMARY::VM, "Virtual machine"},
+ {LCC_API_VIRTUALIZATION_SUMMARY::CONTAINER, "Container"}};
const unordered_map<int, string> descByCloudProvider = {{PROV_UNKNOWN, "Provider unknown"},
{ON_PREMISE, "On premise hardware (no cloud)"},
@@ -53,11 +57,27 @@
std::copy(fname.begin(), fname.end(), licLocation.licenseData);
LCC_EVENT_TYPE result = acquire_license(nullptr, &licLocation, &licenseInfo);
if (result == LICENSE_OK) {
- cout << "license OK" << endl;
+ cout << "default project [" << LCC_PROJECT_NAME << "]: license OK" << endl;
} else {
- cerr << stringByEventType.find(result)->second << endl;
+ cerr << "default project [" << LCC_PROJECT_NAME << "]:" << stringByEventType.find(result)->second << endl;
}
-
+ CSimpleIniA ini;
+ ini.LoadFile(fname.c_str());
+ CSimpleIniA::TNamesDepend sections;
+ ini.GetAllSections(sections);
+ CallerInformations callerInformation;
+ for (CSimpleIniA::Entry section : sections) {
+ const string section_name(section.pItem, 15);
+ if (section_name != LCC_PROJECT_NAME) {
+ std::copy(section_name.begin(), section_name.end(), callerInformation.feature_name);
+ LCC_EVENT_TYPE result = acquire_license(&callerInformation, &licLocation, &licenseInfo);
+ if (result == LICENSE_OK) {
+ cout << "project [" << section.pItem << "]: license OK" << endl;
+ } else {
+ cerr << "project [" << section.pItem << "]" << stringByEventType.find(result)->second << endl;
+ }
+ }
+ }
return result;
}
@@ -75,19 +95,42 @@
}
cout << "Virtualiz. class :" << descByVirt.find(exec_env_info.virtualization)->second << endl;
cout << "Virtualiz. detail:" << descByVirtDetail.find(exec_env_info.virtualization_detail)->second << endl;
- cout << "Cloud provider :" << descByCloudProvider.find(exec_env_info.cloud_provider)->second << endl
- << "=============" << endl;
+ cout << "Cloud provider :" << descByCloudProvider.find(exec_env_info.cloud_provider)->second << endl;
+
+ std::vector<license::os::OsAdapterInfo> adapterInfos;
+ FUNCTION_RETURN ret = license::os::getAdapterInfos(adapterInfos);
+ if (ret == FUNCTION_RETURN::FUNC_RET_OK) {
+ for (auto osAdapter : adapterInfos) {
+ cout << "Network adapter [" << osAdapter.id << "]: " << osAdapter.description << endl;
+ cout << " ip address [" << static_cast<unsigned int>(osAdapter.ipv4_address[3]) << "-"
+ << static_cast<unsigned int>(osAdapter.ipv4_address[2]) << "-"
+ << static_cast<unsigned int>(osAdapter.ipv4_address[1]) << "-"
+ << static_cast<unsigned int>(osAdapter.ipv4_address[0]) << "]" << endl;
+ cout << " mac address [" << std::hex;
+ for (int i = 0; i < sizeof(osAdapter.mac_address); i++) {
+ if (i != 0) {
+ cout << ":";
+ }
+ cout << static_cast<unsigned int>(osAdapter.mac_address[i]);
+ }
+ cout << "]" << std::dec << endl;
+ }
+ } else {
+ cout << "problem in getting adapter informations:" << ret << endl;
+ }
+
license::os::CpuInfo cpu;
cout << "Cpu Vendor :" << cpu.vendor() << endl;
cout << "Cpu Brand :" << cpu.brand() << endl;
cout << "Cpu hypervisor :" << cpu.is_hypervisor_set() << endl;
cout << "Cpu model :0x" << std::hex << ((long)cpu.model()) << std::dec << endl;
license::os::DmiInfo dmi_info;
- cout << "Bios vendor :" << dmi_info.bios_vendor() << endl;
- cout << "Bios description:" << dmi_info.bios_description() << endl;
- cout << "System vendor :" << dmi_info.sys_vendor() << endl << endl;
-
-
+ cout << "Bios vendor :" << dmi_info.bios_vendor() << endl;
+ cout << "Bios description :" << dmi_info.bios_description() << endl;
+ cout << "System vendor :" << dmi_info.sys_vendor() << endl;
+ cout << "Cpu Vendor (dmi) :" << dmi_info.cpu_manufacturer() << endl;
+ cout << "Cpu Cores (dmi) :" << dmi_info.cpu_cores() << endl;
+ cout << "==================" << endl;
if (argc == 2) {
const string fname(argv[1]);
ifstream license_file(fname);
@@ -97,4 +140,23 @@
cerr << "license file :" << fname << " not found." << endl;
}
}
+ bool find_license_with_env_var = FIND_LICENSE_WITH_ENV_VAR;
+ if (find_license_with_env_var) {
+ char* env_var_value = getenv(LCC_LICENSE_LOCATION_ENV_VAR);
+ if (env_var_value != nullptr && env_var_value[0] != '\0') {
+ cout << "environment variable [" << LCC_LICENSE_LOCATION_ENV_VAR << "] value [" << env_var_value << "]"
+ << endl;
+ const vector<string> declared_licenses = license::split_string(string(env_var_value), ';');
+ for (string fname : declared_licenses) {
+ ifstream license_file(fname);
+ if (license_file.good()) {
+ verifyLicense(fname);
+ } else {
+ cerr << "license file :" << fname << " not found." << endl;
+ }
+ }
+ } else {
+ cout << "environment variable [" << LCC_LICENSE_LOCATION_ENV_VAR << "] configured but not defined." << endl;
+ }
+ }
}
--
Gitblit v1.9.1