From 82d408374c8ece8f13b50b93ff24ab9633de14f0 Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周二, 05 8月 2014 04:58:22 +0800
Subject: [PATCH] windows bootstrap 1
---
src/library/pc-identifiers.c | 107 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 64 insertions(+), 43 deletions(-)
diff --git a/src/library/pc-identifiers.c b/src/library/pc-identifiers.c
index 5d120b6..37af7d0 100644
--- a/src/library/pc-identifiers.c
+++ b/src/library/pc-identifiers.c
@@ -11,6 +11,7 @@
#include <string.h>
#include <stdbool.h>
#include "base/base64.h"
+#include <valgrind/memcheck.h>
static FUNCTION_RETURN generate_default_pc_id(PcIdentifier * identifiers,
unsigned int * num_identifiers) {
@@ -21,12 +22,12 @@
AdapterInfo *adapterInfos;
result_adapterInfos = getAdapterInfos(NULL, &adapter_num);
- if (result_adapterInfos != OK) {
+ if (result_adapterInfos != FUNC_RET_OK) {
//call generate_disk_pc_id;
return result_adapterInfos;
}
result_diskinfos = getDiskInfos(NULL, &disk_num);
- if (result_diskinfos == OK) {
+ if (result_diskinfos == FUNC_RET_OK) {
required_id_size = disk_num * adapter_num;
} else {
required_id_size = disk_num;
@@ -34,9 +35,9 @@
int defined_identifiers = *num_identifiers;
*num_identifiers = required_id_size;
if (identifiers == NULL) {
- return OK;
+ return FUNC_RET_OK;
} else if (required_id_size > defined_identifiers) {
- return BUFFER_TOO_SMALL;
+ return FUNC_RET_BUFFER_TOO_SMALL;
}
diskInfos = (DiskInfo*) malloc(disk_num * sizeof(DiskInfo));
result_diskinfos = getDiskInfos(diskInfos, &disk_num);
@@ -53,7 +54,7 @@
free(diskInfos);
free(adapterInfos);
- return OK;
+ return FUNC_RET_OK;
}
static FUNCTION_RETURN generate_ethernet_pc_id(PcIdentifier * identifiers,
@@ -64,16 +65,16 @@
AdapterInfo *adapterInfos;
result_adapterInfos = getAdapterInfos(NULL, &adapters);
- if (result_adapterInfos != OK) {
+ if (result_adapterInfos != FUNC_RET_OK) {
return result_adapterInfos;
}
int defined_adapters = *num_identifiers;
*num_identifiers = adapters;
if (identifiers == NULL) {
- return OK;
+ return FUNC_RET_OK;
} else if (adapters > defined_adapters) {
- return BUFFER_TOO_SMALL;
+ return FUNC_RET_BUFFER_TOO_SMALL;
}
adapterInfos = (AdapterInfo*) malloc(adapters * sizeof(AdapterInfo));
@@ -93,43 +94,60 @@
}
}
free(adapterInfos);
- return OK;
+ return FUNC_RET_OK;
}
static FUNCTION_RETURN generate_disk_pc_id(PcIdentifier * identifiers,
unsigned int * num_identifiers, bool use_label) {
- size_t disk_num;
+ size_t disk_num, available_disk_info=0;
FUNCTION_RETURN result_diskinfos;
- unsigned int i, k;
+ unsigned int i, k, j;
+ char firstChar;
DiskInfo * diskInfos;
result_diskinfos = getDiskInfos(NULL, &disk_num);
- if (result_diskinfos != OK) {
+ if (result_diskinfos != FUNC_RET_OK) {
return result_diskinfos;
+ }
+ diskInfos = (DiskInfo*) malloc(disk_num * sizeof(DiskInfo));
+ //memset(diskInfos,0,disk_num * sizeof(DiskInfo));
+ result_diskinfos = getDiskInfos(diskInfos, &disk_num);
+ if (result_diskinfos != FUNC_RET_OK) {
+ free(diskInfos);
+ return result_diskinfos;
+ }
+ for (i = 0; i < disk_num; i++) {
+ firstChar = use_label ? diskInfos[i].label[0] : diskInfos[i].disk_sn[0];
+ available_disk_info += firstChar == 0 ? 0 : 1;
}
int defined_identifiers = *num_identifiers;
- *num_identifiers = disk_num;
+ *num_identifiers = available_disk_info;
if (identifiers == NULL) {
- return OK;
- } else if (disk_num > defined_identifiers) {
- return BUFFER_TOO_SMALL;
+ free(diskInfos);
+ return FUNC_RET_OK;
+ } else if (available_disk_info > defined_identifiers) {
+ free(diskInfos);
+ return FUNC_RET_BUFFER_TOO_SMALL;
}
- diskInfos = (DiskInfo*) malloc(disk_num * sizeof(DiskInfo));
- result_diskinfos = getDiskInfos(diskInfos, &disk_num);
-
+ j=0;
for (i = 0; i < disk_num; i++) {
- for (k = 0; k < 6; k++) {
- if (use_label) {
- identifiers[i][k] = diskInfos[i].label[k];
- } else {
- identifiers[i][k] = diskInfos[i].disk_sn[k + 2];
+ if(use_label){
+ if(diskInfos[i].label[0]!=0){
+ memset(identifiers[j],0,sizeof(PcIdentifier)); //!!!!!!!
+ strncpy(identifiers[j],diskInfos[i].label,sizeof(PcIdentifier));
+ j++;
+ }
+ }else{
+ if(diskInfos[i].disk_sn[0]!=0){
+ memcpy(identifiers[j],&diskInfos[i].disk_sn[2],sizeof(PcIdentifier));
+ j++;
}
}
}
free(diskInfos);
- return OK;
+ return FUNC_RET_OK;
}
/**
@@ -170,10 +188,10 @@
result = generate_disk_pc_id(identifiers, array_size, true);
break;
default:
- return ERROR;
+ return FUNC_RET_ERROR;
}
- if (result == OK && identifiers != NULL) {
+ if (result == FUNC_RET_OK && identifiers != NULL) {
strategy_num = strategy << 5;
for (i = 0; i < *array_size; i++) {
//encode strategy in the first three bits of the pc_identifier
@@ -181,7 +199,7 @@
}
//fill array if larger
for (i = *array_size; i < original_array_size; i++) {
- identifiers[i][0] = STRATEGY_UNKNOWN;
+ identifiers[i][0] = STRATEGY_UNKNOWN << 5;
for (j = 1; j < sizeof(PcIdentifier); j++) {
identifiers[i][j] = 42; //padding
}
@@ -215,27 +233,27 @@
FUNCTION_RETURN encode_pc_id(PcIdentifier identifier1, PcIdentifier identifier2,
PcSignature pc_identifier_out) {
- //TODO base62 encoding, now uses base64
+//TODO base62 encoding, now uses base64
PcIdentifier concat_identifiers[2];
int b64_size = 0;
size_t concatIdentifiersSize = sizeof(PcIdentifier) * 2;
- //concat_identifiers = (PcIdentifier *) malloc(concatIdentifiersSize);
+//concat_identifiers = (PcIdentifier *) malloc(concatIdentifiersSize);
memcpy(&concat_identifiers[0], identifier1, sizeof(PcIdentifier));
memcpy(&concat_identifiers[1], identifier2, sizeof(PcIdentifier));
char* b64_data = base64(concat_identifiers, concatIdentifiersSize,
&b64_size);
if (b64_size > sizeof(PcSignature)) {
- return BUFFER_TOO_SMALL;
+ return FUNC_RET_BUFFER_TOO_SMALL;
}
sprintf(pc_identifier_out, "%.4s-%.4s-%.4s-%.4s", &b64_data[0],
&b64_data[4], &b64_data[8], &b64_data[12]);
- //free(concat_identifiers);
+//free(concat_identifiers);
free(b64_data);
- return OK;
+ return FUNC_RET_OK;
}
FUNCTION_RETURN parity_check_id(PcSignature pc_identifier) {
- return OK;
+ return FUNC_RET_OK;
}
FUNCTION_RETURN generate_user_pc_signature(PcSignature identifier_out,
@@ -244,21 +262,24 @@
PcIdentifier* identifiers;
unsigned int req_buffer_size = 0;
result = generate_pc_id(NULL, &req_buffer_size, strategy);
- if (result != OK) {
+ if (result != FUNC_RET_OK) {
return result;
}
if (req_buffer_size == 0) {
- return ERROR;
+ return FUNC_RET_ERROR;
}
req_buffer_size = req_buffer_size < 2 ? 2 : req_buffer_size;
identifiers = (PcIdentifier *) malloc(
sizeof(PcIdentifier) * req_buffer_size);
result = generate_pc_id(identifiers, &req_buffer_size, strategy);
- if (result != OK) {
+ if (result != FUNC_RET_OK) {
free(identifiers);
return result;
}
+ VALGRIND_CHECK_VALUE_IS_DEFINED(identifiers[0]);
+ VALGRIND_CHECK_VALUE_IS_DEFINED(identifiers[1]);
result = encode_pc_id(identifiers[0], identifiers[1], identifier_out);
+ VALGRIND_CHECK_VALUE_IS_DEFINED(identifier_out);
free(identifiers);
return result;
}
@@ -272,7 +293,7 @@
*/
static FUNCTION_RETURN decode_pc_id(PcIdentifier identifier1_out,
PcIdentifier identifier2_out, PcSignature pc_signature_in) {
- //TODO base62 encoding, now uses base64
+//TODO base62 encoding, now uses base64
unsigned char * concat_identifiers;
char base64ids[17];
@@ -282,13 +303,13 @@
&base64ids[8], &base64ids[12]);
concat_identifiers = unbase64(base64ids, 16, &identifiers_size);
if (identifiers_size > sizeof(PcIdentifier) * 2) {
- return BUFFER_TOO_SMALL;
+ return FUNC_RET_BUFFER_TOO_SMALL;
}
memcpy(identifier1_out, concat_identifiers, sizeof(PcIdentifier));
memcpy(identifier2_out, concat_identifiers + sizeof(PcIdentifier),
sizeof(PcIdentifier));
free(concat_identifiers);
- return OK;
+ return FUNC_RET_OK;
}
static IDENTIFICATION_STRATEGY strategy_from_pc_id(PcIdentifier identifier) {
@@ -302,16 +323,16 @@
PcIdentifier* calculated_identifiers = NULL;
unsigned int calc_identifiers_size = 0;
int i = 0, j = 0;
- //bool found;
+//bool found;
#ifdef _DEBUG
printf("Comparing pc identifiers: \n");
#endif
result = decode_pc_id(user_identifiers[0], user_identifiers[1], str_code);
- if (result != OK) {
+ if (result != FUNC_RET_OK) {
return result;
}
previous_strategy_id = STRATEGY_UNKNOWN;
- //found = false;
+//found = false;
for (i = 0; i < 2; i++) {
current_strategy_id = strategy_from_pc_id(user_identifiers[i]);
if (current_strategy_id == STRATEGY_UNKNOWN) {
--
Gitblit v1.9.1