fix BGP a bit. move CEF to routing.

git-svn-id: http://www.observium.org/svn/observer/trunk@2102 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-04-19 21:54:43 +00:00
parent a90ef76205
commit b40b218f43
9 changed files with 90 additions and 67 deletions
+9 -1
View File
@@ -44,6 +44,14 @@ function ifLabel ($interface, $device = NULL)
if (isset($config['os'][$os]['ifname']))
{
$interface['label'] = $interface['ifName'];
if($interface['ifName'] == "")
{
$interface['label'] = $interface['ifDescr'];
} else {
$interface['label'] = $interface['ifName'];
}
} elseif (isset($config['os'][$os]['ifalias']))
{
$interface['label'] = $interface['ifAlias'];
@@ -969,4 +977,4 @@ function rewrite_adslLineType($adslLineType)
return($adslLineType);
}
?>
?>