aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2010-03-04 22:36:23 +0000
committerErmal Luçi <eri@pfsense.org>2010-03-04 22:36:23 +0000
commitb80ebd2d768d5c3f8139af0eb7fce6b55d7ad059 (patch)
tree49349aa9ae90f943e7d2613ab7cf04fa1cc4b019
parent3bf52e0a4100cb31955babe79766c4a0e65bef69 (diff)
downloadpfsense-packages-b80ebd2d768d5c3f8139af0eb7fce6b55d7ad059.tar.gz
pfsense-packages-b80ebd2d768d5c3f8139af0eb7fce6b55d7ad059.tar.bz2
pfsense-packages-b80ebd2d768d5c3f8139af0eb7fce6b55d7ad059.zip
Use the propper function to find the real interface in 2.0+.
-rw-r--r--config/openospfd/openospfd.inc9
1 files changed, 8 insertions, 1 deletions
diff --git a/config/openospfd/openospfd.inc b/config/openospfd/openospfd.inc
index d38ec82f..5b600506 100644
--- a/config/openospfd/openospfd.inc
+++ b/config/openospfd/openospfd.inc
@@ -84,7 +84,14 @@ function ospfd_install_conf() {
if ($config['installedpackages']['ospfdinterfaces']['config']) {
foreach ($config['installedpackages']['ospfdinterfaces']['config'] as $conf) {
- $conffile .= "\tinterface " . $config['interfaces'][$conf['interface']]['if'];
+ if (intval($g['latest_config']) >= 6) {
+ $ospfdif = get_real_interface($conf['interface']);
+ if ($ospfdif)
+ $conffile .= "\tinterface {$ospfdif}";
+ else
+ continue;
+ } else
+ $conffile .= "\tinterface " . $config['interfaces'][$conf['interface']]['if'];
$options_present = false;
$ifconfigs = "";
if (!empty($conf['metric'])) {