From 22248bae361aa743a4e8e045425c431f13b0966d Mon Sep 17 00:00:00 2001 From: davidevinavil Date: Fri, 30 Jun 2017 18:43:50 +0200 Subject: z2_plus: Move readmac in proper place --- readmac/Android.mk | 11 -------- readmac/zuk_readmac.c | 72 --------------------------------------------------- wifi/Android.mk | 11 ++++++++ wifi/zuk_readmac.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 83 deletions(-) delete mode 100644 readmac/Android.mk delete mode 100644 readmac/zuk_readmac.c create mode 100644 wifi/Android.mk create mode 100644 wifi/zuk_readmac.c diff --git a/readmac/Android.mk b/readmac/Android.mk deleted file mode 100644 index 8876a2b..0000000 --- a/readmac/Android.mk +++ /dev/null @@ -1,11 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -ifeq ($(strip $(BOARD_HAS_QCOM_WLAN)),true) -include $(CLEAR_VARS) -LOCAL_MODULE := readmac -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := zuk_readmac.c -LOCAL_CFLAGS += -Wall -LOCAL_SHARED_LIBRARIES := libc libcutils libutils liblog -include $(BUILD_EXECUTABLE) -endif diff --git a/readmac/zuk_readmac.c b/readmac/zuk_readmac.c deleted file mode 100644 index 55616d8..0000000 --- a/readmac/zuk_readmac.c +++ /dev/null @@ -1,72 +0,0 @@ -#define LOG_TAG "zuk_readmac" -#define LOG_NDEBUG 0 - -#include -#include -#include -#include -#include -#include - -#define MAC_ADDR_SIZE 6 -#define WLAN_MAC_BIN "/persist/wlan_mac.bin" - -static int check_wlan_mac_bin_file() -{ - char content[1024]; - FILE *fp; - - fp = fopen(WLAN_MAC_BIN, "r"); - if (fp != NULL) { - memset(content, 0, sizeof(content)); - fread(content, 1, sizeof(content)-1, fp); - fclose(fp); - - if (strstr(content, "Intf0MacAddress") == NULL) { - ALOGV("%s is missing Intf0MacAddress entry value", WLAN_MAC_BIN); - return 1; - } - - if (strstr(content, "Intf1MacAddress") == NULL) { - ALOGV("%s is missing Intf1MacAddress entry value", WLAN_MAC_BIN); - return 1; - } - - return 0; - } - return 1; -} - -int main() -{ - int i, wlan_addr3, wlan_addr4, wlan_addr5, ret; - - // First 6 hex number are fix - unsigned char wlan_addr[] = { 0xd8, 0x9a, 0x34 }; - - // Last 6 hex number are random - srand(time(NULL) + getpid()); - for (i = 0; i < 3; i++) { - wlan_addr3 = rand() % 256; - wlan_addr4 = rand() % 256; - wlan_addr5 = rand() % 256; - } - - FILE *fp; - - // Store WLAN MAC address in the persist file, if needed - if (check_wlan_mac_bin_file()) { - fp = fopen(WLAN_MAC_BIN, "w"); - fprintf(fp, "Intf0MacAddress=%02X%02X%02X%02X%02X%02X\n", - wlan_addr[0], wlan_addr[1], wlan_addr[2], wlan_addr3, wlan_addr4, wlan_addr5); - fprintf(fp, "Intf1MacAddress=%02X%02X%02X%02X%02X%02X\n", - wlan_addr[0], wlan_addr[1], wlan_addr[2], wlan_addr3, wlan_addr4, (wlan_addr5+1)); - fprintf(fp, "END\n"); - fclose(fp); - ALOGV("%s was successfully generated", WLAN_MAC_BIN); - } else { - ALOGV("%s already exists and is valid", WLAN_MAC_BIN); - } - - return 0; -} diff --git a/wifi/Android.mk b/wifi/Android.mk new file mode 100644 index 0000000..8876a2b --- /dev/null +++ b/wifi/Android.mk @@ -0,0 +1,11 @@ +LOCAL_PATH:= $(call my-dir) + +ifeq ($(strip $(BOARD_HAS_QCOM_WLAN)),true) +include $(CLEAR_VARS) +LOCAL_MODULE := readmac +LOCAL_MODULE_TAGS := optional +LOCAL_SRC_FILES := zuk_readmac.c +LOCAL_CFLAGS += -Wall +LOCAL_SHARED_LIBRARIES := libc libcutils libutils liblog +include $(BUILD_EXECUTABLE) +endif diff --git a/wifi/zuk_readmac.c b/wifi/zuk_readmac.c new file mode 100644 index 0000000..55616d8 --- /dev/null +++ b/wifi/zuk_readmac.c @@ -0,0 +1,72 @@ +#define LOG_TAG "zuk_readmac" +#define LOG_NDEBUG 0 + +#include +#include +#include +#include +#include +#include + +#define MAC_ADDR_SIZE 6 +#define WLAN_MAC_BIN "/persist/wlan_mac.bin" + +static int check_wlan_mac_bin_file() +{ + char content[1024]; + FILE *fp; + + fp = fopen(WLAN_MAC_BIN, "r"); + if (fp != NULL) { + memset(content, 0, sizeof(content)); + fread(content, 1, sizeof(content)-1, fp); + fclose(fp); + + if (strstr(content, "Intf0MacAddress") == NULL) { + ALOGV("%s is missing Intf0MacAddress entry value", WLAN_MAC_BIN); + return 1; + } + + if (strstr(content, "Intf1MacAddress") == NULL) { + ALOGV("%s is missing Intf1MacAddress entry value", WLAN_MAC_BIN); + return 1; + } + + return 0; + } + return 1; +} + +int main() +{ + int i, wlan_addr3, wlan_addr4, wlan_addr5, ret; + + // First 6 hex number are fix + unsigned char wlan_addr[] = { 0xd8, 0x9a, 0x34 }; + + // Last 6 hex number are random + srand(time(NULL) + getpid()); + for (i = 0; i < 3; i++) { + wlan_addr3 = rand() % 256; + wlan_addr4 = rand() % 256; + wlan_addr5 = rand() % 256; + } + + FILE *fp; + + // Store WLAN MAC address in the persist file, if needed + if (check_wlan_mac_bin_file()) { + fp = fopen(WLAN_MAC_BIN, "w"); + fprintf(fp, "Intf0MacAddress=%02X%02X%02X%02X%02X%02X\n", + wlan_addr[0], wlan_addr[1], wlan_addr[2], wlan_addr3, wlan_addr4, wlan_addr5); + fprintf(fp, "Intf1MacAddress=%02X%02X%02X%02X%02X%02X\n", + wlan_addr[0], wlan_addr[1], wlan_addr[2], wlan_addr3, wlan_addr4, (wlan_addr5+1)); + fprintf(fp, "END\n"); + fclose(fp); + ALOGV("%s was successfully generated", WLAN_MAC_BIN); + } else { + ALOGV("%s already exists and is valid", WLAN_MAC_BIN); + } + + return 0; +} -- cgit v1.2.3