From ab27abe5f87519df66f15873ca4670d4b3420b40 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sun, 18 Jul 2010 09:34:05 +0000
Subject: [PATCH] fix junos? make adsl work on ports which don't say adsl
 (might say interleaved...)

git-svn-id: http://www.observium.org/svn/observer/trunk@1408 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/polling/bgpPeer.inc.php   | 2 +-
 includes/polling/port-adsl.inc.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/polling/bgpPeer.inc.php b/includes/polling/bgpPeer.inc.php
index a082fcd7b..d027f2a9a 100755
--- a/includes/polling/bgpPeer.inc.php
+++ b/includes/polling/bgpPeer.inc.php
@@ -43,7 +43,7 @@ if ($device['os'] == "junos")
     }
   }
   ## FIX ME - move to fucntion (and clean up, wtf?)
-  $peer_cmd  = $config['snmpget'] . " -M ".$config['mibdir'] . " -m BGP4-V2-MIB-JUNIPER -Ovq -" . $device['snmpver'] . " -c" . $device['community'] . " " . $device['hostname'].":".$device['port'];
+  $peer_cmd  = $config['snmpget'] . " -M ".$config['mibdir'] . ":".$config['mibdir'] . "/junos -m BGP4-V2-MIB-JUNIPER -Ovq -" . $device['snmpver'] . " -c" . $device['community'] . " " . $device['hostname'].":".$device['port'];
   $peer_cmd .= " jnxBgpM2PeerState.0.ipv6." . $junos_v6[$peer_ip];
   $peer_cmd .= " jnxBgpM2PeerStatus.0.ipv6." . $junos_v6[$peer_ip]; # Should be jnxBgpM2CfgPeerAdminStatus but doesn't seem to be implemented?
   $peer_cmd .= " jnxBgpM2PeerInUpdates.0.ipv6." . $junos_v6[$peer_ip];
diff --git a/includes/polling/port-adsl.inc.php b/includes/polling/port-adsl.inc.php
index 367e8c08f..27be0297f 100755
--- a/includes/polling/port-adsl.inc.php
+++ b/includes/polling/port-adsl.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-    if($array[$device[device_id]][$port[ifIndex]] && $port['ifType'] == "adsl" && $array[$device[device_id]][$port[ifIndex]]['adslLineCoding']) { // Check to make sure Port data is cached.
+    if($array[$device[device_id]][$port[ifIndex]]['adslLineCoding']) { // Check to make sure Port data is cached.
 
       $this_port = &$array[$device[device_id]][$port[ifIndex]];