services: ipsec and openvpn as core service includes

src/etc/inc/services.inc

 <?php
 
 /*
-    Copyright (C) 2014-2016 Franco Fichtner <franco@opnsense.org>
+    Copyright (C) 2014-2017 Franco Fichtner <franco@opnsense.org>
     Copyright (C) 2010 Ermal Luci
     Copyright (C) 2005-2006 Colin Smith <ethethlay@gmail.com>
     Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
@@ -30,15 +30,22 @@
 */
 
 /*
- * Best case this shouldn't be here but DNS (and DHCP)
- * are deeply tied into several internals in system.inc
- * and services.inc.  services.inc itself has always
- * been a workaround for holding multiple features away
- * from system.inc, but its movable parts belong to
- * system.inc, while all services belong to their own
- * files.  Maybe eventually this will change...
+ * Base services are slowly being converted into plugins,
+ * hooks are created and expanded to accomodate for their
+ * feature set, which allows us to build a better plugin
+ * system in general.
+ *
+ * Ideally this may allow us to remove all service-relevant
+ * parts from system.inc and services.inc so that the latter
+ * will eventually become obsolete.
+ *
+ * The goal may not be to remove all of the base system
+ * as plugins, but the things listed below are viable
+ * targets in the future:
  */
 require_once('dyndns.class');
+require_once('ipsec.inc');
+require_once('openvpn.inc');
 require_once('plugins.inc.d/dnsmasq.inc');
 require_once('plugins.inc.d/unbound.inc');
 

src/etc/inc/xmlrpc/legacy.inc

@@ -127,7 +127,6 @@ function filter_configure_xmlrpc()
     require_once("system.inc");
     require_once("util.inc");
     require_once("interfaces.inc");
-    require_once("openvpn.inc");
     require_once("services.inc");
     require_once("rrd.inc");
 
@@ -155,8 +154,8 @@ function restore_config_section_xmlrpc($new_config)
     global $config;
 
     require_once("interfaces.inc");
+    require_once("services.inc");
     require_once("filter.inc");
-    require_once("ipsec.inc");
 
     // save old config
     $old_config = $config;

src/etc/inc/xmlrpc/service.inc

@@ -31,9 +31,7 @@
 require_once("services.inc");
 require_once("system.inc");
 require_once('util.inc');
-require_once("openvpn.inc");
 require_once("filter.inc");
-require_once("ipsec.inc");
 require_once("interfaces.inc");
 require_once("rrd.inc");
 

src/etc/rc.bootup

@@ -45,8 +45,6 @@ $inc_files = array(
     'services.inc',
     'system.inc',
     'filter.inc',
-    'ipsec.inc',
-    'openvpn.inc',
     'rrd.inc',
 );
 

src/etc/rc.carpbackup

@@ -28,7 +28,7 @@
 */
 
 require_once("config.inc");
-require_once("openvpn.inc");
+require_once("services.inc");
 require_once("interfaces.inc");
 require_once("util.inc");
 

src/etc/rc.carpmaster

@@ -28,7 +28,7 @@
 */
 
 require_once("config.inc");
-require_once("openvpn.inc");
+require_once("services.inc");
 require_once("interfaces.inc");
 require_once("util.inc");
 

src/etc/rc.filter_configure

@@ -30,7 +30,6 @@
 require_once("config.inc");
 require_once("util.inc");
 require_once("filter.inc");
-require_once("ipsec.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("services.inc");

src/etc/rc.initial.setlanip

@@ -27,12 +27,9 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* parse the configuration and include all functions used below */
 require_once("config.inc");
 require_once("interfaces.inc");
-require_once("openvpn.inc");
 require_once("util.inc");
-require_once("ipsec.inc");
 require_once("filter.inc");
 require_once("rrd.inc");
 require_once("util.inc");

src/etc/rc.initial.setports

@@ -31,12 +31,10 @@ require_once("config.inc");
 require_once("config.console.inc");
 require_once("filter.inc");
 require_once("util.inc");
-require_once("ipsec.inc");
 require_once("rrd.inc");
 require_once("system.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("openvpn.inc");
 
 system_console_mute();
 

src/etc/rc.interfaces_wan_configure

@@ -32,8 +32,6 @@ require_once('auth.inc');
 require_once("util.inc");
 require_once("filter.inc");
 require_once("system.inc");
-require_once('ipsec.inc');
-require_once('openvpn.inc');
 require_once("interfaces.inc");
 require_once("services.inc");
 

src/etc/rc.linkup

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

src/etc/rc.newwanip

@@ -31,8 +31,6 @@
 require_once("config.inc");
 require_once('auth.inc');
 require_once("filter.inc");
-require_once('ipsec.inc');
-require_once("openvpn.inc");
 require_once("rrd.inc");
 require_once("util.inc");
 require_once("system.inc");

src/etc/rc.newwanipv6

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

src/etc/rc.reload_all

@@ -29,10 +29,8 @@
 
 require_once("config.inc");
 require_once("interfaces.inc");
-require_once("openvpn.inc");
 require_once("filter.inc");
 require_once("auth.inc");
-require_once('ipsec.inc');
 require_once('rrd.inc');
 require_once("util.inc");
 require_once("system.inc");

src/etc/rc.reload_interfaces

@@ -30,8 +30,6 @@
 require_once("config.inc");
 require_once("filter.inc");
 require_once("util.inc");
-require_once("openvpn.inc");
-require_once('ipsec.inc');
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("services.inc");

src/www/interfaces.php

@@ -36,8 +36,6 @@ 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("services.inc");
 
 /***************************************************************************************************************

src/www/interfaces_assign.php

@@ -33,8 +33,6 @@ 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("services.inc");
 
 function list_interfaces() {

src/www/interfaces_bridge_edit.php

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

src/www/interfaces_gif_edit.php

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

src/www/interfaces_gre_edit.php

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

src/www/interfaces_lagg_edit.php

@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
-require_once("openvpn.inc");
 require_once("services.inc");
 
 /**

src/www/interfaces_vlan_edit.php

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

src/www/status_interfaces.php

@@ -32,8 +32,6 @@ require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("openvpn.inc");
-require_once("services.inc");
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     if (!empty($_POST['if']) && !empty($_POST['submit'])) {

src/www/status_services.php

@@ -31,9 +31,7 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("system.inc");
-require_once("openvpn.inc");
 require_once("filter.inc");
-require_once("ipsec.inc");
 require_once("interfaces.inc");
 require_once("rrd.inc");
 

src/www/system_advanced_misc.php

@@ -31,7 +31,7 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("ipsec.inc");
+require_once("services.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 

src/www/system_crlmanager.php

@@ -28,7 +28,7 @@
 */
 
 require_once('guiconfig.inc');
-require_once('openvpn.inc');
+require_once('services.inc');
 
 function openvpn_refresh_crls()
 {

src/www/system_gateway_groups.php

@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("openvpn.inc");
 require_once("system.inc");
 require_once("services.inc");
 require_once("rrd.inc");

src/www/system_gateway_groups_edit.php

@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 

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

@@ -32,7 +32,6 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("system.inc");
-require_once("ipsec.inc");
 require_once("interfaces.inc");
 
 $services = services_get();