mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Keep only one function to return the mac address

Browse Source 
* Bring the mac address function to interfaces.inc its the only consumer of those.
This commit is contained in:
Ermal Lui 2009-03-22 23:19:40 +00:00
parent 82ef398ab3
commit f2ba47f8da
2 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
etc/inc/interfaces.inc
View File

@ -1274,7 +1274,7 @@ function interface_configure($interface = "wan") {
mwexec("/sbin/ifconfig " . escapeshellarg($wancfg['if']) .
" link " . escapeshellarg($wancfg['spoofmac']));
} else {
$mac = get_interface_mac_address($wancfg['if']);
$mac = get_interface_mac($wancfg['if']);
if($mac == "ff:ff:ff:ff:ff:ff") {
/* this is not a valid mac address. generate a
* temporary mac address so the machine can get online.
@ -1968,13 +1968,27 @@ function get_wireless_modes($interface) {
}
function get_interface_mac($interface) {
/* build interface list with netstat */
$linkinfo = "";
exec("/usr/bin/netstat -I $interface -nW -f link", $linkinfo);
array_shift($linkinfo);
$alink = preg_split("/\s+/", $linkinfo[0]);
$mac = chop($alink[3]);
return $mac;
$mac = exec("ifconfig {$interface} | awk '/ether/ {print $2}'");
if(is_macaddr($mac)) {
return trim($mac);
} else {
return "";
}
}
/****f* pfsense-utils/generate_random_mac_address
* NAME
* generate_random_mac - generates a random mac address
* INPUTS
* none
* RESULT
* $mac - a random mac address
******/
function generate_random_mac_address() {
$mac = "02";
for($x=0; $x<5; $x++)
$mac .= ":" . dechex(rand(16, 255));
return $mac;
}
function setup_pppoe_reset_file($interface, $status) {

32
etc/inc/pfsense-utils.inc
View File

@ -826,23 +826,6 @@ function log_error($error) {
return;
}
/****f* pfsense-utils/get_interface_mac_address
* NAME
* get_interface_mac_address - Return a interfaces mac address
* INPUTS
* $interface - interface to obtain mac address from
* RESULT
* $mac - the mac address of the interface
******/
function get_interface_mac_address($interface) {
$mac = exec("ifconfig {$interface} | awk '/ether/ {print $2}'");
if(is_macaddr($mac)) {
return trim($mac);
} else {
return "";
}
}
/****f* pfsense-utils/return_dir_as_array
* NAME
* return_dir_as_array - Return a directory's contents as an array.
@ -2468,21 +2451,6 @@ function display_topbar($text = "", $bg_color="#990000", $replace_color="#FFFFFF
echo "</script>";
}
/****f* pfsense-utils/generate_random_mac_address
* NAME
* generate_random_mac - generates a random mac address
* INPUTS
* none
* RESULT
* $mac - a random mac address
******/
function generate_random_mac_address() {
$mac = "02";
for($x=0; $x<5; $x++)
$mac .= ":" . dechex(rand(16, 255));
return $mac;
}
/****f* pfsense-utils/strncpy
* NAME
* strncpy - copy strings