From 1d1082fe695366da3498f528b953203a90fe7385 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 01 2月 2020 02:48:51 +0800
Subject: [PATCH] rename enums and further developments
---
src/library/os/linux/network_id.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/library/os/network_id.c b/src/library/os/linux/network_id.c
similarity index 97%
rename from src/library/os/network_id.c
rename to src/library/os/linux/network_id.c
index 1c112b2..7f48a3f 100644
--- a/src/library/os/network_id.c
+++ b/src/library/os/linux/network_id.c
@@ -25,7 +25,7 @@
#include <string.h>
#include <stdio.h>
-#include "os.h"
+#include "../os.h"
/**
*
@@ -58,7 +58,7 @@
FUNCTION_RETURN f_return = FUNC_RET_OK;
struct ifaddrs *ifaddr, *ifa;
- int family, i, n, if_name_position;
+ int family, n = 0, if_name_position;
unsigned int if_num, if_max;
//char host[NI_MAXHOST];
char *ifnames;
@@ -96,7 +96,7 @@
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);
+ NI_MAXHOST-1);
}
if_name_position = if_num;
if_num++;
@@ -148,6 +148,7 @@
} 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) {
+ int i;
for (i = 0; i < 6; i++) {
adapterInfos[if_name_position].mac_address[i] =
s1->sll_addr[i];
--
Gitblit v1.9.1