From 11bc553c235f1a66f2391cad9f293aaf69b914d6 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Wed, 26 Apr 2006 20:36:05 +0000
Subject: OLSR fixes

---
 etc/inc/services.inc            |  2 +-
 usr/local/pkg/olsrd.xml         | 31 ++++++++++++++++++++++++++++---
 usr/local/www/services_dhcp.php | 11 ++++++++++-
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 84e7e6a..648ffff 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -1008,7 +1008,7 @@ UseHysteresis	no
 # 2 = use link quality for MPR selection and routing
 # Defaults to 0
 
-LinkQualityLevel	2
+LinkQualityLevel	{$olsrd['enablelqe']}
 
 # Link quality window size
 # Defaults to 10
diff --git a/usr/local/pkg/olsrd.xml b/usr/local/pkg/olsrd.xml
index 7f4b212..9895446 100644
--- a/usr/local/pkg/olsrd.xml
+++ b/usr/local/pkg/olsrd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <packagegui>
-	<name>olsrd</name>
+	<name>OLSRD</name>
 	<version>1.0</version>
 	<title>OLSRD</title>
 	<!-- Menu is where this packages menu will appear -->
@@ -17,13 +17,17 @@
 		<tab>
 			<text>OLSRD Settings</text>
 			<url>/pkg_edit.php?xml=olsrd.xml&amp;id=0</url>
-			<active/>
+			<active/>			
 		</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>
-	<aftersaveredirect>pkg_edit.php?xml=olsrd.xml&amp;id=0</aftersaveredirect>
 	<!-- 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>
@@ -40,6 +44,7 @@
 			<multiple>true</multiple>
 			<size>3</size>
 			<type>interfaces_selection</type>
+			<description>Select the interfaces that OLSR will bind to.  You can use the CTRL or COMMAND key to select multiple interfaces.</description>
 		</field>
 		<field>
 			<fielddescr>Enable HTTPInfo Plugin</fielddescr>
@@ -97,6 +102,26 @@
 			<rows>5</rows>
 			<cols>50</cols>
 		</field>
+		<field>
+			<fielddescr>Link Quality Level</fielddescr>
+			<fieldname>enablelqe</fieldname>
+			<description>Enables Link Quality Extensions.  Setting to 1 or 2 breaks RFC3626 compability!</description>
+			<type>select</type>
+			<options>
+				<option>
+					<value>0</value>
+					<name>Run in RFC3626 mode</name>
+				</option>
+				<option>
+					<value>1</value>
+					<name>Link quality is used when calculating MPRs</name>
+				</option>
+				<option>
+					<value>2</value>
+					<name>Routes will also be calculated based on distributed link quality information</name>
+				</option>
+			</options>
+		</field>		
 	</fields>
 	<custom_delete_php_command>
 	</custom_delete_php_command>
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index 06065f3..652ccd3 100755
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -35,7 +35,16 @@ $if = $_GET['if'];
 if ($_POST['if'])
 	$if = $_POST['if'];
 	
-$iflist = array("lan" => "LAN");
+/* if OLSRD is enabled, allow WAN to house DHCP. */
+foreach($config['installedpackages']['olsrd']['config'] as $olsrd) {
+		if($olsr['enable']) {
+			$iflist = array("lan" => "LAN", "wan" => "WAN");
+			break;
+		}
+}
+
+if(!$iflist)
+	$iflist = array("lan" => "LAN");
 
 for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) {
 	$oc = $config['interfaces']['opt' . $i];
-- 
cgit v1.1