From cd53d13fd12f8dd86514b2894e62ee6612566975 Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周一, 04 8月 2014 00:38:17 +0800
Subject: [PATCH] linux tests ok
---
src/library/pc-identifiers.c | 85 ++++++++++++++++++++++++++++--------------
1 files changed, 57 insertions(+), 28 deletions(-)
diff --git a/src/library/pc-identifiers.c b/src/library/pc-identifiers.c
index a2f7ad8..891bd82 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) {
@@ -78,7 +79,7 @@
adapterInfos = (AdapterInfo*) malloc(adapters * sizeof(AdapterInfo));
result_adapterInfos = getAdapterInfos(adapterInfos, &adapters);
- for (j = 0; j < adapters; i++) {
+ for (j = 0; j < adapters; j++) {
for (k = 0; k < 6; k++)
if (use_mac) {
identifiers[j][k] = adapterInfos[j].mac_address[k + 2];
@@ -98,33 +99,50 @@
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) {
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 != 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) {
+ free(diskInfos);
return OK;
- } else if (disk_num > defined_identifiers) {
+ } else if (available_disk_info > defined_identifiers) {
+ free(diskInfos);
return 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++;
}
}
}
@@ -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,11 +233,11 @@
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,
@@ -229,7 +247,7 @@
}
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;
}
@@ -258,7 +276,10 @@
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,16 +293,15 @@
*/
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];
int identifiers_size;
- sscanf(pc_signature_in, "%.4s-%.4s-%.4s-%.4s", &base64ids[0], &base64ids[4],
+ sscanf(pc_signature_in, "%4s-%4s-%4s-%4s", &base64ids[0], &base64ids[4],
&base64ids[8], &base64ids[12]);
- concat_identifiers = unbase64(base64ids, 16,
- &identifiers_size);
+ concat_identifiers = unbase64(base64ids, 16, &identifiers_size);
if (identifiers_size > sizeof(PcIdentifier) * 2) {
return BUFFER_TOO_SMALL;
}
@@ -300,17 +320,19 @@
PcIdentifier user_identifiers[2];
FUNCTION_RETURN result;
IDENTIFICATION_STRATEGY previous_strategy_id, current_strategy_id;
- PcIdentifier* calculated_identifiers;
- unsigned int calc_identifiers_size;
- int i, j;
- //bool found;
-
+ PcIdentifier* calculated_identifiers = NULL;
+ unsigned int calc_identifiers_size = 0;
+ int i = 0, j = 0;
+//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) {
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) {
@@ -320,7 +342,7 @@
if (calculated_identifiers != NULL) {
free(calculated_identifiers);
}
- current_strategy_id = previous_strategy_id;
+ previous_strategy_id = current_strategy_id;
generate_pc_id(NULL, &calc_identifiers_size, current_strategy_id);
calculated_identifiers = (PcIdentifier *) malloc(
sizeof(PcIdentifier) * calc_identifiers_size);
@@ -329,6 +351,13 @@
}
//maybe skip the byte 0
for (j = 0; j < calc_identifiers_size; j++) {
+#ifdef _DEBUG
+ printf("generated id: %02x%02x%02x%02x%02x%02x index %d, user_supplied id %02x%02x%02x%02x%02x%02x idx: %d\n",
+ calculated_identifiers[j][0],calculated_identifiers[j][1],calculated_identifiers[j][2],
+ calculated_identifiers[j][3],calculated_identifiers[j][4],calculated_identifiers[j][5],j,
+ user_identifiers[i][0],user_identifiers[i][1],user_identifiers[i][2],user_identifiers[i][3],user_identifiers[i][4],user_identifiers[i][5],i);
+
+#endif
if (!memcmp(user_identifiers[i], calculated_identifiers[j],
sizeof(PcIdentifier))) {
free(calculated_identifiers);
--
Gitblit v1.9.1