lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipsec: ok to drop ipsec include from services

Browse Source 
Add a little plugin glue to two tainted spots.
This commit is contained in:
Franco Fichtner 2019-04-23 12:48:41 +02:00
parent 44a95cea38
commit 6449801ade
12 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2535,7 +2535,7 @@ function interface_configure($verbose = false, $interface = 'wan', $reload = fal
if (!file_exists("/var/run/booting")) {
if ($reload) {
system_routing_configure($verbose, $interface);
ipsec_configure_do($verbose, $interface);
plugins_configure('ipsec', $verbose, array($interface));
plugins_configure('dns', $verbose);
services_dhcpd_configure($verbose);
/* XXX move these up the call stack */

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

@ -113,6 +113,7 @@ $p2_protos = array(
function ipsec_configure()
{
return array(
'ipsec' => array('ipsec_configure_do:2'),
'vpn' => array('ipsec_configure_do:2'),
);
}

1
src/etc/inc/services.inc
View File

@ -43,7 +43,6 @@
* as plugins, but the things listed below are viable
* targets in the future:
*/
require_once('plugins.inc.d/ipsec.inc');
require_once('plugins.inc.d/openvpn.inc');
function generate_ipv6_from_mac($mac)

2
src/etc/inc/xmlrpc/legacy.inc
View File

@ -259,7 +259,7 @@ function restore_config_section_xmlrpc($new_config)
}
if (isset($old_config['ipsec']['enable']) !== isset($config['ipsec']['enable'])) {
ipsec_configure_do();
plugins_configure('ipsec');
}
unset($old_config);

1
src/www/diag_ipsec.php
View File

@ -31,6 +31,7 @@
require_once("guiconfig.inc");
require_once("services.inc");
require_once("plugins.inc.d/ipsec.inc");
/**
* search config for phase 1 description

4
src/www/diag_ipsec_sad.php
View File

@ -29,9 +29,9 @@
*/
require_once("guiconfig.inc");
require_once("plugins.inc.d/ipsec.inc");
require_once("services.inc");
require_once("interfaces.inc");
require_once("plugins.inc.d/ipsec.inc");
$service_hook = 'strongswan';
@ -39,8 +39,8 @@ include("head.inc");
$sad = ipsec_dump_sad();
legacy_html_escape_form_data($sad);
?>
?>
<body>
<?php include("fbegin.inc"); ?>
<section class="page-content-main">

2
src/www/diag_ipsec_spd.php
View File

@ -29,9 +29,9 @@
*/
require_once("guiconfig.inc");
require_once("plugins.inc.d/ipsec.inc");
require_once("services.inc");
require_once("interfaces.inc");
require_once("plugins.inc.d/ipsec.inc");
$service_hook = 'strongswan';

2
src/www/vpn_ipsec.php
View File

@ -31,9 +31,9 @@
require_once("guiconfig.inc");
require_once("system.inc");
require_once("filter.inc");
require_once("plugins.inc.d/ipsec.inc");
require_once("services.inc");
require_once("interfaces.inc");
require_once("plugins.inc.d/ipsec.inc");
/*
* Return phase2 idinfo in text format

2
src/www/vpn_ipsec_keys.php
View File

@ -28,10 +28,10 @@
*/
require_once("guiconfig.inc");
require_once("plugins.inc.d/ipsec.inc");
require_once("filter.inc");
require_once("services.inc");
require_once("interfaces.inc");
require_once("plugins.inc.d/ipsec.inc");
config_read_array('ipsec', 'mobilekey');
ipsec_mobilekey_sort();

2
src/www/vpn_ipsec_phase1.php
View File

@ -32,9 +32,9 @@
require_once("guiconfig.inc");
require_once("system.inc");
require_once("filter.inc");
require_once("plugins.inc.d/ipsec.inc");
require_once("services.inc");
require_once("interfaces.inc");
require_once("plugins.inc.d/ipsec.inc");
/*
* ikeid management functions

2
src/www/vpn_ipsec_phase2.php
View File

@ -30,8 +30,8 @@
require_once("guiconfig.inc");
require_once("interfaces.inc");
require_once("plugins.inc.d/ipsec.inc");
require_once("services.inc");
require_once("plugins.inc.d/ipsec.inc");
/**
* combine ealgos and keylen_* tags

2
src/www/vpn_ipsec_settings.php
View File

@ -29,9 +29,9 @@
require_once("guiconfig.inc");
require_once("filter.inc");
require_once("plugins.inc.d/ipsec.inc");
require_once("services.inc");
require_once("interfaces.inc");
require_once("plugins.inc.d/ipsec.inc");
config_read_array('ipsec');