aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Stefan Haischt <dsh@pfsense.org>2006-08-31 22:18:15 +0000
committerDaniel Stefan Haischt <dsh@pfsense.org>2006-08-31 22:18:15 +0000
commitc9edfb4a766940b852f5b3c4e9cec1c67b0af061 (patch)
treebd89670ed7e9fcd97d1c746f80b15acb4e6c7841
parent702ded07e0aa9e2b81f9f1b4038be933fec870bf (diff)
downloadpfsense-packages-c9edfb4a766940b852f5b3c4e9cec1c67b0af061.tar.gz
pfsense-packages-c9edfb4a766940b852f5b3c4e9cec1c67b0af061.tar.bz2
pfsense-packages-c9edfb4a766940b852f5b3c4e9cec1c67b0af061.zip
- changed iface_array to interface_array
- added required to interface_array and ripversion - added enablefields to field enable
-rw-r--r--packages/routed.inc5
-rw-r--r--packages/routed.xml5
2 files changed, 7 insertions, 3 deletions
diff --git a/packages/routed.inc b/packages/routed.inc
index 2ccadf4c..92cd5701 100644
--- a/packages/routed.inc
+++ b/packages/routed.inc
@@ -32,7 +32,8 @@ function setup_routed() {
global $config;
$gw = "";
- if ($config['installedpackages']['routed']['config'][0]['enable'] == "on") {
+ if (isset($config['installedpackages']['routed']['config'][0]['enable']) &&
+ $config['installedpackages']['routed']['config'][0]['enable'] == "on") {
/* if user selected individual interfaces */
if (is_array($config['installedpackages']['routed']['config'][0]['interface_array'])) {
$ifarr = $config['installedpackages']['routed']['config'][0]['interface_array'];
@@ -55,7 +56,7 @@ function setup_routed() {
function setup_etc_gateways($iface="") {
global $config;
- if ($iface != "") {
+ if (isset($iface)) {
$realif= convert_friendly_interface_to_real_interface_name($iface);
$ret = "if={$realif} ";
}
diff --git a/packages/routed.xml b/packages/routed.xml
index 9c216bff..31f0e59b 100644
--- a/packages/routed.xml
+++ b/packages/routed.xml
@@ -64,15 +64,17 @@
<fieldname>enable</fieldname>
<description>Enables the Routing Information Protocol daemon</description>
<type>checkbox</type>
+ <enablefields>interface_array,ripversion,passwd</enablefields>
</field>
<field>
<fielddescr>Interfaces</fielddescr>
- <fieldname>iface_array</fieldname>
+ <fieldname>interface_array</fieldname>
<value>lan</value>
<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>
+ <required />
</field>
<field>
<fielddescr>RIP Version</fielddescr>
@@ -84,6 +86,7 @@
<option><name>RIP Version 2</name><value>2</value></option>
</options>
<typehint>Select which RIP version the daemon will listen/advertise using.</typehint>
+ <required />
</field>
<field>
<fielddescr>RIPv2 password</fielddescr>