From d4edbb5a0aae0211389ce86264809b4237c73769 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 3月 2020 21:27:16 +0800
Subject: [PATCH] Issues #14 and #6
---
src/library/os/windows/os-win.c | 134 +++++---------------------------------------
1 files changed, 16 insertions(+), 118 deletions(-)
diff --git a/src/library/os/windows/os-win.c b/src/library/os/windows/os-win.c
index aa6c5f3..ef56baf 100644
--- a/src/library/os/windows/os-win.c
+++ b/src/library/os/windows/os-win.c
@@ -1,17 +1,15 @@
-#ifdef _MSC_VER
+/*#ifdef _MSC_VER
#include <Windows.h>
-#endif
-#include "../base/logger.h"
-#include "os.h"
+#endif*/
+#include "../../base/logger.h"
+#include "../os.h"
+
+#include <licensecc/datatypes.h>
#include <iphlpapi.h>
#include <stdio.h>
#pragma comment(lib, "IPHLPAPI.lib")
unsigned char* unbase64(const char* ascii, int len, int *flen);
-
-FUNCTION_RETURN getOsSpecificIdentifier(unsigned char identifier[6]) {
- return FUNC_RET_NOT_AVAIL;
-}
FUNCTION_RETURN getMachineName(unsigned char identifier[6]) {
FUNCTION_RETURN result = FUNC_RET_ERROR;
@@ -34,15 +32,14 @@
#define MAX_UNITS 30
//bug check return with diskinfos == null func_ret_ok
FUNCTION_RETURN getDiskInfos(DiskInfo * diskInfos, size_t * disk_info_size) {
- DWORD FileMaxLen;
+ DWORD fileMaxLen;
int ndrives = 0;
- DWORD FileFlags;
- char volName[_MAX_FNAME], FileSysName[_MAX_FNAME];
+ DWORD fileFlags;
+ char volName[MAX_PATH], fileSysName[MAX_PATH];
DWORD volSerial = 0;
const DWORD dwSize = MAX_PATH;
-
char szLogicalDrives[MAX_PATH] = { 0 };
- unsigned char buf[8] = "";
+
FUNCTION_RETURN return_value = FUNC_RET_NOT_AVAIL;
const DWORD dwResult = GetLogicalDriveStrings(dwSize, szLogicalDrives);
@@ -56,22 +53,21 @@
UINT driveType = GetDriveType(szSingleDrive);
if (driveType == DRIVE_FIXED) {
BOOL success = GetVolumeInformation(szSingleDrive, volName, MAX_PATH,
- &volSerial, &FileMaxLen, &FileFlags, FileSysName,
+ &volSerial, &fileMaxLen, &fileFlags, fileSysName,
MAX_PATH);
if (success) {
LOG_INFO("drive : %s", szSingleDrive);
LOG_INFO("Volume Name : %s", volName);
LOG_INFO("Volume Serial : 0x%x", volSerial);
- LOG_DEBUG("Max file length : %d", FileMaxLen);
- LOG_DEBUG("Filesystem : %s", FileSysName);
+ LOG_DEBUG("Max file length : %d", fileMaxLen);
+ LOG_DEBUG("Filesystem : %s", fileSysName);
if (diskInfos != NULL) {
if (ndrives < (int)*disk_info_size) {
diskInfos[ndrives].id = ndrives;
- strncpy(diskInfos[ndrives].device, volName, MAX_PATH);
- strncpy(diskInfos[ndrives].label, FileSysName, MAX_PATH);
- memcpy(diskInfos[ndrives].disk_sn, &buf, sizeof(buf));
+ strncpy(diskInfos[ndrives].device, volName, min(MAX_PATH,sizeof(volName))-1);
+ strncpy(diskInfos[ndrives].label, fileSysName,min(sizeof(diskInfos[ndrives].label), sizeof(fileSysName)) - 1);
memcpy(diskInfos[ndrives].disk_sn, &volSerial, sizeof(DWORD));
- diskInfos[ndrives].preferred = (strncmp(szSingleDrive, "C", 1) != 0);
+ diskInfos[ndrives].preferred = (szSingleDrive[0] == 'C');
} else {
return_value = FUNC_RET_BUFFER_TOO_SMALL;
}
@@ -100,79 +96,6 @@
return return_value;
}
-static int translate(char ipStringIn[16], unsigned char ipv4[4]) {
- size_t index = 0;
-
- char* str2 = ipStringIn; /* save the pointer */
- while (*str2) {
- if (isdigit((unsigned char) *str2)) {
- ipv4[index] *= 10;
- ipv4[index] += *str2 - '0';
- } else {
- index++;
- }
- str2++;
- }
- return 0;
-}
-
-//http://stackoverflow.com/questions/18046063/mac-address-using-c
-//TODO: count only interfaces with type (MIB_IF_TYPE_ETHERNET IF_TYPE_IEEE80211)
-FUNCTION_RETURN getAdapterInfos(OsAdapterInfo * adapterInfos,
- size_t * adapter_info_size) {
- DWORD dwStatus;
- PIP_ADAPTER_INFO pAdapterInfo;
- //IP_ADAPTER_INFO AdapterInfo[20]; // Allocate information for up to 16 NICs
- DWORD dwBufLen = sizeof(IP_ADAPTER_INFO); //10 * sizeof(IP_ADAPTER_INFO); // Save the memory size of buffer
-
- unsigned int i = 3;
- do {
- pAdapterInfo = (PIP_ADAPTER_INFO) malloc(dwBufLen);
- dwStatus = GetAdaptersInfo( // Call GetAdapterInfo
- pAdapterInfo, // [out] buffer to receive data
- &dwBufLen // [in] size of receive data buffer
- );
- if (dwStatus != NO_ERROR) {
- free(pAdapterInfo);
- pAdapterInfo = NULL;
- }
- } while (dwStatus == ERROR_BUFFER_OVERFLOW && i-- > 0);
-
- if (dwStatus == ERROR_BUFFER_OVERFLOW) {
- return FUNC_RET_ERROR;
- }
-
- if (adapterInfos == NULL || *adapter_info_size == 0) {
- *adapter_info_size = dwBufLen / sizeof(IP_ADAPTER_INFO);
- if (pAdapterInfo != NULL){
- free(pAdapterInfo);
- }
- return FUNC_RET_OK;
- }
-
- *adapter_info_size = dwBufLen / sizeof(IP_ADAPTER_INFO);
- memset(adapterInfos, 0, dwBufLen);
- PIP_ADAPTER_INFO pAdapter = pAdapterInfo;
- i = 0;
- FUNCTION_RETURN result = FUNC_RET_OK;
- while (pAdapter) {
- strncpy(adapterInfos[i].description, pAdapter->Description,
- min(sizeof(adapterInfos->description),
- MAX_ADAPTER_DESCRIPTION_LENGTH));
- memcpy(adapterInfos[i].mac_address, pAdapter->Address, 8);
- translate(pAdapter->IpAddressList.IpAddress.String,
- adapterInfos[i].ipv4_address);
- adapterInfos[i].type = IFACE_TYPE_ETHERNET;
- i++;
- pAdapter = pAdapter->Next;
- if (i == *adapter_info_size) {
- result = FUNC_RET_BUFFER_TOO_SMALL;
- break;
- }
- }
- free(pAdapterInfo);
- return result;
-}
FUNCTION_RETURN getModuleName(char buffer[MAX_PATH]) {
FUNCTION_RETURN result = FUNC_RET_OK;
@@ -183,29 +106,4 @@
return result;
}
-// TODO: remove unused
-static void printHash(HCRYPTHASH* hHash) {
- DWORD dwHashLen;
- DWORD dwHashLenSize = sizeof(DWORD);
-
- if (CryptGetHashParam(*hHash, HP_HASHSIZE, (BYTE *) &dwHashLen,
- &dwHashLenSize, 0)) {
- BYTE* pbHash = (BYTE*)malloc(dwHashLen);
- char* hashStr = (char*)malloc(dwHashLen * 2 + 1);
- if (CryptGetHashParam(*hHash, HP_HASHVAL, pbHash, &dwHashLen, 0)) {
- for (unsigned int i = 0; i < dwHashLen; i++) {
- sprintf(&hashStr[i * 2], "%02x", pbHash[i]);
- } LOG_DEBUG("Hash to verify: %s", hashStr);
- }
- free(pbHash);
- free(hashStr);
- }
-}
-
-/**
- * Not implemented yet.
- */
-VIRTUALIZATION getVirtualization() {
- return NONE;
-}
--
Gitblit v1.9.1