From b6277b30756c96404bc747f32ae45e9d3e205447 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周四, 09 1月 2020 10:19:22 +0800
Subject: [PATCH] pc identifiers intermediate work

---
 src/library/os/os.h |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/library/os/os.h b/src/library/os/os.h
index 5d0afc0..d59e33c 100644
--- a/src/library/os/os.h
+++ b/src/library/os/os.h
@@ -2,7 +2,7 @@
  * os-dependent.hpp
  *
  *  Created on: Mar 29, 2014
- *      Author: devel
+ *
  */
 
 #ifndef OS_DEPENDENT_HPP_
@@ -14,20 +14,25 @@
 
 #include "../base/base.h"
 #include <stddef.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/types.h>
+//definition of size_t
+#include <stdlib.h>
+#ifdef __unix__
+#include <unistd.h>
 #include <stdbool.h>
+#endif
+
 
 typedef enum {
-	NONE, VMWARE
-} VIRTUALIZATION;
-
-typedef enum {
-	ETHERNET, WIRELESS
+	IFACE_TYPE_ETHERNET, IFACE_TYPE_WIRELESS
 } IFACE_TYPE;
 
 typedef struct {
 	int id;
 	char description[1024];
-	unsigned char mac_address[6];
+	unsigned char mac_address[8];
 	unsigned char ipv4_address[4];
 	IFACE_TYPE type;
 } OsAdapterInfo;
@@ -44,6 +49,7 @@
 		size_t * adapter_info_size);
 FUNCTION_RETURN getDiskInfos(DiskInfo * diskInfos, size_t * disk_info_size);
 FUNCTION_RETURN getUserHomePath(char[MAX_PATH]);
+FUNCTION_RETURN getModuleName(char buffer[MAX_PATH]);
 FUNCTION_RETURN getCpuId(unsigned char identifier[6]);
 FUNCTION_RETURN getMachineName(unsigned char identifier[6]);
 /**
@@ -65,8 +71,16 @@
  * @return
  */
 FUNCTION_RETURN getOsSpecificIdentifier(unsigned char identifier[6]);
-VIRTUALIZATION getVirtualization();
-void os_initialize();
+
+// FUNCTION_RETURN verifySignature(const char* stringToVerify, const char* signatureB64);
+
+#ifdef _WIN32
+#define SETENV(VAR,VAL) _putenv_s(VAR, VAL);
+#define	UNSETENV(P) _putenv_s(P, "");
+#else
+#define SETENV(VAR,VAL) setenv(VAR, VAL, 1);
+#define	UNSETENV(P)	unsetenv(P);
+#endif
 
 #ifdef __cplusplus
 }

--
Gitblit v1.9.1