mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-18 02:25:05 +00:00
ipsec: back out link_interface_to_ipsec() changes that are not required
This commit is contained in:
parent
29bd7f49c5
commit
4aba8cae5d
@ -320,13 +320,6 @@ function ipsec_xmlrpc_sync()
|
||||
return $result;
|
||||
}
|
||||
|
||||
function ipsec_run()
|
||||
{
|
||||
return array(
|
||||
'link_interface_to_ipsec' => 'link_interface_to_ipsec:2',
|
||||
);
|
||||
}
|
||||
|
||||
/*
|
||||
* Return phase1 local address
|
||||
*/
|
||||
@ -1889,19 +1882,6 @@ function ipsec_get_configured_vtis()
|
||||
return $configured_intf;
|
||||
}
|
||||
|
||||
function link_interface_to_ipsec($unused, $interface)
|
||||
{
|
||||
$linked = [];
|
||||
|
||||
foreach (ipsec_get_configured_vtis() as $ipsec => $info) {
|
||||
if ($info['interface'] == $interface) {
|
||||
$linked = $ipsec;
|
||||
}
|
||||
}
|
||||
|
||||
return $linked;
|
||||
}
|
||||
|
||||
/**
|
||||
* Configure required Virtual Terminal Interfaces (synchronizes configuration with local interfaces named ipsec%)
|
||||
*/
|
||||
|
||||
@ -98,8 +98,6 @@ if (!empty($bridgetmp)) {
|
||||
interface_bridge_add_member($bridgetmp, $interface_real);
|
||||
}
|
||||
|
||||
$ipsecs = plugins_run('link_interface_to_ipsec', false, array($interface));
|
||||
|
||||
system_resolvconf_generate();
|
||||
system_hosts_generate();
|
||||
|
||||
@ -140,12 +138,6 @@ foreach (legacy_config_get_interfaces(['enable' => true, 'virtual' => false]) as
|
||||
$restartifs[$ifname] = 1;
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($ipsecs as $ipsec) {
|
||||
if ($ifparent['if'] == $ipsec) {
|
||||
$restartifs[$ifname] = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach (array_keys($restartifs) as $ifname) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user