Project

General

Profile

« Previous | Next » 

Revision 11bc553c

Added by Scott Ullrich about 19 years ago

OLSR fixes

View differences:

etc/inc/services.inc
1008 1008 
# 2 = use link quality for MPR selection and routing
1009 1009 
# Defaults to 0
1010 1010 

  		




  1011
  
  
    
LinkQualityLevel	2


  		




  
  1011
  
    
LinkQualityLevel	{$olsrd['enablelqe']}


  		




  1012
  1012
  
    

  		




  1013
  1013
  
    
# Link quality window size


  		




  1014
  1014
  
    
# Defaults to 10


  		












  

    
      usr/local/pkg/olsrd.xml
    
  





  1
  1
  
    
<?xml version="1.0" encoding="utf-8" ?>


  		




  2
  2
  
    
<packagegui>


  		




  3
  
  
    
	<name>olsrd</name>


  		




  
  3
  
    
	<name>OLSRD</name>


  		




  4
  4
  
    
	<version>1.0</version>


  		




  5
  5
  
    
	<title>OLSRD</title>


  		




  6
  6
  
    
	<!-- Menu is where this packages menu will appear -->


  		




  ......




  17
  17
  
    
		<tab>


  		




  18
  18
  
    
			<text>OLSRD Settings</text>


  		




  19
  19
  
    
			<url>/pkg_edit.php?xml=olsrd.xml&amp;id=0</url>


  		




  20
  
  
    
			<active/>


  		




  
  20
  
    
			<active/>			


  		




  21
  21
  
    
		</tab>


  		




  22
  22
  
    
	</tabs>


  		




  
  23
  
    
    	<additional_files_needed>


  		




  
  24
  
    
	    <prefix>/usr/local/www/</prefix>


  		




  
  25
  
    
	    <chmod>0755</chmod>


  		




  
  26
  
    
	    <item>http://www.pfsense.com/packages/config/OLSRD_rules.php</item>


  		




  
  27
  
    
	</additional_files_needed>


  		




  23
  28
  
    
	<!-- configpath gets expanded out automatically and config items will be


  		




  24
  29
  
    
         stored in that location -->


  		




  25
  30
  
    
	<configpath>['installedpackages']['OLSRD']['config']</configpath>


  		




  26
  
  
    
	<aftersaveredirect>pkg_edit.php?xml=olsrd.xml&amp;id=0</aftersaveredirect>


  		




  27
  31
  
    
	<!-- fields gets invoked when the user adds or edits a item.   the following items


  		




  28
  32
  
    
         will be parsed and rendered for the user as a gui with input, and selectboxes. -->


  		




  29
  33
  
    
	<fields>


  		




  ......




  40
  44
  
    
			<multiple>true</multiple>


  		




  41
  45
  
    
			<size>3</size>


  		




  42
  46
  
    
			<type>interfaces_selection</type>


  		




  
  47
  
    
			<description>Select the interfaces that OLSR will bind to.  You can use the CTRL or COMMAND key to select multiple interfaces.</description>


  		




  43
  48
  
    
		</field>


  		




  44
  49
  
    
		<field>


  		




  45
  50
  
    
			<fielddescr>Enable HTTPInfo Plugin</fielddescr>


  		




  ......




  97
  102
  
    
			<rows>5</rows>


  		




  98
  103
  
    
			<cols>50</cols>


  		




  99
  104
  
    
		</field>


  		




  
  105
  
    
		<field>


  		




  
  106
  
    
			<fielddescr>Link Quality Level</fielddescr>


  		




  
  107
  
    
			<fieldname>enablelqe</fieldname>


  		




  
  108
  
    
			<description>Enables Link Quality Extensions.  Setting to 1 or 2 breaks RFC3626 compability!</description>


  		




  
  109
  
    
			<type>select</type>


  		




  
  110
  
    
			<options>


  		




  
  111
  
    
				<option>


  		




  
  112
  
    
					<value>0</value>


  		




  
  113
  
    
					<name>Run in RFC3626 mode</name>


  		




  
  114
  
    
				</option>


  		




  
  115
  
    
				<option>


  		




  
  116
  
    
					<value>1</value>


  		




  
  117
  
    
					<name>Link quality is used when calculating MPRs</name>


  		




  
  118
  
    
				</option>


  		




  
  119
  
    
				<option>


  		




  
  120
  
    
					<value>2</value>


  		




  
  121
  
    
					<name>Routes will also be calculated based on distributed link quality information</name>


  		




  
  122
  
    
				</option>


  		




  
  123
  
    
			</options>


  		




  
  124
  
    
		</field>		


  		




  100
  125
  
    
	</fields>


  		




  101
  126
  
    
	<custom_delete_php_command>


  		




  102
  127
  
    
	</custom_delete_php_command>


  		












  

    
      usr/local/www/services_dhcp.php
    
  





  35
  35
  
    
if ($_POST['if'])


  		




  36
  36
  
    
	$if = $_POST['if'];


  		




  37
  37
  
    
	


  		




  38
  
  
    
$iflist = array("lan" => "LAN");


  		




  
  38
  
    
/* if OLSRD is enabled, allow WAN to house DHCP. */


  		




  
  39
  
    
foreach($config['installedpackages']['olsrd']['config'] as $olsrd) {


  		




  
  40
  
    
		if($olsr['enable']) {


  		




  
  41
  
    
			$iflist = array("lan" => "LAN", "wan" => "WAN");


  		




  
  42
  
    
			break;


  		




  
  43
  
    
		}


  		




  
  44
  
    
}


  		




  
  45
  
    

  		




  
  46
  
    
if(!$iflist)


  		




  
  47
  
    
	$iflist = array("lan" => "LAN");


  		




  39
  48
  
    

  		




  40
  49
  
    
for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) {


  		




  41
  50
  
    
	$oc = $config['interfaces']['opt' . $i];


  		












Also available in:  Unified diff