olsrd package fixes, add privileges configuration

- Fix service handling
- Add input validations
- Disable the dynamic gateways options since the required plugin is missing in the package
- Couple of other clenaups

1 files changed, 68 insertions, 43 deletions

diff --git a/config/olsrd/olsrd.xml b/config/olsrd/olsrd.xml
index 6623c31f..8023f818 100644
--- a/config/olsrd/olsrd.xml
+++ b/config/olsrd/olsrd.xml
@@ -9,7 +9,7 @@
 /*
 	olsrd.xml
 	part of pfSense (https://www.pfSense.org/)
-	Copyright (C) 2012 Ermal Luçi
+	Copyright (C) 2006 Scott Ullrich
 	Copyright (C) 2015 ESF, LLC
 	All rights reserved.
 */
@@ -42,38 +42,59 @@
 	]]>
 	</copyright>
 	<name>olsrd</name>
-	<version>1.0.3</version>
-	<title>OLSRD</title>
+	<version>1.0.4</version>
+	<title>Services: OLSRD Settings</title>
 	<include_file>/usr/local/pkg/olsrd.inc</include_file>
 	<menu>
 		<name>OLSRD</name>
 		<section>Services</section>
 		<configfile>olsrd.xml</configfile>
+		<url>/pkg_edit.php?xml=olsrd.xml</url>
 	</menu>
 	<service>
-		<name>OLSRD</name>
-		<rcfile>/usr/local/sbin/olsrd -f /var/etc/olsr.conf</rcfile>
+		<name>olsrd</name>
+		<rcfile>olsrd.sh</rcfile>
+		<executable>olsrd</executable>
+		<description>Optimized Link State Routing Protocol Daemon</description>
 	</service>
-	<tabs>
-		<tab>
-			<text>OLSRD Settings</text>
-			<url>/pkg_edit.php?xml=olsrd.xml&amp;id=0</url>
-			<active/>
-		</tab>
-	</tabs>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<item>https://packages.pfsense.org/packages/config/olsrd/olsrd.inc</item>
 	</additional_files_needed>
-	<configpath>['installedpackages']['OLSRD']['config']</configpath>
+	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/olsrd/olsrd.priv.inc</item>
+	</additional_files_needed>
 	<fields>
 		<field>
+			<name>Service Settings</name>
+			<type>listtopic</type>
+		</field>
+		<field>
 			<fielddescr>Enable OLSR</fielddescr>
 			<fieldname>enable</fieldname>
 			<description>Enables the dynamic mesh linking daemon.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
+			<fielddescr>Enable Secure Mode</fielddescr>
+			<fieldname>enabledsecure</fieldname>
+			<description>Enables the secure mode.</description>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>Key</fielddescr>
+			<fieldname>securekey</fieldname>
+			<description>Paste the secure key information here.</description>
+			<type>textarea</type>
+			<rows>5</rows>
+			<cols>50</cols>
+		</field>
+		<field>
+			<name>General Settings</name>
+			<type>listtopic</type>
+		</field>
+		<field>
 			<fielddescr>Link Quality Level</fielddescr>
 			<fieldname>enablelqe</fieldname>
 			<type>select</type>
@@ -83,6 +104,7 @@
 				<option><value>0</value><name>0</name></option>
 				<option><value>1</value><name>1</name></option>
 			</options>
+			<default_value>2</default_value>
 		</field>
 		<field>
 			<fielddescr>Interfaces</fielddescr>
@@ -98,6 +120,7 @@
 			<fieldname>enablehttpinfo</fieldname>
 			<description>Enables the OLSR stats web server.</description>
 			<type>checkbox</type>
+			<enablefields>port,allowedhttpinfohost,allowedhttpinfosubnet</enablefields>
 		</field>
 		<field>
 			<fielddescr>HTTPInfo Port</fielddescr>
@@ -106,65 +129,67 @@
 			<type>input</type>
 		</field>
 		<field>
-			<fielddescr>Allowed host(s)</fielddescr>
+			<fielddescr>Allowed Host(s) IP Address/Subnet</fielddescr>
 			<fieldname>allowedhttpinfohost</fieldname>
-			<description>Hosts that are allowed to access the HTTPInfo web service.</description>
+			<description>IP(s) that are allowed to access the HTTPInfo web service.</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fielddescr>Allowed host(s) subnet</fielddescr>
+			<fielddescr>Allowed Host(s) Netmask</fielddescr>
 			<fieldname>allowedhttpinfosubnet</fieldname>
-			<description>Enter the subnet mask in form 255.255.255.0</description>
+			<description>Enter the subnet mask in long form (e.g. 255.255.255.0)</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fielddescr>Enable Dynamic Gateway</fielddescr>
-			<fieldname>enabledyngw</fieldname>
-			<description>Enables the OLSR Dynamic Gateways feature.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>Announce self as Dynamic Gateway</fielddescr>
+			<fielddescr>Announce Self as Dynamic Gateway</fielddescr>
 			<fieldname>enableannounce</fieldname>
 			<description>Enables the OLSR Dynamic Gateways Announcing feature.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fielddescr>Announce Dynamic local route</fielddescr>
+			<fielddescr>Announce Dynamic Local Route</fielddescr>
 			<fieldname>announcedynamicroute</fieldname>
 			<description>Enter the IP/Netmask.</description>
 			<type>textarea</type>
 			<rows>3</rows>
 			<cols>50</cols>
 		</field>
+		<!-- Disabled since the required plugin is missing in the package -->
+		<!--
 		<field>
-			<fielddescr>Ping</fielddescr>
-			<fieldname>ping</fieldname>
-			<description>Pings this host to ensure connectivity.</description>
-			<type>input</type>
+			<name>Dynamic Gateway</name>
+			<type>listtopic</type>
 		</field>
 		<field>
-			<fielddescr>Poll</fielddescr>
-			<fieldname>polling</fieldname>
-			<description>How often to look for a inet gw, in seconds.</description>
-			<type>input</type>
+			<fielddescr>Enable Dynamic Gateway</fielddescr>
+			<fieldname>enabledyngw</fieldname>
+			<description>Enables the OLSR Dynamic Gateways feature.</description>
+			<type>checkbox</type>
+			<enablefields>ping,polling</enablefields>
 		</field>
 		<field>
-			<fielddescr>Enable Secure Mode</fielddescr>
-			<fieldname>enabledsecure</fieldname>
-			<description>Enables the secure mode.</description>
-			<type>checkbox</type>
+			<fielddescr>Ping IP Address</fielddescr>
+			<fieldname>ping</fieldname>
+			<description>Pings this IPv4 address to ensure connectivity.</description>
+			<type>input</type>
+			<default_value>5</default_value>
 		</field>
 		<field>
-			<fielddescr>Key</fielddescr>
-			<fieldname>securekey</fieldname>
-			<description>Paste the secure key information here.</description>
-			<type>textarea</type>
-			<rows>5</rows>
-			<cols>50</cols>
+			<fielddescr>Poll Interval</fielddescr>
+			<fieldname>polling</fieldname>
+			<description>How often to look for an inet GW (in seconds).</description>
+			<type>input</type>
+			<default_value>5</default_value>
 		</field>
+		-->
 	</fields>
+	<custom_php_deinstall_command>
+		php_deinstall_olsrd();
+	</custom_php_deinstall_command>
 	<custom_php_resync_config_command>
 		setup_wireless_olsr($if);
 	</custom_php_resync_config_command>
+	<custom_php_validation_command>
+		validate_form_olsrd($_POST, $input_errors);
+	</custom_php_validation_command>
 </packagegui>