routed - code style fixes

- Fix copyright header and indentation
- Nuke useless comments and empty tags
- Install routed service

1 files changed, 48 insertions, 44 deletions

diff --git a/config/routed/routed.xml b/config/routed/routed.xml
index 8764b172..b38d7ee3 100644
--- a/config/routed/routed.xml
+++ b/config/routed/routed.xml
@@ -1,51 +1,65 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
 	<copyright>
-	/* $Id$ */
-	/*
-		part of pfSense (https://www.pfsense.org/)
+<![CDATA[
+/* $Id$ */
+/* ====================================================================================== */
+/*
+	routed.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2006 Bill Marquette <bill.marquette@gmail.com>
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+*/
+/* ====================================================================================== */
+/*
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
 
-		Copyright (C) 2006 Bill Marquette - bill.marquette@gmail.com.
-		All rights reserved.
 
-		Redistribution and use in source and binary forms, with or without
-		modification, are permitted provided that the following conditions are met:
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
 
-		1. Redistributions of source code must retain the above copyright notice,
-		   this list of conditions and the following disclaimer.
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
 
-		2. Redistributions in binary form must reproduce the above copyright
-		   notice, this list of conditions and the following disclaimer in the
-		   documentation and/or other materials provided with the distribution.
 
-		THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-		INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-		AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-		AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-		OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-		SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-		INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-		CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-		ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-		POSSIBILITY OF SUCH DAMAGE.
-	*/
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+/* ====================================================================================== */
+	]]>
 	</copyright>
 	<name>routed</name>
-	<version>1.1</version>
+	<version>1.2</version>
 	<title>Services: RIP</title>
 	<include_file>/usr/local/pkg/routed.inc</include_file>
-
 	<additional_files_needed>
 		<item>https://packages.pfsense.org/packages/config/routed/routed.inc</item>
 	</additional_files_needed>
-
-	<!-- Menu is where this packages menu will appear -->
 	<menu>
 		<name>RIP</name>
 		<section>Services</section>
 		<configfile>routed.xml</configfile>
 		<url>pkg_edit.php?xml=routed.xml&amp;id=0</url>
 	</menu>
+	<service>
+		<name>routed</name>
+		<rcfile>routed.sh</rcfile>
+		<executable>routed</executable>
+		<description>Routing Information Protocol Daemon</description>
+	</service>
 	<tabs>
 		<tab>
 			<text>ROUTED Settings</text>
@@ -53,16 +67,12 @@
 			<active/>
 		</tab>
 	</tabs>
-	<!-- configpath gets expanded out automatically and config items will be
-		stored in that location -->
 	<configpath>['installedpackages']['routed']['config']</configpath>
-	<!-- fields gets invoked when the user adds or edits a item.   the following items
-		will be parsed and rendered for the user as a gui with input, and selectboxes. -->
 	<fields>
 		<field>
 			<fielddescr>Enable RIP</fielddescr>
 			<fieldname>enable</fieldname>
-			<description>Enables the Routing Information Protocol daemon</description>
+			<description>Enables the Routing Information Protocol daemon.</description>
 			<type>checkbox</type>
 			<enablefields>iface_array[],ripversion,passwd,enable_no_ag,enable_no_super_ag</enablefields>
 		</field>
@@ -73,7 +83,7 @@
 			<multiple>true</multiple>
 			<size>3</size>
 			<type>interfaces_selection</type>
-			<description>Select the interfaces that RIP will bind to.  You can use the CTRL or COMMAND key to select multiple interfaces.</description>
+			<description>Select the interfaces that RIP will bind to. You can use the CTRL or COMMAND key to select multiple interfaces.</description>
 			<required />
 		</field>
 		<field>
@@ -91,36 +101,30 @@
 		<field>
 			<fielddescr>RIPv2 password</fielddescr>
 			<fieldname>passwd</fieldname>
-			<description>Specify a RIPv2 password.  This password will be sent 
-				in the clear on all RIPv2 responses received and sent.
-			</description>
+			<description>Specify a RIPv2 password. This password will be sent in the clear on all RIPv2 responses received and sent.</description>
 			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>no_ag</fielddescr>
 			<fieldname>enable_no_ag</fieldname>
-			<description>turns off aggregation of subnets in RIPv1 and RIPv2 responses.</description>
+			<description>Turns off aggregation of subnets in RIPv1 and RIPv2 responses.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
 			<fielddescr>no_super_ag</fielddescr>
 			<fieldname>enable_no_super_ag</fieldname>
-			<description>turns off aggregation of networks into supernets in RIPv2 responses.</description>
+			<description>Turns off aggregation of networks into supernets in RIPv2 responses.</description>
 			<type>checkbox</type>
 		</field>
 	</fields>
 	<aftersaveredirect>pkg_edit.php?xml=routed.xml&amp;id=0</aftersaveredirect>
-	<custom_php_command_before_form>
-	</custom_php_command_before_form>
-	<custom_delete_php_command>
-	</custom_delete_php_command>
 	<custom_php_resync_config_command>
-		conf_mount_rw();
 		setup_routed();
-		conf_mount_ro();
 	</custom_php_resync_config_command>
 	<custom_php_install_command>
+		routed_install_command();
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
+		routed_deinstall_command();
 	</custom_php_deinstall_command>
 </packagegui>