lytboris                                 Sat, 27 Aug 2011 08:29:19 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=315609

Log:
merge from trunk:
export ERRNO_OID_PARSING_ERROR constant:
raise it evry time OID parsing has failed

Changed paths:
    _U  php/php-src/branches/PHP_5_4/ext/snmp/tests/
    U   
php/php-src/branches/PHP_5_4/ext/snmp/tests/snmp-object-errno-errstr.phpt


Property changes on: php/php-src/branches/PHP_5_4/ext/snmp/tests
___________________________________________________________________
Modified: svn:mergeinfo
   - /php/php-src/trunk/ext/snmp/tests:284726,311033-315236,315386,315606
   + /php/php-src/trunk/ext/snmp/tests:284726,311033-315236,315386,315606,315608

Modified: 
php/php-src/branches/PHP_5_4/ext/snmp/tests/snmp-object-errno-errstr.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/snmp/tests/snmp-object-errno-errstr.phpt   
2011-08-27 08:16:32 UTC (rev 315608)
+++ php/php-src/branches/PHP_5_4/ext/snmp/tests/snmp-object-errno-errstr.phpt   
2011-08-27 08:29:19 UTC (rev 315609)
@@ -30,12 +30,14 @@
 var_dump($session->getErrno() == SNMP::ERRNO_TIMEOUT);
 var_dump($session->getError());
 $session->close();
+
 echo "SNMP::ERRNO_ERROR_IN_REPLY\n";
 $session = new SNMP(SNMP::VERSION_2c, $hostname, $community, $timeout, 
$retries);
 var_dump(@$session->get('.1.3.6.1.2.1.1.1.110'));
 var_dump($session->getErrno() == SNMP::ERRNO_ERROR_IN_REPLY);
 var_dump($session->getError());
 $session->close();
+
 echo "SNMP::ERRNO_GENERIC\n";
 $session = new SNMP(SNMP::VERSION_3, $hostname, 'somebogususer', $timeout, 
$retries);
 $session->setSecurity('authPriv', 'MD5', $auth_pass, 'AES', $priv_pass);
@@ -44,6 +46,33 @@
 var_dump($session->getError());
 var_dump(@$session->get(array('.1.3.6.1.2.1.1.1.0')));
 $session->close();
+
+echo "SNMP::ERRNO_OID_PARSING_ERROR\n";
+echo "GET: Single wrong OID\n";
+$session = new SNMP(SNMP::VERSION_2c, $hostname, $community, $timeout, 
$retries);
+var_dump(@$session->get('.1.3.6.1.2..1.1.1.0'));
+var_dump($session->getErrno() == SNMP::ERRNO_OID_PARSING_ERROR);
+var_dump($session->getError());
+$session->close();
+echo "GET: Miltiple OID, one wrong\n";
+$session = new SNMP(SNMP::VERSION_2c, $hostname, $community, $timeout, 
$retries);
+var_dump(@$session->get(array('.1.3.6.1.2.1.1.1.0', '.1.3.6.1.2..1.1.1.0')));
+var_dump($session->getErrno() == SNMP::ERRNO_OID_PARSING_ERROR);
+var_dump($session->getError());
+$session->close();
+echo "WALK: Single wrong OID\n";
+$session = new SNMP(SNMP::VERSION_2c, $hostname, $community, $timeout, 
$retries);
+var_dump(@$session->walk('.1.3.6.1.2..1.1'));
+var_dump($session->getErrno() == SNMP::ERRNO_OID_PARSING_ERROR);
+var_dump($session->getError());
+$session->close();
+echo "SET: Wrong type\n";
+$session = new SNMP(SNMP::VERSION_3, $hostname, $rwuser, $timeout, $retries);
+$session->setSecurity('authPriv', 'MD5', $auth_pass, 'AES', $priv_pass);
+$oid1 = 'SNMPv2-MIB::sysContact.0';
+var_dump(@$session->set($oid1, 'q', 'blah'));
+var_dump($session->getErrno() == SNMP::ERRNO_OID_PARSING_ERROR);
+var_dump($session->getError());
 ?>
 --EXPECTF--
 SNMP::ERRNO_NOERROR
@@ -63,3 +92,20 @@
 bool(true)
 %string|unicode%(%d) "Fatal error: Unknown user name"
 bool(false)
+SNMP::ERRNO_OID_PARSING_ERROR
+GET: Single wrong OID
+bool(false)
+bool(true)
+string(46) "Invalid object identifier: .1.3.6.1.2..1.1.1.0"
+GET: Miltiple OID, one wrong
+bool(false)
+bool(true)
+string(46) "Invalid object identifier: .1.3.6.1.2..1.1.1.0"
+WALK: Single wrong OID
+bool(false)
+bool(true)
+string(42) "Invalid object identifier: .1.3.6.1.2..1.1"
+SET: Wrong type
+bool(false)
+bool(true)
+string(129) "Could not add variable: 
OID='.iso.org.dod.internet.mgmt.mib-2.system.sysContact.0' type='q' 
value='blah': Bad variable type ("q")"
\ No newline at end of file

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to