From 8ce9725941732f11822121cfb4b51d19ed064533 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 19 May 2017 12:13:52 -0300 Subject: Use recently added hwaddr field to restore original MAC address --- src/etc/inc/interfaces.inc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/etc/inc/interfaces.inc') diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 248a9bb..5b375ec 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -6138,16 +6138,8 @@ function get_interface_mac($interface) { } function get_interface_vendor_mac($interface) { - global $g; - - $mac = ""; - $mac_file = "{$g['vardb_path']}/vendor_mac"; - if (file_exists($mac_file)) { - $vendor_mac_arr = json_decode(file_get_contents($mac_file), true); - $mac = (is_macaddr($vendor_mac_arr[$interface])) ? $vendor_mac_arr[$interface] : ''; - } - - return $mac; + $macinfo = pfSense_get_interface_addresses($interface); + return $macinfo["hwaddr"] ?: ''; } /****f* pfsense-utils/generate_random_mac_address -- cgit v1.1