From 0288790e61dec962f43b4ebf4a4fa3057dbd2d02 Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周一, 21 4月 2014 18:14:24 +0800
Subject: [PATCH] network adapter detection linux
---
src/library/LicenseReader.cpp | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/library/LicenseReader.cpp b/src/library/LicenseReader.cpp
index 174bdb0..093b276 100644
--- a/src/library/LicenseReader.cpp
+++ b/src/library/LicenseReader.cpp
@@ -23,7 +23,7 @@
#include "base/public-key.h"
#include <build_properties.h>
-#include "os/os.hpp"
+#include "os/os-cpp.h"
namespace license {
@@ -47,7 +47,7 @@
EventRegistry FullLicenseInfo::validate(int sw_version) {
EventRegistry er;
- OsFunctions::initialize();
+ os_initialize();
bool sigVerified = OsFunctions::verifySignature(printForSign().c_str(),
license_signature.c_str());
if (sigVerified) {
@@ -285,21 +285,22 @@
oss << toupper_copy(trim_copy(this->product));
oss << SHARED_RANDOM
;
- /*if (has_client_sig) {
- oss << trim_copy(this->client_signature);
- }
- if (has_versions) {
- oss << "|" << this->from_sw_version << "-" << this->to_sw_version;
- }*/
+ if (has_client_sig) {
+ oss << trim_copy(this->client_signature);
+ }
+ if (has_versions) {
+ oss << "|" << this->from_sw_version << "-" << this->to_sw_version;
+ }
if (has_expiry) {
oss << "|" << this->from_date << "|" << this->to_date;
- }/*
- if (this->extra_data.length() > 0) {
- oss << "|" << extra_data;
- }*/
- string result = oss.str();
+ }
+ if (this->extra_data.length() > 0) {
+ oss << "|" << extra_data;
+ }
+#ifdef _DEBUG
cout << "[" << oss.str() << "]" << endl;
- return result;
+#endif
+ return oss.str();
}
--
Gitblit v1.9.1