diff options
| author | Bill Marquette <billm@pfsense.org> | 2006-09-01 00:17:49 +0000 |
|---|---|---|
| committer | Bill Marquette <billm@pfsense.org> | 2006-09-01 00:17:49 +0000 |
| commit | 54536192772692b59bfa2444fab02121bfb2b780 (patch) | |
| tree | e7484e09d45223f087fed6f79ae774ff22783b38 | |
| parent | c9edfb4a766940b852f5b3c4e9cec1c67b0af061 (diff) | |
| download | pfsense-packages-54536192772692b59bfa2444fab02121bfb2b780.tar.gz pfsense-packages-54536192772692b59bfa2444fab02121bfb2b780.tar.bz2 pfsense-packages-54536192772692b59bfa2444fab02121bfb2b780.zip | |
interface_array is an array type in xmlparse.inc, we need to use iface_array
and build our own array from the results
| -rw-r--r-- | packages/routed.inc | 6 | ||||
| -rw-r--r-- | packages/routed.xml | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/packages/routed.inc b/packages/routed.inc index 92cd5701..b3f4e8cd 100644 --- a/packages/routed.inc +++ b/packages/routed.inc @@ -35,8 +35,8 @@ function setup_routed() { 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']; + $ifarr = explode(",", $config['installedpackages']['routed']['config'][0]['iface_array']); + if(count($ifarr) != 0) { foreach($ifarr as $iface) { $gw .= setup_etc_gateways($iface); } @@ -57,7 +57,7 @@ function setup_etc_gateways($iface="") { global $config; if (isset($iface)) { - $realif= convert_friendly_interface_to_real_interface_name($iface); + $realif=convert_friendly_interface_to_real_interface_name(strtoupper($iface)); $ret = "if={$realif} "; } if ($config['installedpackages']['routed']['config'][0]['ripversion'] == "2") { diff --git a/packages/routed.xml b/packages/routed.xml index 31f0e59b..db738818 100644 --- a/packages/routed.xml +++ b/packages/routed.xml @@ -64,11 +64,11 @@ <fieldname>enable</fieldname> <description>Enables the Routing Information Protocol daemon</description> <type>checkbox</type> - <enablefields>interface_array,ripversion,passwd</enablefields> + <enablefields>iface_array,ripversion,passwd</enablefields> </field> <field> <fielddescr>Interfaces</fielddescr> - <fieldname>interface_array</fieldname> + <fieldname>iface_array</fieldname> <value>lan</value> <multiple>true</multiple> <size>3</size> @@ -109,6 +109,8 @@ </custom_php_resync_config_command> <custom_php_install_command> </custom_php_install_command> + sync_package_routed('install'); <custom_php_deinstall_command> + sync_package_routed('deinstall'); </custom_php_deinstall_command> </packagegui> |