From 3181f3e0b8e87037e4623293eb6bc577bb5e97fd Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 15 Mar 2011 17:08:20 +0000
Subject: [PATCH] fix snmp (thanks to iksaif)

git-svn-id: http://www.observium.org/svn/observer/trunk@1861 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/snmp.inc.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php
index 73c656950b..756352bef5 100644
--- a/includes/snmp.inc.php
+++ b/includes/snmp.inc.php
@@ -30,15 +30,16 @@ function snmp_get_multi($device, $oids, $options = "-OQUs", $mib = NULL, $mibdir
     $oids = explode(" ",trim($oids));
     // s->ms - php snmp extension requires the timeout in microseconds.
     if (isset($timeout)) { $timeout = $timeout*1000*1000; }
+
     foreach ($oids as $oid)
     {
       if ($device['snmpver'] == "v2c")
       {
-	$data = @snmp2_get($device['transport'].":".$device['hostname'].":".$device['port'], $device['community'], $oid, $timeout, $retries);
+        $data = @snmp2_get($device['hostname'].":".$device['port'], $device['community'], $oid, $timeout, $retries);
       }
       elseif ($device['snmpver'] == "v1")
       {
-	$data = @snmpget($device['transport'].":".$device['hostname'].":".$device['port'], $device['community'], $oid, $timeout, $retries);
+        $data = @snmpget($device['hostname'].":".$device['port'], $device['community'], $oid, $timeout, $retries);
       }
 
       list($oid, $index) = explode(".", $oid);
@@ -112,11 +113,11 @@ function snmp_get($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
     if (isset($timeout)) { $timeout = $timeout*1000*1000; }
     if ($device['snmpver'] == "v2c")
     {
-       $data = @snmp2_get($device['transport'].":".$device['hostname'].":".$device['port'], $device['community'], $oid, $timeout, $retries);
+       $data = @snmp2_get($device['hostname'].":".$device['port'], $device['community'], $oid, $timeout, $retries);
     } elseif ( $device['snmpver'] == "v1") {
-       $data = @snmpget($device['transport'].":".$device['hostname'].":".$device['port'], $device['community'], $oid, $timeout, $retries);
+       $data = @snmpget($device['hostname'].":".$device['port'], $device['community'], $oid, $timeout, $retries);
     }
-    if ($debug)  { print "DEBUG: $oid: $data\n"; }
+    if ($debug)  { print "DEBUG: $oid: $data\nDEBUG: cmd: ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$device['community']." ".$oid." ".$timeout." ".$retries."\n"; }
   }
   else
   {