From a7d354a72d22cde4de1494bf3475d8ea49e9cd2d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 15 3月 2020 11:00:39 +0800
Subject: [PATCH] fix compilation errors
---
src/inspector/inspector.cpp | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/src/inspector/inspector.cpp b/src/inspector/inspector.cpp
index 9a994bf..07330eb 100644
--- a/src/inspector/inspector.cpp
+++ b/src/inspector/inspector.cpp
@@ -4,13 +4,29 @@
#include <licensecc/licensecc.h>
#include <fstream>
#include "../library/os/cpu_info.hpp"
+#include "../library/os/execution_environment.hpp"
using namespace std;
-const map<IDENTIFICATION_STRATEGY, string> stringByStrategyId = {
- {STRATEGY_DEFAULT, "DEFAULT"}, {STRATEGY_ETHERNET, "MAC"}, {STRATEGY_IP_ADDRESS, "IP"},
- {STRATEGY_DISK_NUM, "Disk1"}, {STRATEGY_DISK_LABEL, "Disk2"}, {STRATEGY_PLATFORM_SPECIFIC, "Custom"}};
+using namespace license::os;
-const unordered_map<EVENT_TYPE, string> stringByEventType = {
+const map<int, string> stringByStrategyId = {{STRATEGY_DEFAULT, "DEFAULT"},
+ {STRATEGY_ETHERNET, "MAC"},
+ {STRATEGY_IP_ADDRESS, "IP"},
+ {STRATEGY_DISK_NUM, "Disk1"},
+ {STRATEGY_DISK_LABEL, "Disk2"}};
+
+const unordered_map<int, string> descByVirtDetail = {{BARE_TO_METAL, "No virtualization"},
+ {VMWARE, "Vmware"},
+ {VIRTUALBOX, "Virtualbox"},
+ {V_XEN, "XEN"},
+ {KVM, "KVM"},
+ {HV, "Microsoft Hypervisor"},
+ {V_OTHER, "Other type of vm"}};
+
+const unordered_map<int, string> descByVirt = {
+ {VIRTUALIZATION::NONE, "No virtualization"}, {VIRTUALIZATION::VM, "VM"}, {VIRTUALIZATION::CONTAINER, "Container"}};
+
+const unordered_map<int, string> stringByEventType = {
{LICENSE_OK, "OK "},
{LICENSE_FILE_NOT_FOUND, "license file not found "},
{LICENSE_SERVER_NOT_FOUND, "license server can't be contacted "},
@@ -22,11 +38,11 @@
{LICENSE_CORRUPTED, "license signature didn't match with current license "},
{IDENTIFIERS_MISMATCH, "Calculated identifier and the one provided in license didn't match"}};
-static EVENT_TYPE verifyLicense(const string& fname) {
+static LCC_EVENT_TYPE verifyLicense(const string& fname) {
LicenseInfo licenseInfo;
LicenseLocation licLocation = {LICENSE_PATH};
std::copy(fname.begin(), fname.end(), licLocation.licenseData);
- EVENT_TYPE result = acquire_license(nullptr, &licLocation, &licenseInfo);
+ LCC_EVENT_TYPE result = acquire_license(nullptr, &licLocation, &licenseInfo);
if (result == LICENSE_OK) {
cout << "license OK" << endl;
} else {
@@ -37,17 +53,26 @@
}
int main(int argc, char* argv[]) {
- license::CpuInfo cpu;
- cout << "CpuVendor :" << cpu.vendor() << endl;
- cout << "Virtual machine:" << cpu.cpu_virtual() << endl;
- cout << "Cpu model : 0x" << std::hex << ((long)cpu.model()) << std::dec << endl;
+ license::os::CpuInfo cpu;
+ cout << "CpuVendor :" << cpu.vendor() << endl;
+ cout << "Virtual machine :" << cpu.cpu_virtual() << endl;
+ cout << "Cpu model :0x" << std::hex << ((long)cpu.model()) << std::dec << endl;
+ cout << "Virt. detail cpu:" << descByVirtDetail.find(cpu.getVirtualizationDetail())->second << endl;
+ ExecutionEnvironment execEnv;
+ cout << "Running in cloud:" << execEnv.is_cloud() << endl;
+ cout << "Docker :" << execEnv.is_docker() << endl;
+ cout << "other container :" << execEnv.is_container() << endl;
+ cout << "Virtualiz. class:" << descByVirt.find(execEnv.getVirtualization())->second << endl;
- char pc_identifier[API_PC_IDENTIFIER_SIZE + 1];
- size_t bufSize = API_PC_IDENTIFIER_SIZE + 1;
+ cout << "Bios vendor :" << execEnv.bios_vendor() << endl;
+ cout << "Bios description:" << execEnv.bios_description() << endl;
+ cout << "System vendor :" << execEnv.sys_vendor() << endl;
+
+ char hw_identifier[LCC_API_PC_IDENTIFIER_SIZE + 1];
+ size_t bufSize = LCC_API_PC_IDENTIFIER_SIZE + 1;
for (const auto& x : stringByStrategyId) {
- if (identify_pc(x.first, pc_identifier, &bufSize)) {
- std::cout << x.second << ':' << pc_identifier << std::endl;
-
+ if (identify_pc(static_cast<LCC_API_IDENTIFICATION_STRATEGY>(x.first), hw_identifier, &bufSize)) {
+ std::cout << x.second << ':' << hw_identifier << std::endl;
} else {
std::cout << x.second << ": NA" << endl;
}
--
Gitblit v1.9.1