diff --git a/html/pages/device/dev-bgp.inc b/html/pages/device/dev-bgp.inc index e981e43a48..b6572be87f 100644 --- a/html/pages/device/dev-bgp.inc +++ b/html/pages/device/dev-bgp.inc @@ -21,7 +21,7 @@ if($peerhost) { $peername = generatedevicelink($peerhost); } else { unset($peername); } echo(" -

$i

+ $i " . $peer['bgpPeerIdentifier'] . "
".$peername." $peer_type AS" . $peer['bgpPeerRemoteAs'] . "
" . $peer['astext'] . " diff --git a/includes/functions.php b/includes/functions.php index 9776169035..510546c69a 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -533,6 +533,7 @@ function fixifName ($inf) { $inf = str_replace("vlan", "Vlan", $inf); $inf = str_replace("ether", "Ether", $inf); $inf = str_replace("-802.1q Vlan subif", "", $inf); + $inf = str_replace("tunnel", "Tunnel", $inf); $inf = str_replace("serial", "Serial", $inf); $inf = str_replace("-aal5 layer", " aal5", $inf); $inf = str_replace("null", "Null", $inf); diff --git a/includes/syslog.php b/includes/syslog.php index c7a6ce6fa7..74d976ba17 100755 --- a/includes/syslog.php +++ b/includes/syslog.php @@ -4,7 +4,6 @@ function process_syslog ($entry, $update) { global $config; - foreach($config['syslog_filter'] as $bi) { if (strstr($entry['msg'], $bi)) { $delete = 1; diff --git a/update-interface.php b/update-interface.php index ea046e6a0d..f60f773cf5 100755 --- a/update-interface.php +++ b/update-interface.php @@ -6,7 +6,7 @@ include("includes/functions.php"); if($argv[1]) { $where = "WHERE `interface_id` = '$argv[1]'"; } -$interface_query = mysql_query("SELECT * FROM `interfaces` $where"); +$interface_query = mysql_query("SELECT * FROM `interfaces` $where ORDER BY interface_id DESC"); while ($interface = mysql_fetch_array($interface_query)) { unset($this); @@ -63,7 +63,6 @@ while ($interface = mysql_fetch_array($interface_query)) { if($this['ifTrunk']) { echo("Interface is a " . $this['ifTrunk'] . " trunk\n"); } if($this['ifVlan']) { echo("Interface is a member of vlan " . $this['ifVlan'] . " \n"); } - } list($ifName, $ifDescr, $ifAdminStatus, $ifOperStatus, $ifAlias, $ifSpeed, $ifDuplex, $ifType, $ifMtu, $ifPhysAddress) = explode("\n", $snmp_output); @@ -74,6 +73,9 @@ while ($interface = mysql_fetch_array($interface_query)) { $ifAlias = trim(str_replace("\"", "", $ifAlias)); $ifAlias = trim($ifAlias); + echo("\n$ifName\n"); + $ifDescr = fixifname($ifDescr); + $ifPhysAddress = strtolower(str_replace("\"", "", $ifPhysAddress)); $ifPhysAddress = str_replace(" ", ":", $ifPhysAddress);