From 4467a957a498b93dbcaefbad97df24b43dfbc99d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 3月 2020 22:16:09 +0800
Subject: [PATCH] fix tests
---
src/library/os/linux/os-linux.c | 335 +++++++++++++++++--------------------------------------
1 files changed, 102 insertions(+), 233 deletions(-)
diff --git a/src/library/os/linux/os-linux.c b/src/library/os/linux/os-linux.c
index f4f5d8c..1dc23cb 100644
--- a/src/library/os/linux/os-linux.c
+++ b/src/library/os/linux/os-linux.c
@@ -1,193 +1,42 @@
-#define _GNU_SOURCE /* To get defns of NI_MAXSERV and NI_MAXHOST */
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <ifaddrs.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <linux/if_link.h>
-#include <sys/socket.h>
-#include <netpacket/packet.h>
-#include <valgrind/memcheck.h>
#include <paths.h>
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
#include <sys/stat.h>
+#include <stdio.h>
#include "../os.h"
-#include "../../base/public-key.h"
-
-#include <openssl/evp.h>
-#include <openssl/bio.h>
-#include <openssl/pem.h>
-#include <openssl/err.h>
+#include "../../base/logger.h"
#include <mntent.h>
#include <dirent.h>
-#include <stdio.h>
-
-static int ifname_position(char *ifnames, char * ifname, int ifnames_max) {
- int i, position;
- position = -1;
- for (i = 0; i < ifnames_max; i++) {
- if (strcmp(ifname, &ifnames[i * NI_MAXHOST]) == 0) {
- position = i;
- break;
- }
- }
- return position;
-
-}
-
-FUNCTION_RETURN getAdapterInfos(AdapterInfo * adapterInfos,
- size_t * adapter_info_size) {
-
- FUNCTION_RETURN f_return = OK;
- struct ifaddrs *ifaddr, *ifa;
- int family, i, s, n, if_name_position;
- unsigned int if_num, if_max;
- char host[NI_MAXHOST];
- char *ifnames;
-
- if (getifaddrs(&ifaddr) == -1) {
- perror("getifaddrs");
- return ERROR;
- }
-
- if (adapterInfos != NULL) {
- memset(adapterInfos, 0, (*adapter_info_size) * sizeof(AdapterInfo));
- }
-
- /* count the maximum number of interfaces */
- for (ifa = ifaddr, if_max = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
- if (ifa->ifa_addr == NULL) {
- continue;
- }
- if_max++;
- }
-
- /* allocate space for names */
- ifnames = (char*) malloc(NI_MAXHOST * if_max);
- memset(ifnames, 0, NI_MAXHOST * if_max);
- /* Walk through linked list, maintaining head pointer so we
- can free list later */
- for (ifa = ifaddr, n = 0, if_num = 0; ifa != NULL;
- ifa = ifa->ifa_next, n++) {
- if (ifa->ifa_addr == NULL) {
- continue;
- }
- if_name_position = ifname_position(ifnames, ifa->ifa_name, if_num);
- //interface name not seen en advance
- if (if_name_position < 0) {
- strncpy(&ifnames[if_num * NI_MAXHOST], ifa->ifa_name, NI_MAXHOST);
- if (adapterInfos != NULL && if_num < *adapter_info_size) {
- strncpy(adapterInfos[if_num].description, ifa->ifa_name,
- NI_MAXHOST);
- }
- if_name_position = if_num;
- if_num++;
- if (adapterInfos == NULL) {
- continue;
- }
- }
- family = ifa->ifa_addr->sa_family;
- /* Display interface name and family (including symbolic
- form of the latter for the common families) */
+#include <sys/utsname.h>
#ifdef _DEBUG
- printf("%-8s %s (%d)\n", ifa->ifa_name,
- (family == AF_PACKET) ? "AF_PACKET" :
- (family == AF_INET) ? "AF_INET" :
- (family == AF_INET6) ? "AF_INET6" : "???", family);
-#endif
- /* For an AF_INET* interface address, display the address
- * || family == AF_INET6*/
- if (family == AF_INET) {
- /*
- s = getnameinfo(ifa->ifa_addr,
- (family == AF_INET) ?
- sizeof(struct sockaddr_in) :
- sizeof(struct sockaddr_in6), host, NI_MAXHOST,
- NULL, 0, NI_NUMERICHOST);
- */
-#ifdef _DEBUG
- s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host,
- NI_MAXHOST,
- NULL, 0, NI_NUMERICHOST);
- if (s != 0) {
- printf("getnameinfo() failed: %s\n", gai_strerror(s));
- }
- printf("\t\taddress: <%s>\n", host);
+#include <valgrind/memcheck.h>
#endif
- if (adapterInfos != NULL && if_name_position < *adapter_info_size) {
- struct sockaddr_in *s1 = (struct sockaddr_in*) ifa->ifa_addr;
- in_addr_t iaddr = s1->sin_addr.s_addr;
- adapterInfos[if_name_position].ipv4_address[0] = (iaddr
- & 0x000000ff);
- adapterInfos[if_name_position].ipv4_address[1] = (iaddr
- & 0x0000ff00) >> 8;
- adapterInfos[if_name_position].ipv4_address[2] = (iaddr
- & 0x00ff0000) >> 16;
- adapterInfos[if_name_position].ipv4_address[3] = (iaddr
- & 0xff000000) >> 24;
- }
- } else if (family == AF_PACKET && ifa->ifa_data != NULL) {
- struct sockaddr_ll *s1 = (struct sockaddr_ll*) ifa->ifa_addr;
- if (adapterInfos != NULL && if_name_position < *adapter_info_size) {
- for (i = 0; i < 6; i++) {
- adapterInfos[if_name_position].mac_address[i] =
- s1->sll_addr[i];
-#ifdef _DEBUG
- printf("%02x:", s1->sll_addr[i]);
-#endif
- }
-#ifdef _DEBUG
- printf("\t %s\n", ifa->ifa_name);
+#ifdef USE_DBUS
+#include <dbus-1.0/dbus/dbus.h>
#endif
- }
- }
- }
-
- *adapter_info_size = if_num;
- if (adapterInfos == NULL) {
- f_return = OK;
- } else if (*adapter_info_size < if_num) {
- f_return = BUFFER_TOO_SMALL;
- }
- freeifaddrs(ifaddr);
- free(ifnames);
- return f_return;
-}
/**
*Usually uuid are hex number separated by "-". this method read up to 8 hex
*numbers skipping - characters.
*@param uuid uuid as read in /dev/disk/by-uuid
*@param buffer_out: unsigned char buffer[8] output buffer for result
*/
-static void parseUUID(const char *uuid, unsigned char* buffer_out,
- unsigned int out_size) {
- size_t len;
+static void parseUUID(const char *uuid, unsigned char *buffer_out, unsigned int out_size) {
unsigned int i, j;
- char * hexuuid;
+ char *hexuuid;
unsigned char cur_character;
- //remove characters not in hex set
- len = strlen(uuid);
- hexuuid = (char *) malloc(sizeof(char) * strlen(uuid));
+ // remove characters not in hex set
+ size_t len = strlen(uuid);
+ hexuuid = (char *)malloc(sizeof(char) * len);
memset(buffer_out, 0, out_size);
- memset(hexuuid, 0, sizeof(char) * strlen(uuid));
+ memset(hexuuid, 0, sizeof(char) * len);
for (i = 0, j = 0; i < len; i++) {
if (isxdigit(uuid[i])) {
hexuuid[j] = uuid[i];
j++;
} else {
- //skip
+ // skip
continue;
}
}
@@ -204,7 +53,7 @@
}
#define MAX_UNITS 20
-FUNCTION_RETURN getDiskInfos(DiskInfo * diskInfos, size_t * disk_info_size) {
+FUNCTION_RETURN getDiskInfos(DiskInfo *diskInfos, size_t *disk_info_size) {
struct stat mount_stat, sym_stat;
/*static char discard[1024];
char device[64], name[64], type[64];
@@ -213,11 +62,11 @@
struct mntent *ent;
int maxDrives, currentDrive, i, drive_found;
- __ino64_t *statDrives;
- DiskInfo *tmpDrives;
- FILE *aFile;
- DIR *disk_by_uuid_dir, *disk_by_label;
- struct dirent *dir;
+ __ino64_t *statDrives = NULL;
+ DiskInfo *tmpDrives = NULL;
+ FILE *aFile = NULL;
+ DIR *disk_by_uuid_dir = NULL, *disk_by_label = NULL;
+ struct dirent *dir = NULL;
FUNCTION_RETURN result;
if (diskInfos != NULL) {
@@ -225,26 +74,25 @@
tmpDrives = diskInfos;
} else {
maxDrives = MAX_UNITS;
- tmpDrives = (DiskInfo *) malloc(sizeof(DiskInfo) * maxDrives);
+ tmpDrives = (DiskInfo *)malloc(sizeof(DiskInfo) * maxDrives);
}
memset(tmpDrives, 0, sizeof(DiskInfo) * maxDrives);
- statDrives = (__ino64_t *) malloc(maxDrives * sizeof(__ino64_t ));
- memset(statDrives, 0, sizeof(__ino64_t ) * maxDrives);
- ;
+ statDrives = (__ino64_t *)malloc(maxDrives * sizeof(__ino64_t));
+ memset(statDrives, 0, sizeof(__ino64_t) * maxDrives);
aFile = setmntent("/proc/mounts", "r");
if (aFile == NULL) {
/*proc not mounted*/
- return ERROR;
+ free(tmpDrives);
+ free(statDrives);
+ return FUNC_RET_ERROR;
}
currentDrive = 0;
while (NULL != (ent = getmntent(aFile))) {
- if ((strncmp(ent->mnt_type, "ext", 3) == 0
- || strncmp(ent->mnt_type, "vfat", 4) == 0
- || strncmp(ent->mnt_type, "ntfs", 4) == 0)
- && ent->mnt_fsname != NULL
- && strncmp(ent->mnt_fsname, "/dev/", 5) == 0) {
+ if ((strncmp(ent->mnt_type, "ext", 3) == 0 || strncmp(ent->mnt_type, "xfs", 3) == 0 ||
+ strncmp(ent->mnt_type, "vfat", 4) == 0 || strncmp(ent->mnt_type, "ntfs", 4) == 0) &&
+ ent->mnt_fsname != NULL && strncmp(ent->mnt_fsname, "/dev/", 5) == 0) {
if (stat(ent->mnt_fsname, &mount_stat) == 0) {
drive_found = -1;
for (i = 0; i < currentDrive; i++) {
@@ -253,20 +101,16 @@
}
}
if (drive_found == -1) {
-#ifdef _DEBUG
- printf("mntent: %s %s %d\n", ent->mnt_fsname, ent->mnt_dir,
- mount_stat.st_ino);
-#endif
- strcpy(tmpDrives[currentDrive].device, ent->mnt_fsname);
+ LOG_DEBUG("mntent: %s %s %d\n", ent->mnt_fsname, ent->mnt_dir,
+ (unsigned long int)mount_stat.st_ino);
+ strncpy(tmpDrives[currentDrive].device, ent->mnt_fsname, 255 - 1);
statDrives[currentDrive] = mount_stat.st_ino;
drive_found = currentDrive;
currentDrive++;
}
if (strcmp(ent->mnt_dir, "/") == 0) {
strcpy(tmpDrives[drive_found].label, "root");
-#ifdef _DEBUG
- printf("drive %s set to preferred\n", ent->mnt_fsname);
-#endif
+ LOG_DEBUG("drive %s set to preferred\n", ent->mnt_fsname);
tmpDrives[drive_found].preferred = true;
}
}
@@ -277,17 +121,15 @@
if (diskInfos == NULL) {
*disk_info_size = currentDrive;
free(tmpDrives);
- result = OK;
+ result = (currentDrive > 0) ? FUNC_RET_OK : FUNC_RET_NOT_AVAIL;
} else if (*disk_info_size >= currentDrive) {
disk_by_uuid_dir = opendir("/dev/disk/by-uuid");
if (disk_by_uuid_dir == NULL) {
-#ifdef _DEBUG
- printf("Open /dev/disk/by-uuid fail");
-#endif
+ LOG_WARN("Open /dev/disk/by-uuid fail");
free(statDrives);
- return ERROR;
+ return FUNC_RET_ERROR;
}
- result = OK;
+ result = FUNC_RET_OK;
*disk_info_size = currentDrive;
while ((dir = readdir(disk_by_uuid_dir)) != NULL) {
strcpy(cur_dir, "/dev/disk/by-uuid/");
@@ -295,17 +137,12 @@
if (stat(cur_dir, &sym_stat) == 0) {
for (i = 0; i < currentDrive; i++) {
if (sym_stat.st_ino == statDrives[i]) {
- parseUUID(dir->d_name, tmpDrives[i].disk_sn,
- sizeof(tmpDrives[i].disk_sn));
+ parseUUID(dir->d_name, tmpDrives[i].disk_sn, sizeof(tmpDrives[i].disk_sn));
#ifdef _DEBUG
VALGRIND_CHECK_VALUE_IS_DEFINED(tmpDrives[i].device);
- printf("uuid %d %s %02x%02x%02x%02x\n", i,
- tmpDrives[i].device,
- tmpDrives[i].disk_sn[0],
- tmpDrives[i].disk_sn[1],
- tmpDrives[i].disk_sn[2],
- tmpDrives[i].disk_sn[3]);
+ LOG_DEBUG("uuid %d %s %02x%02x%02x%02x\n", i, tmpDrives[i].device, tmpDrives[i].disk_sn[0],
+ tmpDrives[i].disk_sn[1], tmpDrives[i].disk_sn[2], tmpDrives[i].disk_sn[3]);
#endif
}
}
@@ -321,9 +158,8 @@
if (stat(cur_dir, &sym_stat) == 0) {
for (i = 0; i < currentDrive; i++) {
if (sym_stat.st_ino == statDrives[i]) {
- strncpy(tmpDrives[i].label, dir->d_name, 255);
- printf("label %d %s %s\n", i, tmpDrives[i].label,
- tmpDrives[i].device);
+ strncpy(tmpDrives[i].label, dir->d_name, 255 - 1);
+ printf("label %d %s %s\n", i, tmpDrives[i].label, tmpDrives[i].device);
}
}
}
@@ -331,7 +167,7 @@
closedir(disk_by_label);
}
} else {
- result = BUFFER_TOO_SMALL;
+ result = FUNC_RET_BUFFER_TOO_SMALL;
}
/*
FILE *mounts = fopen(_PATH_MOUNTED, "r");
@@ -353,36 +189,69 @@
return result;
}
-void os_initialize() {
- static int initialized = 0;
- if (initialized == 0) {
- initialized = 1;
- ERR_load_ERR_strings();
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
+static void _getCpuid(unsigned int *p, unsigned int ax) {
+ __asm __volatile(
+ "movl %%ebx, %%esi\n\t"
+ "cpuid\n\t"
+ "xchgl %%ebx, %%esi"
+ : "=a"(p[0]), "=S"(p[1]), "=c"(p[2]), "=d"(p[3])
+ : "0"(ax));
+}
+
+FUNCTION_RETURN getCpuId(unsigned char identifier[6]) {
+ unsigned int i;
+ unsigned int cpuinfo[4] = {0, 0, 0, 0};
+ _getCpuid(cpuinfo, 0);
+ for (i = 0; i < 3; i++) {
+ identifier[i * 2] = cpuinfo[i] & 0xFF;
+ identifier[i * 2 + 1] = (cpuinfo[i] & 0xFF00) >> 8;
}
+ return FUNC_RET_OK;
}
-VIRTUALIZATION getVirtualization() {
-//http://www.ibiblio.org/gferg/ldp/GCC-Inline-Assembly-HOWTO.html
-//
-//bool rc = true;
- /*__asm__ (
- "push %edx\n"
- "push %ecx\n"
- "push %ebx\n"
- "mov %eax, 'VMXh'\n"
- "mov %ebx, 0\n" // any value but not the MAGIC VALUE
- "mov %ecx, 10\n"// get VMWare version
- "mov %edx, 'VX'\n"// port number
- "in %eax, dx\n"// read port on return EAX returns the VERSION
- "cmp %ebx, 'VMXh'\n"// is it a reply from VMWare?
- "setz [rc] \n"// set return value
- "pop %ebx \n"
- "pop %ecx \n"
- "pop %edx \n"
- );*/
- return NONE;
+
+FUNCTION_RETURN getMachineName(unsigned char identifier[6]) {
+ static struct utsname u;
+
+ if (uname(&u) < 0) {
+ return FUNC_RET_ERROR;
+ }
+ memcpy(identifier, u.nodename, 6);
+ return FUNC_RET_OK;
}
+FUNCTION_RETURN getOsSpecificIdentifier(unsigned char identifier[6]) {
+#if USE_DBUS
+ char *dbus_id = dbus_get_local_machine_id();
+ if (dbus_id == NULL) {
+ return FUNC_RET_ERROR;
+ }
+ memcpy(identifier, dbus_id, 6);
+ dbus_free(dbus_id);
+ return FUNC_RET_OK;
+#else
+ return FUNC_RET_NOT_AVAIL;
+#endif
+}
+
+FUNCTION_RETURN getModuleName(char buffer[MAX_PATH]) {
+ FUNCTION_RETURN result;
+ char path[MAX_PATH] = {0};
+ char proc_path[MAX_PATH], pidStr[64];
+ pid_t pid = getpid();
+ sprintf(pidStr, "%d", pid);
+ strcpy(proc_path, "/proc/");
+ strcat(proc_path, pidStr);
+ strcat(proc_path, "/exe");
+
+ int ch = readlink(proc_path, path, MAX_PATH - 1);
+ if (ch != -1) {
+ path[ch] = '\0';
+ strncpy(buffer, path, ch);
+ result = FUNC_RET_OK;
+ } else {
+ result = FUNC_RET_ERROR;
+ }
+ return result;
+}
--
Gitblit v1.9.1