From 36ce07093b68b07513149577c209ae7a57ab356b Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 15 3月 2020 16:26:21 +0800
Subject: [PATCH] Merge branch 'feature/pc_identifiers' into develop issues #2 #3 #14 #49
---
src/library/os/os.h | 39 +++++++++------------------------------
1 files changed, 9 insertions(+), 30 deletions(-)
diff --git a/src/library/os/os.h b/src/library/os/os.h
index f32ca92..fa1862f 100644
--- a/src/library/os/os.h
+++ b/src/library/os/os.h
@@ -12,48 +12,29 @@
extern "C" {
#endif
-#include "../base/base.h"
#include <stddef.h>
#include <string.h>
#include <ctype.h>
#include <sys/types.h>
-//definition of size_t
+// definition of size_t
#include <stdlib.h>
#ifdef __unix__
#include <unistd.h>
#include <stdbool.h>
#endif
-
-typedef enum {
- NONE, CONTAINER, VM
-} VIRTUALIZATION;
-
-typedef enum {
- IFACE_TYPE_ETHERNET, IFACE_TYPE_WIRELESS
-} IFACE_TYPE;
+#include "../base/base.h"
typedef struct {
int id;
- char description[1024];
- unsigned char mac_address[8];
- unsigned char ipv4_address[4];
- IFACE_TYPE type;
-} OsAdapterInfo;
-
-typedef struct {
- int id;
- char device[255];
+ char device[MAX_PATH];
unsigned char disk_sn[8];
char label[255];
- bool preferred;
+ int preferred;
} DiskInfo;
-FUNCTION_RETURN getAdapterInfos(OsAdapterInfo * adapterInfos,
- size_t * adapter_info_size);
-FUNCTION_RETURN getDiskInfos(DiskInfo * diskInfos, size_t * disk_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]);
/**
* Get an identifier of the machine in an os specific way.
@@ -74,17 +55,15 @@
* @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, "");
+#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);
+#define SETENV(VAR, VAL) setenv(VAR, VAL, 1);
+#define UNSETENV(P) unsetenv(P);
#endif
#ifdef __cplusplus
--
Gitblit v1.9.1