Add OLSRD package

2 files changed, 137 insertions, 11 deletions

diff --git a/packages/olsrd.xml b/packages/olsrd.xml
new file mode 100644
index 00000000..6840b46c
--- /dev/null
+++ b/packages/olsrd.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<packagegui>
+	<name>OLSRD</name>
+	<version>1.0</version>
+	<title>OLSRD</title>
+	<backup_file>/var/db/OLSRD</backup_file>
+	<!-- Menu is where this packages menu will appear -->
+	<menu>
+		<name>OLSRD</name>
+		<section>Services</section>
+		<configfile>olsrd.xml</configfile>
+	</menu>
+	<service>
+                <name>OLSRD</name>
+                <rcfile></rcfile>
+    </service>
+	<tabs>
+		<tab>
+			<text>OLSRD Settings</text>
+			<url>/pkg_edit.php?xml=olsrd.xml&amp;id=0</url>
+		</tab>
+	</tabs>
+    	<additional_files_needed>
+	    <prefix>/usr/local/www/</prefix>
+	    <chmod>0755</chmod>
+	    <item>http://www.pfsense.com/packages/config/OLSRD_rules.php</item>
+	</additional_files_needed>
+	<!-- configpath gets expanded out automatically and config items will be
+         stored in that location -->
+	<configpath>['installedpackages']['OLSRD']['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 OLSR</fielddescr>
+			<fieldname>enable</fieldname>
+			<description>Enables the dynamic mesh linking daemon</description>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>Interfaces</fielddescr>
+			<fieldname>interface_array</fieldname>
+			<value>lan</value>
+			<multiple>true</multiple>
+			<size>3</size>
+			<type>interfaces_selection</type>
+		</field>
+		<field>
+			<fielddescr>Enable HTTPInfo Plugin</fielddescr>
+			<fieldname>enablehttpinfo</fieldname>
+			<description>Enables the OLSR stats web server</description>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>HTTPInfo Port</fielddescr>
+			<fieldname>port</fieldname>
+			<description>Port that HTTPInfo will listen on</description>
+			<type>input</type>
+		</field>			
+		<field>
+			<fielddescr>Allowed host(s)</fielddescr>
+			<fieldname>allowedhttpinfohost</fieldname>
+			<description>Enables the OLSR stats web server</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Allowed host(s) subnet</fielddescr>
+			<fieldname>allowedhttpinfosubnet</fieldname>
+			<description>Enter the subnet mask in form 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>Ping</fielddescr>
+			<fieldname>ping</fieldname>
+			<description>Pings this host to ensure connectivity</description>
+			<type>input</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>key</fieldname>
+			<description>Paste the secure key information here.</description>
+			<type>textarea</type>
+			<rows>5</rows>
+			<cols>50</cols>
+		</field>
+	</fields>
+	<custom_delete_php_command>
+	</custom_delete_php_command>
+	<custom_php_resync_config_command>
+		$fd = fopen("/usr/local/etc/olsrkey.txt","w");
+		fwrite($fd, $_POST['key']);
+		fclose($fd);
+		foreach($_POST['interface_array'] as $iface) {
+				$if = convert_friendly_interface_to_real_interface_name($iface);
+				if($if) {
+						setup_wireless_olsr($if);
+				}
+		}
+	</custom_php_resync_config_command>
+	<custom_php_install_command>
+	</custom_php_install_command>
+	<custom_php_deinstall_command>
+	</custom_php_deinstall_command>
+</packagegui>
\ No newline at end of file
diff --git a/pkg_config.xml b/pkg_config.xml
index adc6ef17..2598b840 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -3,17 +3,27 @@
 <pfsensepkgs>
   <packages>
     <package>
-	<name>ntop</name>
-	<website>http://www.ntop.org/</website>
-	<descr>ntop is a network probe that shows network usage in a way similar to what top does for processes. In interactive mode, it displays the network status on the user's terminal. In Web mode it acts as a Web server, creating an HTML dump of the network status. It sports a NetFlow/sFlow emitter/collector, an HTTP-based client interface for creating ntop-centric monitoring applications, and RRD for persistently storing traffic statistics.</descr>
-	<category>Network Management</category>
-	<depends_on_package_base_url>http://www.pfsense.org/packages/All/</depends_on_package_base_url>
-	<depends_on_package>ntop-3.2_1.tbz</depends_on_package>
-	<version>3.2_1</version>
-	<status>BETA</status>
-	<config_file>http://www.pfsense.com/packages/config/ntop.xml</config_file>
-	<configurationfile>ntop.xml</configurationfile>
-    </package>    
+      <name>OLSR</name>
+      <website>http://www.olsr.org/</website>
+      <descr>The olsr.org OLSR daemon is an implementation of the Optimized Link State Routing protocol. OLSR is a routing protocol for mobile ad-hoc networks. The protocol is pro-active, table driven and utilizes a technique called multipoint relaying for message flooding. olsrd also implements a popular optional link quality extension.</descr>
+      <category>Network Management</category>
+      <version>0.4.10</version>
+      <status>ALPHA</status>
+      <config_file>http://www.pfsense.com/packages/config/olsrd.xml</config_file>
+      <configurationfile>olsrd.xml</configurationfile>
+    </package>
+    <package>
+      <name>ntop</name>
+      <website>http://www.ntop.org/</website>
+      <descr>ntop is a network probe that shows network usage in a way similar to what top does for processes. In interactive mode, it displays the network status on the user's terminal. In Web mode it acts as a Web server, creating an HTML dump of the network status. It sports a NetFlow/sFlow emitter/collector, an HTTP-based client interface for creating ntop-centric monitoring applications, and RRD for persistently storing traffic statistics.</descr>
+      <category>Network Management</category>
+      <depends_on_package_base_url>http://www.pfsense.org/packages/All/</depends_on_package_base_url>
+      <depends_on_package>ntop-3.2_1.tbz</depends_on_package>
+      <version>3.2_1</version>
+      <status>BETA</status>
+      <config_file>http://www.pfsense.com/packages/config/ntop.xml</config_file>
+      <configurationfile>ntop.xml</configurationfile>
+    </package> 
     <package>
 	  <name>pfflowd</name>
 	  <website>http://www.mindrot.org/pfflowd.html</website>