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

interfaces: full-cirle on vpn_map vs. vpn event

Browse Source 
We actually only want the vpn_map event in the stable branch
and move to a backwards compatible format for 25.1 but as a
new coalesced (mapped) caller.
This commit is contained in:
Franco Fichtner 2024-09-18 12:10:46 +02:00
parent 5fe06a19ba
commit 89f84780ff
8 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/plugins.inc.d/ipsec.inc
View File

@ -120,7 +120,7 @@ function ipsec_configure()
{
return [
'ipsec' => ['ipsec_configure_do:2'],
'vpn_map' => ['ipsec_configure_do:2'],
'vpn' => ['ipsec_configure_do:2'],
];
}

2
src/etc/inc/plugins.inc.d/openvpn.inc
View File

@ -37,7 +37,7 @@ function openvpn_configure()
'crl' => ['openvpn_refresh_crls:0'],
'remote' => ['openvpn_configure_do'],
'openvpn' => ['openvpn_configure_do:2'],
'vpn_map' => ['openvpn_configure_do:2'],
'vpn' => ['openvpn_configure_do:2'],
];
}

2
src/etc/inc/plugins.inc.d/wireguard.inc
View File

@ -145,7 +145,7 @@ function wireguard_configure()
{
return [
'newwanip_map' => ['wireguard_sync'],
'vpn_map' => ['wireguard_configure_do'],
'vpn' => ['wireguard_configure_do'],
];
}

2
src/etc/rc.bootup
View File

@ -98,7 +98,7 @@ plugins_configure('dns', true);
filter_configure_sync(true);
plugins_configure('monitor', true);
plugins_configure('vpn_map', true);
plugins_configure('vpn', true);
plugins_configure('bootup', true);
system_powerd_configure(true); /* XXX this seems misplaced */

3
src/etc/rc.newwanip
View File

@ -115,6 +115,5 @@ if (is_ipaddr($cacheip) && $ip != $cacheip) {
/* register IP change not before this point as basic connectivity is needed */
@file_put_contents($cacheip_file, $ip . PHP_EOL);
/* XXX after 25.1 drop the "_map" suffix again */
plugins_configure('vpn_map', false, [$interface, 'inet']);
plugins_configure('vpn', false, [$interface, 'inet']);
plugins_configure('newwanip_map', false, [$interface, 'inet']);

3
src/etc/rc.newwanipv6
View File

@ -124,6 +124,5 @@ system_routing_configure(false, $interfaces, true, 'inet6');
filter_configure_sync();
/* XXX after 25.1 drop the "_map" suffix again */
plugins_configure('vpn_map', false, [join(',', $interfaces), 'inet6']);
plugins_configure('vpn', false, [join(',', $interfaces), 'inet6']);
plugins_configure('newwanip_map', false, [join(',', $interfaces), 'inet6']);

2
src/etc/rc.reload_all
View File

@ -54,7 +54,7 @@ interfaces_configure(true);
system_routing_configure(true);
filter_configure_sync(true);
plugins_configure('local', true);
plugins_configure('vpn_map', true);
plugins_configure('vpn', true);
/* plugins service reload */
passthru('/usr/local/etc/rc.freebsd stop');

2
src/opnsense/scripts/shell/setports.php
View File

@ -44,5 +44,5 @@ if (set_networking_interfaces_ports()) {
system_routing_configure(true);
filter_configure_sync(true);
plugins_configure('local', true);
plugins_configure('vpn_map', true);
plugins_configure('vpn', true);
}