mirror of
https://github.com/lucaspalomodevelop/opnsense-core.git
synced 2026-03-13 00:07:27 +00:00
interfaces: kill another "realif" side effect
This inline-assign shouldn't happen anymore (likely a very early version using the wlan device name implicitly). Maybe for 25.7, needs a tiny code audit at one point but since the other cruft changes are in 25.1.3 this makes sense to push.
This commit is contained in:
parent
a0e6d92fa3
commit
bb37fa89e7
@ -3552,11 +3552,6 @@ function get_real_interface($interface = 'wan', $family = 'all')
|
||||
|
||||
$realif = $config['interfaces'][$interface]['if'];
|
||||
|
||||
/* XXX this is either impossibe to reach nowadays or requires an interface migration */
|
||||
if (isset($config['interfaces'][$interface]['wireless']) && !strstr($realif, '_wlan')) {
|
||||
$realif .= '_wlan0';
|
||||
}
|
||||
|
||||
if ($family == 'inet6') {
|
||||
switch ($config['interfaces'][$interface]['ipaddrv6'] ?? 'none') {
|
||||
case '6rd':
|
||||
|
||||
@ -262,10 +262,6 @@ class Gateways extends BaseModel
|
||||
$ifcfg = $definedIntf[$ifname];
|
||||
$realif = $ifcfg['if'];
|
||||
|
||||
if (isset($ifcfg['wireless']) && !strstr($realif, '_wlan')) {
|
||||
$realif .= '_wlan0';
|
||||
}
|
||||
|
||||
if ($ipproto == 'inet6') {
|
||||
switch ($ifcfg['ipaddrv6'] ?? 'none') {
|
||||
case '6rd':
|
||||
|
||||
@ -78,10 +78,6 @@ abstract class Base
|
||||
'name' => !empty((string)$node->descr) ? (string)$node->descr : $ifname,
|
||||
'if' => (string)$node->if
|
||||
];
|
||||
/* relevant parts from get_real_interface() using in old rrd.inc */
|
||||
if (isset($node->wireless) && !strstr((string)$node->if, '_wlan')) {
|
||||
self::$metadata['interfaces'][$ifname]['if'] .= '_wlan0';
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ((new \OPNsense\OpenVPN\OpenVPN())->serverDevices() as $ifname => $data) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user