Se agregan correciones para docqos1 de algunas funciones.

OSS_SNMP/MIBS/DocsIfCmts.php

@@ -179,7 +179,7 @@ class DocsIfCmts extends \OSS_SNMP\MIB {
 	if(!is_array($states)) return null;
 	foreach($states as $k => $v){
 		$oid_arr = explode(".", $k);
-		$states[$oid_arr[count($oid_arr) -1]] = $this->getSNMP()->parseSnmpValue($v);
+		$states[$oid_arr[count($oid_arr) -2] . "." . $oid_arr[count($oid_arr) -1]] = $this->getSNMP()->parseSnmpValue($v);
 		unset($states[$k]);
 	}
 	$rtr = array();
@@ -208,48 +208,44 @@ class DocsIfCmts extends \OSS_SNMP\MIB {
     public function docsQosCmtsIfIndex($mac=null){
 	    $rtr = array();
 	    if(!is_null($mac)){
-		$oid = self::OID_docsQosCmtsIfIndex .'.'.$this->getDecMac($mac);
+			$oid = self::OID_docsQosCmtsIfIndex .'.'.$this->getDecMac($mac);
 	    }else{
-		$oid = self::OID_docsQosCmtsIfIndex;
+			$oid = self::OID_docsQosCmtsIfIndex;
 	    }
 	    $ifIndex = $this->getSNMP()->realWalk($oid);
-            foreach((array)$ifIndex as $k => $v){
-		$k_prim = preg_split("|\.|",$k);
-		if(!isset($k_prim[14]) OR !isset($k_prim[15]) OR !isset($k_prim[16]) OR !isset($k_prim[17]) OR !isset($k_prim[18]) OR !isset($k_prim[19])){
-			continue;
+        foreach((array)$ifIndex as $k => $v){
+			$k_prim = preg_split("|\.|",$k);
+			if(!isset($k_prim[14]) OR !isset($k_prim[15]) OR !isset($k_prim[16]) OR !isset($k_prim[17]) OR !isset($k_prim[18]) OR !isset($k_prim[19])){
+				continue;
+			}
+			$k_mac = sprintf("%02x:%02x:%02x:%02x:%02x:%02x", $k_prim[14], $k_prim[15], $k_prim[16], $k_prim[17], $k_prim[18], $k_prim[19]);
+		
+			$rtr[$k_mac][] = $this->getSNMP()->parseSnmpValue($v).".". $k_prim[20];
 		}
-		$k_mac = sprintf("%02x:%02x:%02x:%02x:%02x:%02x",
-				 $k_prim[14], $k_prim[15], $k_prim[16], $k_prim[17], $k_prim[18], $k_prim[19]);
-		if(!$mac)
-			$rtr[$k_mac][] = $k_prim[20]; //$this->getSNMP()->parseSnmpValue($v);
-		else
-			$rtr[$k_mac][] =$this->getSNMP()->parseSnmpValue($v).".". $k_prim[20];
 
-	    }
 	    return $rtr;
     }
 
     public function docsQosServiceFlowOctets($ifId=null){
-	if(!is_null($ifId)){
-		$oid = self::OID_docsQosServiceFlowOctets ."." .$ifId;
+		if(!is_null($ifId)){
+			$oid = self::OID_docsQosServiceFlowOctets ."." .$ifId;
         }else{
-		$oid = self::OID_docsQosServiceFlowOctets;
+			$oid = self::OID_docsQosServiceFlowOctets;
         }	
-	$rtr = array();
-	$stats = $this->getSNMP()->realWalk($oid);
-	if(!is_array($stats)){
-		return null;
-	}
-	foreach($stats as $k => $v){
-		if($ifId){
-			$k_prim = explode(".",$k);
-			$rtr[ $k_prim[count($k_prim) - 2] . "." . $k_prim[count($k_prim) - 1]] = $this->getSNMP()->parseSnmpValue($v);
-
-		}else{
-			$k_prim = explode(".",$k);
-			$rtr[$k_prim[count($k_prim) - 1]] = $this->getSNMP()->parseSnmpValue($v);
+		$rtr = array();
+		$stats = $this->getSNMP()->realWalk($oid);
+		if(!is_array($stats)){
+			return null;
+		}
+		foreach($stats as $k => $v){
+			if($ifId){
+				$k_prim = explode(".",$k);
+				$rtr[ $k_prim[count($k_prim) - 2] . "." . $k_prim[count($k_prim) - 1]] = $this->getSNMP()->parseSnmpValue($v);
+			}else{
+				$k_prim = explode(".",$k);
+				$rtr[$k_prim[count($k_prim) - 1]] = $this->getSNMP()->parseSnmpValue($v);
+			}
 		}
-	}
 	return $rtr;
     }
 
@@ -394,11 +390,14 @@ accessDenied(7)   The CMTS has sent a Registration Aborted message   to the CM
             } else {
                 $oid = self::OID_docsQos3ServiceFlowTimeActive;
             }
-            foreach ($this->getSNMP()->realWalk($oid) as $k => $v) {
+			$stats = $this->getSNMP()->realWalk($oid);
+			
+			foreach ($stats as $k => $v) {
                 $k_prim = preg_split("|\.|", $k);
                 $rtr[$k_prim[15] . "." . $k_prim[16]] = $this->getSNMP()->parseSnmpValue($v);
             }
-            return $rtr;
+            
+			return $rtr;
         } catch (\Exception $e) {
             echo "ouch! " . $e->getMessage() . "\n";
             return array();
@@ -413,17 +412,21 @@ accessDenied(7)   The CMTS has sent a Registration Aborted message   to the CM
         }
         $rtr = array();
         $stats = $this->getSNMP()->realWalk($oid);
-        if (!is_array($stats)) {
-            return null;
+		
+		if (!is_array($stats)) {
+            return array();
         }
-        foreach ($stats as $k => $v) {
-            if ($ifId) {
-                $k_prim = explode(".", $k);
-                $rtr[$k_prim[count($k_prim) - 2] . "." . $k_prim[count($k_prim) - 1]] = $this->getSNMP()->parseSnmpValue($v);
-            } else {
-                $k_prim = explode(".", $k);
-                $rtr[$k_prim[count($k_prim) - 1]] = $this->getSNMP()->parseSnmpValue($v);
-            }
+        
+		foreach ($stats as $k => $v) {
+			$k_prim = explode(".", $k);
+			$rtr[$k_prim[count($k_prim) - 2] . "." . $k_prim[count($k_prim) - 1]] = $this->getSNMP()->parseSnmpValue($v);
+            // if ($ifId) {
+            //     $k_prim = explode(".", $k);
+            //     $rtr[$k_prim[count($k_prim) - 2] . "." . $k_prim[count($k_prim) - 1]] = $this->getSNMP()->parseSnmpValue($v);
+            // } else {
+            //     $k_prim = explode(".", $k);
+            //     $rtr[$k_prim[count($k_prim) - 1]] = $this->getSNMP()->parseSnmpValue($v);
+            // }
         }
         return $rtr;
     }