src: move ipsec.inc require to top pages

For now plugins.inc and ipsec.inc will coexist on pages that
may need only one or none to avoid unefined function errors.
This will be pruned after investigating the contents of both
files...

(cherry picked from commit d7df9ecf)

src/etc/inc/plugins.inc.d/vpn.inc

@@ -29,9 +29,6 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("ipsec.inc");
-
-
 /* include all configuration functions */
 function vpn_ipsec_convert_to_modp($index)
 {

src/etc/rc.bootup

@@ -152,6 +152,8 @@ require_once("filter.inc");
 echo ".";
 require_once("plugins.inc");
 echo ".";
+require_once("ipsec.inc");
+echo ".";
 require_once("openvpn.inc");
 echo ".";
 require_once("rrd.inc");

src/etc/rc.filter_configure_sync

@@ -30,6 +30,7 @@
 require_once("config.inc");
 require_once("util.inc");
 require_once("filter.inc");
+require_once("ipsec.inc");
 require_once("plugins.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");

src/etc/rc.initial.setlanip

@@ -33,6 +33,7 @@ require_once("interfaces.inc");
 require_once("openvpn.inc");
 require_once("util.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("filter.inc");
 require_once("rrd.inc");
 require_once("util.inc");

src/etc/rc.initial.setports

@@ -33,6 +33,7 @@ require_once("config.console.inc");
 require_once("filter.inc");
 require_once("util.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("rrd.inc");
 require_once("system.inc");
 require_once("services.inc");

src/etc/rc.linkup

@@ -32,6 +32,7 @@ require_once("config.inc");
 require_once("filter.inc");
 require_once("interfaces.inc");
 require_once('plugins.inc');
+require_once('ipsec.inc');
 require_once('openvpn.inc');
 require_once("util.inc");
 require_once("system.inc");

src/etc/rc.newipsecdns

@@ -33,6 +33,7 @@ require_once("util.inc");
 require_once("config.inc");
 require_once("filter.inc");
 require_once("plugins.inc");
+require_once('ipsec.inc');
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 

src/etc/rc.newwanip

@@ -32,6 +32,7 @@
 require_once("config.inc");
 require_once("filter.inc");
 require_once("plugins.inc");
+require_once('ipsec.inc');
 require_once("openvpn.inc");
 require_once("rrd.inc");
 require_once("util.inc");

src/etc/rc.newwanipv6

@@ -33,6 +33,7 @@ require_once("config.inc");
 require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("plugins.inc");
+require_once('ipsec.inc');
 require_once("openvpn.inc");
 require_once("services.inc");
 require_once("rrd.inc");

src/etc/rc.reload_all

@@ -32,6 +32,7 @@ require_once("interfaces.inc");
 require_once("openvpn.inc");
 require_once("filter.inc");
 require_once("plugins.inc");
+require_once('ipsec.inc');
 require_once("util.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");

src/etc/rc.reload_interfaces

@@ -31,6 +31,7 @@ require_once("config.inc");
 require_once("filter.inc");
 require_once("util.inc");
 require_once("openvpn.inc");
+require_once('ipsec.inc');
 require_once("plugins.inc");
 require_once("system.inc");
 require_once("interfaces.inc");

src/www/diag_ipsec_leases.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 

src/www/diag_ipsec_sad.php

@@ -30,6 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 

src/www/diag_ipsec_spd.php

@@ -30,6 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 

src/www/interfaces.php

@@ -37,6 +37,7 @@ require_once("filter.inc");
 require_once("rrd.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
+require_once("ipsec.inc");
 require_once("openvpn.inc");
 require_once("pfsense-utils.inc");
 require_once("services.inc");

src/www/interfaces_assign.php

@@ -34,6 +34,7 @@ require_once("plugins.inc");
 require_once("rrd.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
+require_once("ipsec.inc");
 require_once("openvpn.inc");
 require_once("pfsense-utils.inc");
 require_once("services.inc");

src/www/status_services.php

@@ -37,6 +37,7 @@ require_once("pfsense-utils.inc");
 require_once("openvpn.inc");
 require_once("filter.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("interfaces.inc");
 require_once("rrd.inc");
 

src/www/system_advanced_misc.php

@@ -32,6 +32,7 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("vslb.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");

src/www/system_gateway_groups_edit.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 

src/www/vpn_ipsec.php

@@ -31,6 +31,7 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");

src/www/vpn_ipsec_keys.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("filter.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");

src/www/vpn_ipsec_keys_edit.php

@@ -30,6 +30,7 @@
 require_once("interfaces.inc");
 require_once("guiconfig.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("services.inc");
 
 if (!isset($config['ipsec']) || !is_array($config['ipsec'])) {

src/www/vpn_ipsec_mobile.php

@@ -31,6 +31,7 @@ require_once("interfaces.inc");
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
 

src/www/vpn_ipsec_phase1.php

@@ -31,6 +31,7 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
+require_once("ipsec.inc");
 require_once("plugins.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");

src/www/vpn_ipsec_phase2.php

@@ -30,6 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
+require_once("ipsec.inc");
 require_once("plugins.inc");
 require_once("services.inc");
 

src/www/vpn_ipsec_settings.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
+require_once("ipsec.inc");
 require_once("plugins.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");

src/www/widgets/widgets/services_status.widget.php

@@ -34,6 +34,7 @@ $nocsrf = true;
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("plugins.inc");
+require_once("ipsec.inc");
 require_once("widgets/include/services_status.inc");
 require_once("interfaces.inc");