lucaspalomodevelop/opnsense-core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/opnsense-core.git synced 2026-03-13 00:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

temp fix for https://github.com/opnsense/core/issues/3222, partly revert adf314a4ab

Browse Source
This commit is contained in:
Ad Schellevis 2019-02-14 10:29:45 +01:00
parent c0bbb4bbcb
commit 2eabec274f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2729,7 +2729,7 @@ function interface_6rd_configure($interface = 'wan', $wancfg)
$rd6brgw = "{$rd6prefix}{$wancfg['gateway-6rd']}";
$stfiface = "{$wanif}_stf";
$stfiface = "{$interface}_stf";
if (does_interface_exist($stfiface)) {
legacy_interface_destroy($stfiface);
}
@ -2825,7 +2825,7 @@ function interface_6to4_configure($interface = 'wan', $wancfg)
}
$stflan = Net_IPv6::compress(implode(":", $stflanarr));
$stfiface = "{$wanif}_stf";
$stfiface = "{$interface}_stf";
if (does_interface_exist($stfiface)) {
legacy_interface_destroy($stfiface);
}
@ -3656,7 +3656,7 @@ function get_real_interface($interface = 'wan', $family = 'all')
switch (isset($cfg['ipaddrv6']) ? $cfg['ipaddrv6'] : '') {
case '6rd':
case '6to4':
$wanif = "{$cfg['if']}_stf";
$wanif = "{$interface}_stf";
break;
case 'pppoe':
case 'ppp':

2
src/opnsense/mvc/app/library/OPNsense/Firewall/Plugin.php
View File

@ -80,7 +80,7 @@ class Plugin
// generate virtual IPv6 interfaces
foreach ($this->interfaceMapping as $key => &$intf) {
if (!empty($intf['ipaddrv6']) && ($intf['ipaddrv6'] == '6rd' || $intf['ipaddrv6'] == '6to4')) {
$realif = "{$intf['if']}_stf";
$realif = "{$key}_stf";
// create new interface
$this->interfaceMapping[$realif] = array();
$this->interfaceMapping[$realif]['ifconfig']['ipv6'] = $intf['ifconfig']['ipv6'];