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/inspector/inspector.cpp | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/src/inspector/inspector.cpp b/src/inspector/inspector.cpp
index 1c4d0af..03cbfac 100644
--- a/src/inspector/inspector.cpp
+++ b/src/inspector/inspector.cpp
@@ -5,20 +5,19 @@
#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"},
@@ -26,6 +25,7 @@
{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"},
@@ -69,7 +69,7 @@
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.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;
@@ -93,9 +93,28 @@
std::cout << x.second << ": NA" << endl;
}
}
- 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;
+
+ 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;
@@ -105,7 +124,9 @@
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 << "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]);
--
Gitblit v1.9.1