lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: remove renaming of interfaces

Browse Source
This commit is contained in:
Franco Fichtner 2017-06-10 20:06:50 +02:00
parent a57d0e88c2
commit ca10d0a2f9
2 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/etc/inc/interfaces.inc
View File

@ -1919,16 +1919,11 @@ function interface_wireless_clone($realif, $wlcfg)
}
log_error(sprintf('Cloning new wireless interface %s', $realif));
// Create the new wlan interface. FreeBSD returns the new interface name.
// example: wlan2
exec("/sbin/ifconfig wlan create wlandev {$baseif} {$mode} bssid 2>&1", $out, $ret);
exec("/sbin/ifconfig wlan create name {$realif} wlandev {$baseif} {$mode} bssid 2>&1", $out, $ret);
if ($ret <> 0) {
log_error(sprintf('Failed to clone interface %s with error code %s, output %s', $baseif, $ret, $out[0]));
return false;
}
$newif = trim($out[0]);
// Rename the interface to {$parentnic}_wlan{$number}#: EX: ath0_wlan0
legacy_interface_rename($newif, $realif);
file_put_contents("/tmp/{$realif}_oldmac", get_interface_mac($realif));
}
return true;
@ -3003,8 +2998,7 @@ function interface_6rd_configure($interface = "wan", $wancfg)
if (does_interface_exist($stfiface)) {
legacy_interface_destroy($stfiface);
}
$tmpstfiface = legacy_interface_create('stf');
legacy_interface_rename($tmpstfiface, $stfiface);
legacy_interface_create('stf', $stfiface);
legacy_interface_flags($stfiface, 'link2');
if ($wancfg['prefix-6rd-v4plen'] > 0) {
$rd6prefixlen += intval($wancfg['prefix-6rd-v4plen']);
@ -3112,8 +3106,7 @@ function interface_6to4_configure($interface = 'wan', $wancfg)
if (does_interface_exist($stfiface)) {
legacy_interface_destroy($stfiface);
}
$tmpstfiface = legacy_interface_create('stf');
legacy_interface_rename($tmpstfiface, $stfiface);
legacy_interface_create('stf', $stfiface);
legacy_interface_flags($stfiface, 'link2');
mwexec("/sbin/ifconfig {$stfiface} inet6 {$stflanpr} prefixlen 16");

16
src/etc/inc/interfaces.lib.inc
View File

@ -72,11 +72,11 @@ function legacy_interface_flags($ifs, $flag, $report_errors=true)
}
}
function legacy_interface_create($ifs, $name=null)
function legacy_interface_create($ifs, $name = null)
{
$cmd = '/sbin/ifconfig ' . escapeshellarg($ifs) . ' create';
if (!empty($name)) {
$cmd .= " name " . escapeshellarg($name);
$cmd .= ' name ' . escapeshellarg($name);
}
$new = null;
@ -123,16 +123,6 @@ function legacy_interface_deladdress($ifs, $addr)
}
}
function legacy_interface_rename($ifs, $name)
{
$cmd = '/sbin/ifconfig ' . escapeshellarg($ifs) . ' name ' . escapeshellarg($name);
exec($cmd . ' 2>&1', $out, $ret);
if ($ret) {
log_error('The command `' . $cmd . '\' failed to execute');
}
}
function legacy_interface_mtu($ifs, $mtu)
{
$cmd = '/sbin/ifconfig ' . escapeshellarg($ifs) . ' mtu ' . escapeshellarg($mtu);
@ -163,7 +153,7 @@ function legacy_vlan_tag($ifs, $member, $tag, $pcp)
}
}
function legacy_interface_stats($ifs=null)
function legacy_interface_stats($ifs = null)
{
if ($ifs != null) {
// only request data for selected interface