]> granicus.if.org Git - php/commitdiff
Improved SNMP extension. FR #53594
authorBoris Lytochkin <lytboris@php.net>
Mon, 31 Jan 2011 11:41:33 +0000 (11:41 +0000)
committerBoris Lytochkin <lytboris@php.net>
Mon, 31 Jan 2011 11:41:33 +0000 (11:41 +0000)
34 files changed:
NEWS
ext/snmp/php_snmp.h
ext/snmp/snmp.c
ext/snmp/tests/README [new file with mode: 0644]
ext/snmp/tests/clean.inc [new file with mode: 0644]
ext/snmp/tests/generic_timeout_error.phpt [new file with mode: 0644]
ext/snmp/tests/skipif.inc [new file with mode: 0644]
ext/snmp/tests/snmp-object-error.phpt [new file with mode: 0644]
ext/snmp/tests/snmp-object-properties.phpt [new file with mode: 0644]
ext/snmp/tests/snmp-object-set_security_error.phpt [new file with mode: 0644]
ext/snmp/tests/snmp-object.phpt [new file with mode: 0644]
ext/snmp/tests/snmp2_get.phpt [new file with mode: 0644]
ext/snmp/tests/snmp2_getnext.phpt [new file with mode: 0644]
ext/snmp/tests/snmp2_real_walk.phpt [new file with mode: 0644]
ext/snmp/tests/snmp2_set-nomib.phpt [new file with mode: 0644]
ext/snmp/tests/snmp2_set.phpt [new file with mode: 0644]
ext/snmp/tests/snmp2_walk.phpt [new file with mode: 0644]
ext/snmp/tests/snmp3-error.phpt [new file with mode: 0644]
ext/snmp/tests/snmp3.phpt [new file with mode: 0644]
ext/snmp/tests/snmp_get_quick_print.phpt [new file with mode: 0644]
ext/snmp/tests/snmp_get_valueretrieval.phpt [new file with mode: 0644]
ext/snmp/tests/snmp_getvalue.phpt [new file with mode: 0644]
ext/snmp/tests/snmp_include.inc [new file with mode: 0644]
ext/snmp/tests/snmp_parse_oid.phpt [new file with mode: 0644]
ext/snmp/tests/snmp_read_mib.phpt [new file with mode: 0644]
ext/snmp/tests/snmp_set_enum_print.phpt [new file with mode: 0644]
ext/snmp/tests/snmp_set_oid_output_format.phpt [new file with mode: 0644]
ext/snmp/tests/snmpget.phpt [new file with mode: 0644]
ext/snmp/tests/snmpgetnext.phpt [new file with mode: 0644]
ext/snmp/tests/snmprealwalk.phpt [new file with mode: 0644]
ext/snmp/tests/snmpset-nomib.phpt [new file with mode: 0644]
ext/snmp/tests/snmpset.phpt [new file with mode: 0644]
ext/snmp/tests/snmpwalk.phpt [new file with mode: 0644]
ext/snmp/tests/wrong_hostname.phpt [new file with mode: 0644]

diff --git a/NEWS b/NEWS
index 6fe50843adcb1ee534b95e8f4bd8f44b69fda405..08dc6a1405a5fb46da8a1366857960fd125ecba4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -197,6 +197,13 @@ PHP                                                                        NEWS
 - Improved ZLIB extension:
   . Re-implemented non-file related functionality. (Mike)
 
+- Improved SNMP extension:
+  . Added OO API. FR #53594. 
+  . Sanitized return values of existing functions. Now it returns FALSE on
+    failure
+  . Introducing unit tests for extension with ~full coverage
+  . Fixed bugs #44193, #44193, #45893, #46065, #51336, #53862
+
 ## UNSORTED ##
 
 - Fixed PDO objects binary incompatibility. (Dmitry)
index aaa6f84ad76a30c8d78b016fab67323d5bc33f7a..a5d0055372002722ff7571b59af135588ae368b9 100644 (file)
@@ -17,6 +17,7 @@
   |          Steven Lawrance <slawrance@technologist.com>                |
   |          Harrie Hazewinkel <harrie@lisanza.net>                      |
   |          Johann Hanne <jonny@nurfuerspam.de>                         |
+  |          Boris Lytockin <lytboris@gmail.com>                         |
   +----------------------------------------------------------------------+
 */
 
@@ -25,6 +26,8 @@
 #ifndef PHP_SNMP_H
 #define PHP_SNMP_H
 
+#define PHP_SNMP_VERSION "0.1"
+
 #if HAVE_SNMP
 
 #ifndef DLEXPORT
@@ -46,11 +49,11 @@ PHP_FUNCTION(snmpget);
 PHP_FUNCTION(snmpgetnext);
 PHP_FUNCTION(snmpwalk);
 PHP_FUNCTION(snmprealwalk);
+PHP_FUNCTION(snmpset);
 PHP_FUNCTION(snmp_get_quick_print);
 PHP_FUNCTION(snmp_set_quick_print);
 PHP_FUNCTION(snmp_set_enum_print);
 PHP_FUNCTION(snmp_set_oid_output_format);
-PHP_FUNCTION(snmpset);
 
 PHP_FUNCTION(snmp2_get);
 PHP_FUNCTION(snmp2_getnext);
@@ -69,6 +72,35 @@ PHP_FUNCTION(snmp_get_valueretrieval);
 
 PHP_FUNCTION(snmp_read_mib);
 
+PHP_METHOD(SNMP, open);
+PHP_METHOD(SNMP, set_security);
+PHP_METHOD(SNMP, close);
+PHP_METHOD(SNMP, get);
+PHP_METHOD(SNMP, getnext);
+PHP_METHOD(SNMP, walk);
+PHP_METHOD(SNMP, set);
+
+typedef struct _php_snmp_object {
+      zend_object zo;
+      struct snmp_session *session;
+      int valueretrieval;
+      int quick_print;
+#ifdef HAVE_NET_SNMP
+      int enum_print;
+      int oid_output_format;
+#endif
+} php_snmp_object;
+
+
+typedef int (*php_snmp_read_t)(php_snmp_object *snmp_object, zval **retval TSRMLS_DC);
+typedef int (*php_snmp_write_t)(php_snmp_object *snmp_object, zval *newval TSRMLS_DC);
+
+typedef struct _ptp_snmp_prop_handler {
+      const char *name;
+      size_t name_length;
+      php_snmp_read_t read_func;
+      php_snmp_write_t write_func;
+} php_snmp_prop_handler;
 
 ZEND_BEGIN_MODULE_GLOBALS(snmp)
       int valueretrieval;
index 76c97aba0f7df651bafb15414c3df7e9ef7e6038..e8224d08f6b0826e9dca0df646bf78e766522d4a 100644 (file)
@@ -17,6 +17,7 @@
    |          Steven Lawrance <slawrance@technologist.com>                |
    |          Harrie Hazewinkel <harrie@lisanza.net>                      |
    |          Johann Hanne <jonny@nurfuerspam.de>                         |
+   |          Boris Lytockin <lytboris@gmail.com>                         |
    +----------------------------------------------------------------------+
  */
 
@@ -30,6 +31,8 @@
 #include "ext/standard/info.h"
 #include "php_snmp.h"
 
+#include "zend_exceptions.h"
+
 #if HAVE_SNMP
 
 #include <sys/types.h>
  */
 #define OIDSIZE(p) (sizeof(p)/sizeof(oid))
 
+/* Another ugly macros, since UCD-SNMP has no snprint_* */
+#ifdef HAVE_NET_SNMP
+#define SNMP_SNPRINT_OBJID(dst, dstlen, src, srclen) (snprint_objid((dst), (dstlen), (src), (srclen)))
+#define SNMP_SNPRINT_VALUE(dst, dstlen, srcname, srcnamelen, src) (snprint_value((dst), (dstlen), (srcname), (srcnamelen), (src)))
+#else
+#define SNMP_SNPRINT_OBJID(dst, dstlen, src, srclen) (sprint_objid((dst), (src), (srclen)))
+#define SNMP_SNPRINT_VALUE(dst, dstlen, srcname, srcnamelen, src) (sprint_value((dst), (srcname), (srcnamelen), (src)))
+#endif
+
+#if PHP_VERSION_ID < 50300
+#define Z_ADDREF_P(pz) pz->refcount++
+#define Z_ISREF_PP(oid) (PZVAL_IS_REF(*(oid)))
+#define Z_REFCOUNT_P(pz) pz->refcount
+#define Z_SET_REFCOUNT_P(pz, rc) pz->refcount = rc
+#define zend_parse_parameters_none() zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")
+#endif
+
 /* For really old ucd-snmp versions.. */
 #ifndef HAVE_SNMP_PARSE_OID
 #define snmp_parse_oid read_objid
 #define SNMP_VALUE_PLAIN       1
 #define SNMP_VALUE_OBJECT      2
 
+typedef struct snmp_session php_snmp_session;
+#define PHP_SNMP_SESSION_RES_NAME "SNMP session"
+
+#define PHP_SNMP_SESSION_FROM_OBJECT(session, object) \
+       { \
+               php_snmp_object *snmp_object; \
+               snmp_object = (php_snmp_object *)zend_object_store_get_object(object TSRMLS_CC); \
+               session = snmp_object->session; \
+               if (!session) { \
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or uninitialized SNMP object"); \
+                       RETURN_FALSE; \
+               } \
+       }
+
+#define PHP_SNMP_ADD_PROPERTIES(a, b) \
+{ \
+       int i = 0; \
+       while (b[i].name != NULL) { \
+               php_snmp_add_property((a), (b)[i].name, (b)[i].name_length, \
+                                                       (php_snmp_read_t)(b)[i].read_func, (php_snmp_write_t)(b)[i].write_func TSRMLS_CC); \
+               i++; \
+       } \
+}
+
+
+
 ZEND_DECLARE_MODULE_GLOBALS(snmp)
 static PHP_GINIT_FUNCTION(snmp);
 
 /* constant - can be shared among threads */
 static oid objid_mib[] = {1, 3, 6, 1, 2, 1};
 
+static int le_snmp_session;
+
+/* Handlers */
+static zend_object_handlers php_snmp_object_handlers;
+
+/* Class entries */
+zend_class_entry *php_snmp_class_entry;
+
+/* Class object properties */
+static HashTable php_snmp_properties;
+
 /* {{{ arginfo */
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpget, 0, 0, 3)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, community)
@@ -145,6 +203,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmprealwalk, 0, 0, 3)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpset, 0, 0, 5)
+       ZEND_ARG_INFO(0, host)
+       ZEND_ARG_INFO(0, community)
+       ZEND_ARG_INFO(0, object_id)
+       ZEND_ARG_INFO(0, type)
+       ZEND_ARG_INFO(0, value)
+       ZEND_ARG_INFO(0, timeout)
+       ZEND_ARG_INFO(0, retries)
+ZEND_END_ARG_INFO()
+
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_get_quick_print, 0, 0, 1)
        ZEND_ARG_INFO(0, d)
 ZEND_END_ARG_INFO()
@@ -163,16 +232,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_set_oid_output_format, 0, 0, 1)
 ZEND_END_ARG_INFO()
 #endif
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpset, 0, 0, 5)
-       ZEND_ARG_INFO(0, host)
-       ZEND_ARG_INFO(0, community)
-       ZEND_ARG_INFO(0, object_id)
-       ZEND_ARG_INFO(0, type)
-       ZEND_ARG_INFO(0, value)
-       ZEND_ARG_INFO(0, timeout)
-       ZEND_ARG_INFO(0, retries)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_get, 0, 0, 3)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, community)
@@ -215,11 +274,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_set, 0, 0, 5)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_php_snmpv3, 0, 0, 2)
-       ZEND_ARG_INFO(0, s)
-       ZEND_ARG_INFO(0, st)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_get, 0, 0, 8)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, sec_name)
@@ -297,16 +351,78 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_read_mib, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
+
+/* OO arginfo */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_open, 0, 0, 3)
+       ZEND_ARG_INFO(0, version)
+       ZEND_ARG_INFO(0, host)
+       ZEND_ARG_INFO(0, community)
+       ZEND_ARG_INFO(0, timeout)
+       ZEND_ARG_INFO(0, retries)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_snmp_void, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_set_security, 0, 0, 8)
+       ZEND_ARG_INFO(0, session)
+       ZEND_ARG_INFO(0, sec_level)
+       ZEND_ARG_INFO(0, auth_protocol)
+       ZEND_ARG_INFO(0, auth_passphrase)
+       ZEND_ARG_INFO(0, priv_protocol)
+       ZEND_ARG_INFO(0, priv_passphrase)
+       ZEND_ARG_INFO(0, contextName)
+       ZEND_ARG_INFO(0, contextEngineID)
+       ZEND_ARG_INFO(0, )
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_get, 0, 0, 1)
+       ZEND_ARG_INFO(0, object_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_walk, 0, 0, 3)
+       ZEND_ARG_INFO(0, object_id)
+       ZEND_ARG_INFO(0, non_repeaters)
+       ZEND_ARG_INFO(0, max_repetitions)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_set, 0, 0, 3)
+       ZEND_ARG_INFO(0, object_id)
+       ZEND_ARG_INFO(0, type)
+       ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_class_set_quick_print, 0, 0, 1)
+       ZEND_ARG_INFO(0, quick_print)
+ZEND_END_ARG_INFO()
 /* }}} */
 
+typedef struct _snmpobjarg {
+       char *oid;
+       char type;
+       char *value;
+
+} snmpobjarg;
+
+#define SNMP_MAXOIDS_IN_PDU 64
+struct objid_set {
+       int count;
+       int offset;
+       int step;
+       int array_output;
+       snmpobjarg vars[SNMP_MAXOIDS_IN_PDU];
+};
+
 /* {{{ snmp_functions[]
  */
 const zend_function_entry snmp_functions[] = {
-       PHP_FE(snmpget,                                                 arginfo_snmpget)
-       PHP_FE(snmpgetnext,                                     arginfo_snmpgetnext)
-       PHP_FE(snmpwalk,                                                arginfo_snmpwalk)
-       PHP_FE(snmprealwalk,                                    arginfo_snmprealwalk)
-       PHP_FALIAS(snmpwalkoid, snmprealwalk,   arginfo_snmprealwalk)
+       PHP_FE(snmpget,                                 arginfo_snmpget)
+       PHP_FE(snmpgetnext,                             arginfo_snmpgetnext)
+       PHP_FE(snmpwalk,                                arginfo_snmpwalk)
+       PHP_FE(snmprealwalk,                            arginfo_snmprealwalk)
+       PHP_FALIAS(snmpwalkoid, snmprealwalk,           arginfo_snmprealwalk)
+       PHP_FE(snmpset,                                 arginfo_snmpset)
        PHP_FE(snmp_get_quick_print,                    arginfo_snmp_get_quick_print)
        PHP_FE(snmp_set_quick_print,                    arginfo_snmp_set_quick_print)
 #ifdef HAVE_NET_SNMP
@@ -314,52 +430,36 @@ const zend_function_entry snmp_functions[] = {
        PHP_FE(snmp_set_oid_output_format,              arginfo_snmp_set_oid_output_format)
        PHP_FALIAS(snmp_set_oid_numeric_print, snmp_set_oid_output_format, arginfo_snmp_set_oid_output_format)
 #endif
-       PHP_FE(snmpset,                                 arginfo_snmpset)
 
        PHP_FE(snmp2_get,                               arginfo_snmp2_get)
-       PHP_FE(snmp2_getnext,                   arginfo_snmp2_getnext)
+       PHP_FE(snmp2_getnext,                           arginfo_snmp2_getnext)
        PHP_FE(snmp2_walk,                              arginfo_snmp2_walk)
-       PHP_FE(snmp2_real_walk,                 arginfo_snmp2_real_walk)
+       PHP_FE(snmp2_real_walk,                         arginfo_snmp2_real_walk)
        PHP_FE(snmp2_set,                               arginfo_snmp2_set)
 
        PHP_FE(snmp3_get,                               arginfo_snmp3_get)
-       PHP_FE(snmp3_getnext,                   arginfo_snmp3_getnext)
+       PHP_FE(snmp3_getnext,                           arginfo_snmp3_getnext)
        PHP_FE(snmp3_walk,                              arginfo_snmp3_walk)
-       PHP_FE(snmp3_real_walk,                 arginfo_snmp3_real_walk)
+       PHP_FE(snmp3_real_walk,                         arginfo_snmp3_real_walk)
        PHP_FE(snmp3_set,                               arginfo_snmp3_set)
-       PHP_FE(snmp_set_valueretrieval, arginfo_snmp_set_valueretrieval)
-       PHP_FE(snmp_get_valueretrieval, arginfo_snmp_get_valueretrieval)
+       PHP_FE(snmp_set_valueretrieval,                 arginfo_snmp_set_valueretrieval)
+       PHP_FE(snmp_get_valueretrieval,                 arginfo_snmp_get_valueretrieval)
 
-       PHP_FE(snmp_read_mib,                   arginfo_snmp_read_mib)
+       PHP_FE(snmp_read_mib,                           arginfo_snmp_read_mib)
        {NULL,NULL,NULL}
 };
 /* }}} */
 
-#define SNMP_CMD_GET           1
-#define SNMP_CMD_GETNEXT       2
-#define SNMP_CMD_WALK          3
-#define SNMP_CMD_REALWALK      4
-#define SNMP_CMD_SET           11
-
-/* {{{ snmp_module_entry
- */
-zend_module_entry snmp_module_entry = {
-       STANDARD_MODULE_HEADER,
-       "snmp",
-       snmp_functions,
-       PHP_MINIT(snmp),
-       PHP_MSHUTDOWN(snmp),
-       NULL,
-       NULL,
-       PHP_MINFO(snmp),
-       NO_VERSION_YET,
-       PHP_MODULE_GLOBALS(snmp),
-       PHP_GINIT(snmp),
-       NULL,
-       NULL,
-       STANDARD_MODULE_PROPERTIES_EX
-};
-/* }}} */
+/* query an agent with GET method */
+#define SNMP_CMD_GET           (1<<0)
+/* query an agent with GETNEXT method */
+#define SNMP_CMD_GETNEXT       (1<<1)
+/* query an agent with SET method */
+#define SNMP_CMD_SET           (1<<2)
+/* walk the mib */
+#define SNMP_CMD_WALK          (1<<3)
+/* force values-only output */
+#define SNMP_NUMERIC_KEYS      (1<<7)
 
 #ifdef COMPILE_DL_SNMP
 ZEND_GET_MODULE(snmp)
@@ -375,86 +475,88 @@ static PHP_GINIT_FUNCTION(snmp)
 }
 /* }}} */
 
-/* {{{ PHP_MINIT_FUNCTION
- */
-PHP_MINIT_FUNCTION(snmp)
+static void netsnmp_session_free(php_snmp_session **session)
 {
-       init_snmp("snmpapp");
-
-#ifdef NETSNMP_DS_LIB_DONT_PERSIST_STATE
-       /* Prevent update of the snmpapp.conf file */
-       netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DONT_PERSIST_STATE, 1);
-#endif
+       if (*session) {
+               if ((*session)->peername) {
+                       efree((*session)->peername);
+               }
+               efree(*session);
+               *session = NULL;
+       }
+}
 
-#ifdef HAVE_NET_SNMP
-       REGISTER_LONG_CONSTANT("SNMP_OID_OUTPUT_FULL", NETSNMP_OID_OUTPUT_FULL, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_OID_OUTPUT_NUMERIC", NETSNMP_OID_OUTPUT_NUMERIC, CONST_CS | CONST_PERSISTENT);
-#endif
+static void php_snmp_session_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+       php_snmp_session *session = (php_snmp_session *)rsrc->ptr;
+       netsnmp_session_free(&session);
+}
 
-       REGISTER_LONG_CONSTANT("SNMP_VALUE_LIBRARY", SNMP_VALUE_LIBRARY, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_VALUE_PLAIN", SNMP_VALUE_PLAIN, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_VALUE_OBJECT", SNMP_VALUE_OBJECT, CONST_CS | CONST_PERSISTENT);
+static void php_snmp_object_free_storage(void *object TSRMLS_DC)
+{
+       php_snmp_object *intern = (php_snmp_object *)object;
+       
+       if (!intern) {
+               return;
+       }
 
-       REGISTER_LONG_CONSTANT("SNMP_BIT_STR", ASN_BIT_STR, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_OCTET_STR", ASN_OCTET_STR, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_OPAQUE", ASN_OPAQUE, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_NULL", ASN_NULL, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_OBJECT_ID", ASN_OBJECT_ID, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_IPADDRESS", ASN_IPADDRESS, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_COUNTER", ASN_GAUGE, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_UNSIGNED", ASN_UNSIGNED, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_TIMETICKS", ASN_TIMETICKS, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_UINTEGER", ASN_UINTEGER, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_INTEGER", ASN_INTEGER, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("SNMP_COUNTER64", ASN_COUNTER64, CONST_CS | CONST_PERSISTENT);
+       netsnmp_session_free(&(intern->session));
 
-       return SUCCESS;
+       zend_object_std_dtor(&intern->zo TSRMLS_CC);
 }
-/* }}} */
 
-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
-PHP_MSHUTDOWN_FUNCTION(snmp)
+static zend_object_value php_snmp_object_new(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
 {
-       snmp_shutdown("snmpapp");
+       zval *tmp;
+       zend_object_value retval;
+       php_snmp_object *intern;
 
-       return SUCCESS;
-}
-/* }}} */
+       /* Allocate memory for it */
+       intern = emalloc(sizeof(php_snmp_object));
+       memset(&intern->zo, 0, sizeof(php_snmp_object));
 
-/* {{{ PHP_MINFO_FUNCTION
- */
-PHP_MINFO_FUNCTION(snmp)
-{
-       php_info_print_table_start();
-#ifdef HAVE_NET_SNMP
-       php_info_print_table_row(2, "NET-SNMP Support", "enabled");
-       php_info_print_table_row(2, "NET-SNMP Version", netsnmp_get_version());
-#else
-       php_info_print_table_row(2, "UCD-SNMP Support", "enabled");
-       php_info_print_table_row(2, "UCD-SNMP Version", VersionInfo);
-#endif
-       php_info_print_table_end();
+       zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
+       zend_hash_copy(intern->zo.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &tmp, sizeof(zval *));
+
+       retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) php_snmp_object_free_storage, NULL TSRMLS_CC);
+       retval.handlers = (zend_object_handlers *) &php_snmp_object_handlers;
+
+       return retval;
+       
 }
-/* }}} */
 
-static void php_snmp_getvalue(struct variable_list *vars, zval *snmpval TSRMLS_DC)
+/* {{{ php_snmp_getvalue
+*
+* SNMP value to zval converter
+*
+*/
+static void php_snmp_getvalue(struct variable_list *vars, zval *snmpval TSRMLS_DC, int valueretrieval)
 {
        zval *val;
-#if I64CHARSZ > 2047
-       char buf[I64CHARSZ + 1];
-#else
-       char buf[2048];
-#endif
+       char sbuf[64];
+       char *buf = &(sbuf[0]);
+       char *dbuf = (char *)NULL;
+       int buflen = sizeof(sbuf) - 1;
+       int val_len = vars->val_len;
+       
+       if (valueretrieval == SNMP_VALUE_LIBRARY) {
+               val_len += 32; /* snprint_value will add type info into value, make some space for it */
+       }
+
+       /* use emalloc() for large values, use static array otherwize */
+       if(val_len > buflen){
+               if ((dbuf = (char *)emalloc(val_len + 1))) {
+                       buf = dbuf;
+                       buflen = val_len;
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "malloc() failed: %s, fallback to static array", strerror(errno));
+               }
+       }
 
-       buf[0] = 0;
+       *buf = 0;
 
-       if (SNMP_G(valueretrieval) == SNMP_VALUE_LIBRARY) {
-#ifdef HAVE_NET_SNMP
-               snprint_value(buf, sizeof(buf), vars->name, vars->name_length, vars);
-#else
-               sprint_value(buf,vars->name, vars->name_length, vars);
-#endif
+       if (valueretrieval == SNMP_VALUE_LIBRARY) {
+               SNMP_SNPRINT_VALUE(buf, buflen, vars->name, vars->name_length, vars);
                ZVAL_STRING(snmpval, buf, 1);
                return;
        }
@@ -476,20 +578,15 @@ static void php_snmp_getvalue(struct variable_list *vars, zval *snmpval TSRMLS_D
                break;
 
        case ASN_OBJECT_ID:             /* 0x06, asn1.h */
-#ifdef HAVE_NET_SNMP
-               snprint_objid(buf, sizeof(buf), vars->val.objid, vars->val_len / sizeof(oid));
-#else
-               sprint_objid(buf, vars->val.objid, vars->val_len / sizeof(oid));
-#endif
-
+               SNMP_SNPRINT_OBJID(buf, buflen, vars->val.objid, vars->val_len / sizeof(oid));
                ZVAL_STRING(val, buf, 1);
                break;
 
        case ASN_IPADDRESS:             /* 0x40, snmp_impl.h */
-               snprintf(buf, sizeof(buf)-1, "%d.%d.%d.%d",
-                        (vars->val.string)[0], (vars->val.string)[1],
-                        (vars->val.string)[2], (vars->val.string)[3]);
-               buf[sizeof(buf)-1]=0;
+               snprintf(buf, buflen, "%d.%d.%d.%d",
+                        (vars->val.string)[0], (vars->val.string)[1],
+                        (vars->val.string)[2], (vars->val.string)[3]);
+               buf[buflen]=0;
                ZVAL_STRING(val, buf, 1);
                break;
 
@@ -498,17 +595,35 @@ static void php_snmp_getvalue(struct variable_list *vars, zval *snmpval TSRMLS_D
        /* ASN_UNSIGNED is the same as ASN_GAUGE */
        case ASN_TIMETICKS:             /* 0x43, snmp_impl.h */
        case ASN_UINTEGER:              /* 0x47, snmp_impl.h */
-               snprintf(buf, sizeof(buf)-1, "%lu", *vars->val.integer);
-               buf[sizeof(buf)-1]=0;
+               snprintf(buf, buflen, "%lu", *vars->val.integer);
+               buf[buflen]=0;
                ZVAL_STRING(val, buf, 1);
                break;
 
        case ASN_INTEGER:               /* 0x02, asn1.h */
-               snprintf(buf, sizeof(buf)-1, "%ld", *vars->val.integer);
-               buf[sizeof(buf)-1]=0;
+               snprintf(buf, buflen, "%ld", *vars->val.integer);
+               buf[buflen]=0;
+               ZVAL_STRING(val, buf, 1);
+               break;
+
+#ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
+       case ASN_OPAQUE_FLOAT:          /* 0x78, asn1.h */
+               snprintf(buf, buflen, "%f", *vars->val.floatVal);
+               ZVAL_STRING(val, buf, 1);
+               break;
+
+       case ASN_OPAQUE_DOUBLE:         /* 0x79, asn1.h */
+               snprintf(buf, buflen, "%Lf", *vars->val.doubleVal);
+               ZVAL_STRING(val, buf, 1);
+               break;
+
+       case ASN_OPAQUE_I64:            /* 0x80, asn1.h */
+               printI64(buf, vars->val.counter64);
                ZVAL_STRING(val, buf, 1);
                break;
 
+       case ASN_OPAQUE_U64:            /* 0x81, asn1.h */
+#endif
        case ASN_COUNTER64:             /* 0x46, snmp_impl.h */
                printU64(buf, vars->val.counter64);
                ZVAL_STRING(val, buf, 1);
@@ -516,10 +631,11 @@ static void php_snmp_getvalue(struct variable_list *vars, zval *snmpval TSRMLS_D
 
        default:
                ZVAL_STRING(val, "Unknown value type", 1);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown value type: %u", vars->type);
                break;
        }
 
-       if (SNMP_G(valueretrieval) == SNMP_VALUE_PLAIN) {
+       if (valueretrieval == SNMP_VALUE_PLAIN) {
                *snmpval = *val;
                zval_copy_ctor(snmpval);
        } else {
@@ -527,26 +643,22 @@ static void php_snmp_getvalue(struct variable_list *vars, zval *snmpval TSRMLS_D
                add_property_long(snmpval, "type", vars->type);
                add_property_zval(snmpval, "value", val);
        }
+       if(dbuf){ /* malloc was used to store value */
+               efree(dbuf);
+       }
 }
+/* }}} */
 
 /* {{{ php_snmp_internal
 *
-* Generic SNMP object fetcher (for all SNMP versions)
-*
-* st=SNMP_CMD_GET   get - query an agent with SNMP-GET.
-* st=SNMP_CMD_GETNEXT   getnext - query an agent with SNMP-GETNEXT.
-* st=SNMP_CMD_WALK   walk - walk the mib and return a single dimensional array 
-*          containing the values.
-* st=SNMP_CMD_REALWALK   realwalk() and walkoid() - walk the mib and return an 
-*          array of oid,value pairs.
-* st=SNMP_CMD_SET  set() - query an agent and set a single value
+* SNMP object fetcher/setter for all SNMP versions
 *
 */
 static void php_snmp_internal(INTERNAL_FUNCTION_PARAMETERS, int st, 
                                                        struct snmp_session *session,
-                                                       char *objid,
-                                                       char type,
-                                                       char* value) 
+                                                       struct objid_set *objid_set,
+                                                       int non_repeaters, int max_repetitions,
+                                                       int valueretrieval)
 {
        struct snmp_session *ss;
        struct snmp_pdu *pdu=NULL, *response;
@@ -562,14 +674,23 @@ static void php_snmp_internal(INTERNAL_FUNCTION_PARAMETERS, int st,
        int keepwalking=1;
        char *err;
        zval *snmpval = NULL;
+       int snmp_errno;
 
-       if (st >= SNMP_CMD_WALK) { /* walk */
+       /* we start with retval=FALSE. If any actual data is aquired, retval will be set to appropriate type */
+       RETVAL_FALSE;
+
+       if (st & SNMP_CMD_WALK) {
+               if (objid_set->count > 1) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Multi OID walks are not supported!");
+                       RETURN_FALSE;
+               }
                rootlen = MAX_NAME_LEN;
-               if (strlen(objid)) { /* on a walk, an empty string means top of tree - no error */
-                       if (snmp_parse_oid(objid, root, &rootlen)) {
+               if (strlen(objid_set->vars[0].oid)) { /* on a walk, an empty string means top of tree - no error */
+                       if (snmp_parse_oid(objid_set->vars[0].oid, root, &rootlen)) {
                                gotroot = 1;
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid object identifier: %s", objid);
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid object identifier: %s", objid_set->vars[0].oid);
+                               RETURN_FALSE;
                        }
                }
 
@@ -578,6 +699,10 @@ static void php_snmp_internal(INTERNAL_FUNCTION_PARAMETERS, int st,
                        rootlen = sizeof(objid_mib) / sizeof(oid);
                        gotroot = 1;
                }
+
+               memmove((char *)name, (char *)root, rootlen * sizeof(oid));
+               name_length = rootlen;
+               objid_set->offset = objid_set->count;
        }
 
        if ((ss = snmp_open(session)) == NULL) {
@@ -587,51 +712,49 @@ static void php_snmp_internal(INTERNAL_FUNCTION_PARAMETERS, int st,
                RETURN_FALSE;
        }
 
-       if (st >= SNMP_CMD_WALK) {
-               memmove((char *)name, (char *)root, rootlen * sizeof(oid));
-               name_length = rootlen;
-               switch(st) {
-                       case SNMP_CMD_WALK:
-                       case SNMP_CMD_REALWALK:
-                               array_init(return_value);
-                               break;
-                       default:
-                               RETVAL_TRUE;
-                               break;
-               }
-       }
-
        while (keepwalking) {
                keepwalking = 0;
-               if ((st == SNMP_CMD_GET) || (st == SNMP_CMD_GETNEXT)) {
-                       name_length = MAX_OID_LEN;
-                       if (!snmp_parse_oid(objid, name, &name_length)) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid object identifier: %s", objid);
-                               snmp_close(ss);
-                               RETURN_FALSE;
+               if (st & (SNMP_CMD_GET | SNMP_CMD_GETNEXT)) {
+                       pdu = snmp_pdu_create((st & SNMP_CMD_GET) ? SNMP_MSG_GET : SNMP_MSG_GETNEXT);
+                       for (count = 0; objid_set->offset < objid_set->count && count < objid_set->step; objid_set->offset++, count++){
+                               name_length = MAX_OID_LEN;
+                               if (!snmp_parse_oid(objid_set->vars[objid_set->offset].oid, name, &name_length)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid object identifier: %s", objid_set->vars[objid_set->offset].oid);
+                               } else {
+                                       snmp_add_null_var(pdu, name, name_length);
+                               }
                        }
-                       pdu = snmp_pdu_create((st == SNMP_CMD_GET) ? SNMP_MSG_GET : SNMP_MSG_GETNEXT);
-                       snmp_add_null_var(pdu, name, name_length);
-               } else if (st == SNMP_CMD_SET) {
-                       pdu = snmp_pdu_create(SNMP_MSG_SET);
-                       if (snmp_add_var(pdu, name, name_length, type, value)) {
-#ifdef HAVE_NET_SNMP
-                               snprint_objid(buf, sizeof(buf), name, name_length);
-#else
-                               sprint_objid(buf, name, name_length);
-#endif
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not add variable: %s %c %s", buf, type, value);
+                       if(pdu->variables == NULL){
                                snmp_free_pdu(pdu);
                                snmp_close(ss);
                                RETURN_FALSE;
                        }
-               } else if (st >= SNMP_CMD_WALK) {
+               } else if (st & SNMP_CMD_SET) {
+                       pdu = snmp_pdu_create(SNMP_MSG_SET);
+                       for (count = 0; objid_set->offset < objid_set->count && count < objid_set->step; objid_set->offset++, count++){
+                               name_length = MAX_OID_LEN;
+                               if (!snmp_parse_oid(objid_set->vars[objid_set->offset].oid, name, &name_length)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid object identifier: %s", objid_set->vars[objid_set->offset].oid);
+                                       snmp_free_pdu(pdu);
+                                       snmp_close(ss);
+                                       RETURN_FALSE;
+                               } else {
+                                       if ((snmp_errno = snmp_add_var(pdu, name, name_length, objid_set->vars[objid_set->offset].type, objid_set->vars[objid_set->offset].value))) {
+                                               SNMP_SNPRINT_OBJID(buf, sizeof(buf), name, name_length);
+                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not add variable: OID='%s' type='%c' value='%s': %s", buf, objid_set->vars[objid_set->offset].type, objid_set->vars[objid_set->offset].value, snmp_api_errstring(snmp_errno));
+                                               snmp_free_pdu(pdu);
+                                               snmp_close(ss);
+                                               RETURN_FALSE;
+                                       }
+                               }
+                       }
+               } else if (st & SNMP_CMD_WALK) {
                        if (session->version == SNMP_VERSION_1) {
                                pdu = snmp_pdu_create(SNMP_MSG_GETNEXT);
                        } else {
                                pdu = snmp_pdu_create(SNMP_MSG_GETBULK);
-                               pdu->non_repeaters = 0;
-                               pdu->max_repetitions = 20;
+                               pdu->non_repeaters = non_repeaters;
+                               pdu->max_repetitions = max_repetitions;
                        }
                        snmp_add_null_var(pdu, name, name_length);
                }
@@ -640,95 +763,102 @@ retry:
                status = snmp_synch_response(ss, pdu, &response);
                if (status == STAT_SUCCESS) {
                        if (response->errstat == SNMP_ERR_NOERROR) {
+                               if (st & SNMP_CMD_SET) {
+                                       snmp_free_pdu(response);
+                                       snmp_close(ss);
+                                       RETURN_TRUE;
+                               }
                                for (vars = response->variables; vars; vars = vars->next_variable) {
-                                       if (st >= SNMP_CMD_WALK && st != SNMP_CMD_SET && 
-                                               (vars->name_length < rootlen || memcmp(root, vars->name, rootlen * sizeof(oid)))) {
-                                               continue;       /* not part of this subtree */
+                                       /* do not output errors as values */
+                                       if (    vars->type == SNMP_ENDOFMIBVIEW || 
+                                               vars->type == SNMP_NOSUCHOBJECT || 
+                                               vars->type == SNMP_NOSUCHINSTANCE ) {
+                                               if ((st & SNMP_CMD_WALK) && Z_TYPE_P(return_value) == IS_ARRAY) {
+                                                       break;
+                                               }
+                                               SNMP_SNPRINT_OBJID(buf, sizeof(buf), vars->name, vars->name_length);
+                                               SNMP_SNPRINT_VALUE(buf2, sizeof(buf2), vars->name, vars->name_length, vars);
+                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error in packet at '%s': %s", buf, buf2);
+                                               continue;
                                        }
-
-                                       if (st != SNMP_CMD_SET) {
-                                               MAKE_STD_ZVAL(snmpval);
-                                               php_snmp_getvalue(vars, snmpval TSRMLS_CC);
+                                       
+                                       if ((st & SNMP_CMD_WALK) && 
+                                               (vars->name_length < rootlen || memcmp(root, vars->name, rootlen * sizeof(oid)))) { /* not part of this subtree */
+                                               if (Z_TYPE_P(return_value) == IS_ARRAY) { /* some records are fetched already, shut down further lookup */
+                                                       keepwalking = 0;
+                                               } else {
+                                                       /* first fetched OID is out of subtree, fallback to GET query */
+                                                       st |= SNMP_CMD_GET;
+                                                       st ^= SNMP_CMD_WALK;
+                                                       objid_set->offset = 0;
+                                                       keepwalking = 1;
+                                               }
+                                               break;
                                        }
 
-                                       if (st == SNMP_CMD_GET) {
+                                       MAKE_STD_ZVAL(snmpval);
+                                       php_snmp_getvalue(vars, snmpval TSRMLS_CC, valueretrieval);
+
+                                       if (objid_set->array_output) {
+                                               if (Z_TYPE_P(return_value) == IS_BOOL) {
+                                                       array_init(return_value);
+                                               }
+                                               if (st & SNMP_NUMERIC_KEYS) {
+                                                       add_next_index_zval(return_value, snmpval);
+                                               } else {
+                                                       SNMP_SNPRINT_OBJID(buf2, sizeof(buf2), vars->name, vars->name_length);
+                                                       add_assoc_zval(return_value, buf2, snmpval);
+                                               }
+                                       } else {
                                                *return_value = *snmpval;
                                                zval_copy_ctor(return_value);
                                                zval_ptr_dtor(&snmpval);
-                                               snmp_free_pdu(response);
-                                               snmp_close(ss);
-                                               return;
-                                       } else if (st == SNMP_CMD_GETNEXT) {
-                                               *return_value = *snmpval;
-                                               zval_copy_ctor(return_value);
-                                               snmp_free_pdu(response);
-                                               snmp_close(ss);
-                                               return;
-                                       } else if (st == SNMP_CMD_WALK) {
-                                               add_next_index_zval(return_value,snmpval); /* Add to returned array */
-                                       } else if (st == SNMP_CMD_REALWALK && vars->type != SNMP_ENDOFMIBVIEW && vars->type != SNMP_NOSUCHOBJECT && vars->type != SNMP_NOSUCHINSTANCE) {
-#ifdef HAVE_NET_SNMP
-                                               snprint_objid(buf2, sizeof(buf2), vars->name, vars->name_length);
-#else
-                                               sprint_objid(buf2, vars->name, vars->name_length);
-#endif
-                                               add_assoc_zval(return_value,buf2,snmpval);
+                                               break;
                                        }
-                                       if (st >= SNMP_CMD_WALK && st != SNMP_CMD_SET) {
-                                               if (vars->type != SNMP_ENDOFMIBVIEW && 
-                                                       vars->type != SNMP_NOSUCHOBJECT && vars->type != SNMP_NOSUCHINSTANCE) {
-                                                       if (snmp_oid_compare(name, name_length, vars->name, vars->name_length) >= 0) {
-                                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error: OID not increasing: %s",name);
-                                                               keepwalking = 0;
-                                                       } else {
-                                                               memmove((char *)name, (char *)vars->name,vars->name_length * sizeof(oid));
-                                                               name_length = vars->name_length;
-                                                               keepwalking = 1;
-                                                       }
+
+                                       /* OID increase check */
+                                       if (st & SNMP_CMD_WALK) {
+                                               if (snmp_oid_compare(name, name_length, vars->name, vars->name_length) >= 0) {
+                                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error: OID not increasing: %s",name);
+                                                       keepwalking = 0;
+                                               } else {
+                                                       memmove((char *)name, (char *)vars->name,vars->name_length * sizeof(oid));
+                                                       name_length = vars->name_length;
+                                                       keepwalking = 1;
                                                }
                                        }
-                               }       
+                               }
+                               if (objid_set->offset < objid_set->count) { /* we have unprocessed OIDs */
+                                       keepwalking = 1;
+                               }
                        } else {
-                               if (st != SNMP_CMD_WALK || response->errstat != SNMP_ERR_NOSUCHNAME) {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error in packet: %s", snmp_errstring(response->errstat));
-                                       if (response->errstat == SNMP_ERR_NOSUCHNAME) {
-                                               for (count=1, vars = response->variables; vars && count != response->errindex;
+                               if (!(st & SNMP_CMD_WALK) || response->errstat != SNMP_ERR_NOSUCHNAME || Z_TYPE_P(return_value) == IS_BOOL) {
+                                       for (   count=1, vars = response->variables;
+                                               vars && count != response->errindex;
                                                vars = vars->next_variable, count++);
-                                               if (vars) {
-#ifdef HAVE_NET_SNMP
-                                                       snprint_objid(buf, sizeof(buf), vars->name, vars->name_length);
-#else
-                                                       sprint_objid(buf,vars->name, vars->name_length);
-#endif
-                                               }
-                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "This name does not exist: %s",buf);
+
+                                       if (st & (SNMP_CMD_GET | SNMP_CMD_GETNEXT) && response->errstat == SNMP_ERR_TOOBIG && objid_set->step > 1) { /* Answer will not fit into single packet */
+                                               objid_set->offset -= objid_set->step;
+                                               objid_set->step /= 2;
+                                               snmp_free_pdu(response);
+                                               keepwalking = 1;
+                                               continue;
                                        }
-                                       if (st == SNMP_CMD_GET) {
-                                               if ((pdu = snmp_fix_pdu(response, SNMP_MSG_GET)) != NULL) {
-                                                       snmp_free_pdu(response);
-                                                       goto retry;
-                                               }
-                                       } else if (st == SNMP_CMD_SET) {
-                                               if ((pdu = snmp_fix_pdu(response, SNMP_MSG_SET)) != NULL) {
-                                                       snmp_free_pdu(response);
-                                                       goto retry;
-                                               }
-                                       } else if (st == SNMP_CMD_GETNEXT) {
-                                               if ((pdu = snmp_fix_pdu(response, SNMP_MSG_GETNEXT)) != NULL) {
-                                                       snmp_free_pdu(response);
-                                                       goto retry;
-                                               }
-                                       } else if (st >= SNMP_CMD_WALK) { /* Here we do walks. */
-                                               if ((pdu = snmp_fix_pdu(response, ((session->version == SNMP_VERSION_1)
-                                                                               ? SNMP_MSG_GETNEXT
-                                                                               : SNMP_MSG_GETBULK))) != NULL) {
+                                       if (vars) {
+                                               SNMP_SNPRINT_OBJID(buf, sizeof(buf), vars->name, vars->name_length);
+                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error in packet at '%s': %s", buf, snmp_errstring(response->errstat));
+                                       } else {
+                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error in packet at %u object_id: %s", response->errindex, snmp_errstring(response->errstat));
+                                       }
+                                       if (st & (SNMP_CMD_GET | SNMP_CMD_GETNEXT)) { /* cut out bogus OID and retry */
+                                               if ((pdu = snmp_fix_pdu(response, ((st & SNMP_CMD_GET) ? SNMP_MSG_GET : SNMP_MSG_GETNEXT) )) != NULL) {
                                                        snmp_free_pdu(response);
                                                        goto retry;
                                                }
                                        }
                                        snmp_free_pdu(response);
                                        snmp_close(ss);
-                                       if (st == SNMP_CMD_WALK || st == SNMP_CMD_REALWALK) {
+                                       if (objid_set->array_output) {
                                                zval_dtor(return_value);
                                        }
                                        RETURN_FALSE;
@@ -736,14 +866,16 @@ retry:
                        }
                } else if (status == STAT_TIMEOUT) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "No response from %s", session->peername);
-                       if (st == SNMP_CMD_WALK || st == SNMP_CMD_REALWALK) {
+                       if (objid_set->array_output) {
                                zval_dtor(return_value);
                        }
                        snmp_close(ss);
                        RETURN_FALSE;
                } else {    /* status == STAT_ERROR */
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occurred, quitting");
-                       if (st == SNMP_CMD_WALK || st == SNMP_CMD_REALWALK) {
+                       snmp_error(ss, NULL, NULL, &err);
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Fatal error: %s", err);
+                       free(err);
+                       if (objid_set->array_output) {
                                zval_dtor(return_value);
                        }
                        snmp_close(ss);
@@ -757,212 +889,176 @@ retry:
 }
 /* }}} */
 
-/* {{{ php_snmp
-*
-* Generic community based SNMP handler for version 1 and 2.
-* This function makes use of the internal SNMP object fetcher.
-* The object fetcher is shared with SNMPv3.
-*
-* st=SNMP_CMD_GET   get - query an agent with SNMP-GET.
-* st=SNMP_CMD_GETNEXT   getnext - query an agent with SNMP-GETNEXT.
-* st=SNMP_CMD_WALK   walk - walk the mib and return a single dimensional array 
-*          containing the values.
-* st=SNMP_CMD_REALWALK   realwalk() and walkoid() - walk the mib and return an 
-*          array of oid,value pairs.
-* st=5-8 ** Reserved **
-* st=SNMP_CMD_SET  set() - query an agent and set a single value
+/* {{{ php_snmp_parse_oid
 *
+* OID parser (and type, value for SNMP_SET command)
 */
-static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version) 
+
+static int php_snmp_parse_oid(int st, struct objid_set *objid_set, zval **oid, zval **type, zval **value)
 {
-       char *a1, *a2, *a3;
-       int a1_len, a2_len, a3_len;
-       struct snmp_session session;
-       long timeout = SNMP_DEFAULT_TIMEOUT;
-       long retries = SNMP_DEFAULT_RETRIES;
-       char type = (char) 0;
-       char *value = (char *) 0, *stype = "";
-       int value_len, stype_len;
-       char hostname[MAX_NAME_LEN];
-       int remote_port = 161;
        char *pptr;
-       int argc = ZEND_NUM_ARGS();
+       HashPosition pos_oid, pos_type, pos_value;
+       zval **tmp_oid, **tmp_type, **tmp_value;
 
-       if (st == SNMP_CMD_SET) {
-               if (zend_parse_parameters(argc TSRMLS_CC, "sssss|ll", &a1, &a1_len, &a2, &a2_len, &a3, &a3_len, &stype, &stype_len, &value, &value_len, &timeout, &retries) == FAILURE) {
-                       return;
-               }
-       } else {
-               /* SNMP_CMD_GET
-                * SNMP_CMD_GETNEXT
-                * SNMP_CMD_WALK
-                * SNMP_CMD_REALWALK
-                */
-               if (zend_parse_parameters(argc TSRMLS_CC, "sss|ll", &a1, &a1_len, &a2, &a2_len, &a3, &a3_len, &timeout, &retries) == FAILURE) {
-                       return;
+       if (Z_TYPE_PP(oid) != IS_ARRAY) {
+               if (Z_ISREF_PP(oid)) {
+                       SEPARATE_ZVAL(oid);
                }
+               convert_to_string_ex(oid);
+       } else if (Z_TYPE_PP(oid) == IS_ARRAY) {
+               zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(oid), &pos_oid);
        }
-       
-       if (st == SNMP_CMD_SET) {
-               type = stype[0];
-       } 
-
-       snmp_sess_init(&session);
-       strlcpy(hostname, a1, sizeof(hostname));
-       if ((pptr = strchr (hostname, ':'))) {
-               remote_port = strtol (pptr + 1, NULL, 0);
-       }
-
-       session.peername = hostname;
-       session.remote_port = remote_port;
-       session.version = version;
-       /*
-       * FIXME: potential memory leak
-       * This is a workaround for an "artifact" (Mike Slifcak)
-       * in (at least) ucd-snmp 3.6.1 which frees
-       * memory it did not allocate
-       */
-#ifdef UCD_SNMP_HACK
-       session.community = (u_char *)strdup(a2); /* memory freed by SNMP library, strdup NOT estrdup */
-#else
-       session.community = (u_char *)a2;
-#endif
-       session.community_len = a2_len;
-       session.retries = retries;
-       session.timeout = timeout;
-       
-       session.authenticator = NULL;
-
-       php_snmp_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, st, &session, a3, type, value);
-}
-/* }}} */
-
-/* {{{ proto string snmpget(string host, string community, string object_id [, int timeout [, int retries]]) 
-   Fetch a SNMP object */
-PHP_FUNCTION(snmpget)
-{
-       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,SNMP_CMD_GET, SNMP_VERSION_1);
-}
-/* }}} */
-
-/* {{{ proto string snmpgetnext(string host, string community, string object_id [, int timeout [, int retries]]) 
-   Fetch a SNMP object */
-PHP_FUNCTION(snmpgetnext)
-{
-       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,SNMP_CMD_GETNEXT, SNMP_VERSION_1);
-}
-/* }}} */
 
-/* {{{ proto array snmpwalk(string host, string community, string object_id [, int timeout [, int retries]]) 
-   Return all objects under the specified object id */
-PHP_FUNCTION(snmpwalk)
-{
-       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,SNMP_CMD_WALK, SNMP_VERSION_1);
-}
-/* }}} */
-
-/* {{{ proto array snmprealwalk(string host, string community, string object_id [, int timeout [, int retries]])
-   Return all objects including their respective object id withing the specified one */
-PHP_FUNCTION(snmprealwalk)
-{
-       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,SNMP_CMD_REALWALK, SNMP_VERSION_1);
-}
-/* }}} */
+       if (st & SNMP_CMD_SET) {
+               if (Z_TYPE_PP(type) != IS_ARRAY) {
+                       if (Z_ISREF_PP(type)) {
+                               SEPARATE_ZVAL(type);
+                       }
+                       convert_to_string_ex(type);
+               } else if (Z_TYPE_PP(type) == IS_ARRAY) {
+                       zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(type), &pos_type);
+               }
 
-/* {{{ proto bool snmp_get_quick_print(void)
-   Return the current status of quick_print */
-PHP_FUNCTION(snmp_get_quick_print)
-{
-       if (zend_parse_parameters_none() == FAILURE) {
-               return;
+               if (Z_TYPE_PP(value) != IS_ARRAY) {
+                       if (Z_ISREF_PP(value)) {
+                               SEPARATE_ZVAL(value);
+                       }
+                       convert_to_string_ex(value);
+               } else if (Z_TYPE_PP(value) == IS_ARRAY) {
+                       zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(value), &pos_value);
+               }
        }
 
-#ifdef HAVE_NET_SNMP
-       RETURN_BOOL(netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT));
-#else
-       RETURN_BOOL(snmp_get_quick_print());
-#endif
-}
-/* }}} */
+       objid_set->count = 0;
+       objid_set->array_output = ((st & SNMP_CMD_WALK) ? TRUE : FALSE);
+       if (Z_TYPE_PP(oid) == IS_STRING) {
+               objid_set->vars[objid_set->count].oid = Z_STRVAL_PP(oid);
+               if (st & SNMP_CMD_SET) {
+                       if (Z_TYPE_PP(type) == IS_STRING && Z_TYPE_PP(value) == IS_STRING) {
+                               if (Z_STRLEN_PP(type) != 1) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bogus type '%s', should be single char, got %u", Z_STRVAL_PP(type), Z_STRLEN_PP(type));
+                                       return FALSE;
+                               }
+                               pptr = Z_STRVAL_PP(type);
+                               objid_set->vars[objid_set->count].type = *pptr;
+                               objid_set->vars[objid_set->count].value = Z_STRVAL_PP(value);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Single objid and multiple type or values are not supported");
+                               return FALSE;
+                       }
+               }
+               objid_set->count++;
+       } else if (Z_TYPE_PP(oid) == IS_ARRAY) { // we got objid array
+               if (zend_hash_num_elements(Z_ARRVAL_PP(oid)) == 0) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Got empty OID array");
+                       return FALSE;
+               }
+               objid_set->array_output = ( (st & SNMP_CMD_SET) ? FALSE : TRUE );
+               for (   zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(oid), &pos_oid);
+                       zend_hash_get_current_data_ex(Z_ARRVAL_PP(oid), (void **) &tmp_oid, &pos_oid) == SUCCESS;
+                       zend_hash_move_forward_ex(Z_ARRVAL_PP(oid), &pos_oid) ) {
+
+                       convert_to_string_ex(tmp_oid);
+                       objid_set->vars[objid_set->count].oid = Z_STRVAL_PP(tmp_oid);
+                       if (st & SNMP_CMD_SET) {
+                               if (Z_TYPE_PP(type) == IS_STRING) {
+                                       pptr = Z_STRVAL_PP(type);
+                                       objid_set->vars[objid_set->count].type = *pptr;
+                               } else if (Z_TYPE_PP(type) == IS_ARRAY) {
+                                       if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(type), (void **) &tmp_type, &pos_type)) {
+                                               convert_to_string_ex(tmp_type);
+                                               if (Z_STRLEN_PP(tmp_type) != 1) {
+                                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s': bogus type '%s', should be single char, got %u", Z_STRVAL_PP(tmp_oid), Z_STRVAL_PP(tmp_type), Z_STRLEN_PP(tmp_type));
+                                                       return FALSE;
+                                               }
+                                               pptr = Z_STRVAL_PP(tmp_type);
+                                               objid_set->vars[objid_set->count].type = *pptr;
+                                               zend_hash_move_forward_ex(Z_ARRVAL_PP(type), &pos_type);
+                                       } else {
+                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s': no type set", Z_STRVAL_PP(tmp_oid));
+                                               return FALSE;
+                                       }
+                               }
 
-/* {{{ proto void snmp_set_quick_print(int quick_print)
-   Return all objects including their respective object id withing the specified one */
-PHP_FUNCTION(snmp_set_quick_print)
-{
-       long a1;
+                               if (Z_TYPE_PP(value) == IS_STRING) {
+                                       objid_set->vars[objid_set->count].value = Z_STRVAL_PP(value);
+                               } else if (Z_TYPE_PP(value) == IS_ARRAY) {
+                                       if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(value), (void **) &tmp_value, &pos_value)) {
+                                               convert_to_string_ex(tmp_value);
+                                               objid_set->vars[objid_set->count].value = Z_STRVAL_PP(tmp_value);
+                                               zend_hash_move_forward_ex(Z_ARRVAL_PP(value), &pos_value);
+                                       } else {
+                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s': no value set", Z_STRVAL_PP(tmp_oid));
+                                               return FALSE;
+                                       }
+                               }
+                       }
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &a1) == FAILURE) {
-               return;
+                       if (objid_set->count++ >= SNMP_MAXOIDS_IN_PDU) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not process more than %u OIDs in singe GET/GETNEXT/SET query", SNMP_MAXOIDS_IN_PDU);
+                               return FALSE;
+                       }
+               }
        }
 
-#ifdef HAVE_NET_SNMP
-       netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT, (int) a1);
-#else
-       snmp_set_quick_print((int)a1);
-#endif
+       objid_set->offset = 0;
+       objid_set->step = objid_set->count;
+       return (objid_set->count > 0);
 }
 /* }}} */
 
-#ifdef HAVE_NET_SNMP
-/* {{{ proto void snmp_set_enum_print(int enum_print)
-   Return all values that are enums with their enum value instead of the raw integer */
-PHP_FUNCTION(snmp_set_enum_print)
+/* {{{ netsnmp_session_init
+       allocates memory for session and session->peername, caller should free it manually using netsnmp_session_free() and efree()
+*/
+static int netsnmp_session_init(php_snmp_session **session_p, int version, char *hostname, char *community, int timeout, int retries)
 {
-       long a1;
+       int remote_port = SNMP_PORT;
+       php_snmp_session *session;
+       char *pptr;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &a1) == FAILURE) {
-               return;
+       *session_p = (php_snmp_session *)emalloc(sizeof(php_snmp_session));
+       session = *session_p;
+       if (session == NULL) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "emalloc() failed allocating session");
+               return (-1);
        }
 
-       netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM, (int) a1);
-} 
-/* }}} */
+       snmp_sess_init(session);
 
-/* {{{ proto void snmp_set_oid_output_format(int oid_format)
-   Set the OID output format. */
-PHP_FUNCTION(snmp_set_oid_output_format)
-{
-       long a1;
+       session->version = version;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &a1) == FAILURE) {
-               return;
+       session->peername = emalloc(MAX_NAME_LEN);
+       if(session->peername == NULL) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "emalloc() failed while copying hostname");
+               netsnmp_session_free(&session);
+               return (-1);
        }
 
-       switch ((int) a1) {
-               case 0:
-               case NETSNMP_OID_OUTPUT_FULL:
-                       a1 = NETSNMP_OID_OUTPUT_FULL;
-                       break;
-
-               default:
-               case NETSNMP_OID_OUTPUT_NUMERIC:
-                       a1 = NETSNMP_OID_OUTPUT_NUMERIC;
-                       break;
+       /* Reading the hostname and its optional non-default port number */
+       strlcpy(session->peername, hostname, MAX_NAME_LEN);
+       if ((pptr = strchr(session->peername, ':'))) {
+               remote_port = strtol(pptr + 1, NULL, 0);
        }
 
-       netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, a1);
-} 
-/* }}} */
-#endif
-
-/* {{{ proto int snmpset(string host, string community, string object_id, string type, mixed value [, int timeout [, int retries]]) 
-   Set the value of a SNMP object */
-PHP_FUNCTION(snmpset)
-{
-       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,SNMP_CMD_SET, SNMP_VERSION_1);
-}
-/* }}} */
+       session->remote_port = remote_port;
 
-/* {{{ int netsnmp_session_set_sec_name(struct snmp_session *s, char *name)
-   Set the security name in the snmpv3 session */
-static int netsnmp_session_set_sec_name(struct snmp_session *s, char *name)
-{
-       if ((s) && (name)) {
-               s->securityName = strdup(name);
-               s->securityNameLen = strlen(s->securityName);
-               return (0);
+       if (version == SNMP_VERSION_3) {
+               /* Setting the security name. */
+               session->securityName = strdup(community);
+               session->securityNameLen = strlen(session->securityName);
+       } else {
+               session->authenticator = NULL;
+#ifdef UCD_SNMP_HACK
+               session->community = (u_char *)strdup(community); /* memory freed by SNMP library, strdup NOT estrdup */
+#else
+               session->community = (u_char *)community;
+#endif
+               session->community_len = strlen(community);
        }
-       return (-1);
+
+       session->retries = retries;
+       session->timeout = timeout;
+       return (0);
 }
 /* }}} */
 
@@ -970,19 +1066,16 @@ static int netsnmp_session_set_sec_name(struct snmp_session *s, char *name)
    Set the security level in the snmpv3 session */
 static int netsnmp_session_set_sec_level(struct snmp_session *s, char *level TSRMLS_DC)
 {
-       if ((s) && (level)) {
-               if (!strcasecmp(level, "noAuthNoPriv") || !strcasecmp(level, "nanp")) {
-                       s->securityLevel = SNMP_SEC_LEVEL_NOAUTH;
-                       return (0);
-               } else if (!strcasecmp(level, "authNoPriv") || !strcasecmp(level, "anp")) {
-                       s->securityLevel = SNMP_SEC_LEVEL_AUTHNOPRIV;
-                       return (0);
-               } else if (!strcasecmp(level, "authPriv") || !strcasecmp(level, "ap")) {
-                       s->securityLevel = SNMP_SEC_LEVEL_AUTHPRIV;
-                       return (0);
-               }
+       if (!strcasecmp(level, "noAuthNoPriv") || !strcasecmp(level, "nanp")) {
+               s->securityLevel = SNMP_SEC_LEVEL_NOAUTH;
+       } else if (!strcasecmp(level, "authNoPriv") || !strcasecmp(level, "anp")) {
+               s->securityLevel = SNMP_SEC_LEVEL_AUTHNOPRIV;
+       } else if (!strcasecmp(level, "authPriv") || !strcasecmp(level, "ap")) {
+               s->securityLevel = SNMP_SEC_LEVEL_AUTHPRIV;
+       } else {
+               return (-1);
        }
-       return (-1);
+       return (0);
 }
 /* }}} */
 
@@ -990,18 +1083,17 @@ static int netsnmp_session_set_sec_level(struct snmp_session *s, char *level TSR
    Set the authentication protocol in the snmpv3 session */
 static int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot TSRMLS_DC)
 {
-       if ((s) && (prot)) {
-               if (!strcasecmp(prot, "MD5")) {
-                       s->securityAuthProto = usmHMACMD5AuthProtocol;
-                       s->securityAuthProtoLen = OIDSIZE(usmHMACMD5AuthProtocol);
-                       return (0);
-               } else if (!strcasecmp(prot, "SHA")) {
-                       s->securityAuthProto = usmHMACSHA1AuthProtocol;
-                       s->securityAuthProtoLen = OIDSIZE(usmHMACSHA1AuthProtocol);
-                       return (0);
-               }
+       if (!strcasecmp(prot, "MD5")) {
+               s->securityAuthProto = usmHMACMD5AuthProtocol;
+               s->securityAuthProtoLen = OIDSIZE(usmHMACMD5AuthProtocol);
+       } else if (!strcasecmp(prot, "SHA")) {
+               s->securityAuthProto = usmHMACSHA1AuthProtocol;
+               s->securityAuthProtoLen = OIDSIZE(usmHMACSHA1AuthProtocol);
+       } else {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown authentication protocol '%s'", prot TSRMLS_DC);
+               return (-1);
        }
-       return (-1);
+       return (0);
 }
 /* }}} */
 
@@ -1009,13 +1101,11 @@ static int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot
    Set the security protocol in the snmpv3 session */
 static int netsnmp_session_set_sec_protocol(struct snmp_session *s, char *prot TSRMLS_DC)
 {
-       if ((s) && (prot)) {
-               if (!strcasecmp(prot, "DES")) {
-                       s->securityPrivProto = usmDESPrivProtocol;
-                       s->securityPrivProtoLen = OIDSIZE(usmDESPrivProtocol);
-                       return (0);
+       if (!strcasecmp(prot, "DES")) {
+               s->securityPrivProto = usmDESPrivProtocol;
+               s->securityPrivProtoLen = OIDSIZE(usmDESPrivProtocol);
 #ifdef HAVE_AES
-               } else if (!strcasecmp(prot, "AES128")
+       } else if (!strcasecmp(prot, "AES128")
 #ifdef SNMP_VALIDATE_ERR
 /* 
 * In Net-SNMP before 5.2, the following symbols exist:
@@ -1031,28 +1121,26 @@ static int netsnmp_session_set_sec_protocol(struct snmp_session *s, char *prot T
 * array, so we cannot use the OIDSIZE macro because it uses sizeof().
 *
 */
-                       || !strcasecmp(prot, "AES")) {
-                       s->securityPrivProto = usmAES128PrivProtocol;
-                       s->securityPrivProtoLen = USM_PRIV_PROTO_AES128_LEN;
-                       return (0);
+               || !strcasecmp(prot, "AES")) {
+               s->securityPrivProto = usmAES128PrivProtocol;
+               s->securityPrivProtoLen = USM_PRIV_PROTO_AES128_LEN;
 #else                  
-               ) {
-                       s->securityPrivProto = usmAES128PrivProtocol;
-                       s->securityPrivProtoLen = OIDSIZE(usmAES128PrivProtocol);
-                       return (0);
-               } else if (!strcasecmp(prot, "AES192")) {
-                       s->securityPrivProto = usmAES192PrivProtocol;
-                       s->securityPrivProtoLen = OIDSIZE(usmAES192PrivProtocol);
-                       return (0);
-               } else if (!strcasecmp(prot, "AES256")) {
-                       s->securityPrivProto = usmAES256PrivProtocol;
-                       s->securityPrivProtoLen = OIDSIZE(usmAES256PrivProtocol);
-                       return (0);
+       ) {
+               s->securityPrivProto = usmAES128PrivProtocol;
+               s->securityPrivProtoLen = OIDSIZE(usmAES128PrivProtocol);
+       } else if (!strcasecmp(prot, "AES192")) {
+               s->securityPrivProto = usmAES192PrivProtocol;
+               s->securityPrivProtoLen = OIDSIZE(usmAES192PrivProtocol);
+       } else if (!strcasecmp(prot, "AES256")) {
+               s->securityPrivProto = usmAES256PrivProtocol;
+               s->securityPrivProtoLen = OIDSIZE(usmAES256PrivProtocol);
 #endif
 #endif
-               }
+       } else {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown security protocol '%s'", prot);
+               return (-1);
        }
-       return (-1);
+       return (0);
 }
 /* }}} */
 
@@ -1060,31 +1148,15 @@ static int netsnmp_session_set_sec_protocol(struct snmp_session *s, char *prot T
    Make key from pass phrase in the snmpv3 session */
 static int netsnmp_session_gen_auth_key(struct snmp_session *s, char *pass TSRMLS_DC)
 {
-       /*
-        * make master key from pass phrases 
-        */
-       if ((s) && (pass) && strlen(pass)) {
-               s->securityAuthKeyLen = USM_AUTH_KU_LEN;
-               if (s->securityAuthProto == NULL) {
-                       /* get .conf set default */
-                       const oid *def = get_default_authtype(&(s->securityAuthProtoLen));
-                       s->securityAuthProto = snmp_duplicate_objid(def, s->securityAuthProtoLen);
-               }
-               if (s->securityAuthProto == NULL) {
-                       /* assume MD5 */
-                       s->securityAuthProto =
-                               snmp_duplicate_objid(usmHMACMD5AuthProtocol, OIDSIZE(usmHMACMD5AuthProtocol));
-                       s->securityAuthProtoLen = OIDSIZE(usmHMACMD5AuthProtocol);
-               }
-               if (generate_Ku(s->securityAuthProto, s->securityAuthProtoLen,
-                               (u_char *) pass, strlen(pass),
-                               s->securityAuthKey, &(s->securityAuthKeyLen)) != SNMPERR_SUCCESS) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error generating a key for authentication pass phrase");
-                       return (-2);
-               }
-               return (0);
+       int snmp_errno;
+       s->securityAuthKeyLen = USM_AUTH_KU_LEN;
+       if ((snmp_errno = generate_Ku(s->securityAuthProto, s->securityAuthProtoLen,
+                       (u_char *) pass, strlen(pass),
+                       s->securityAuthKey, &(s->securityAuthKeyLen)))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error generating a key for authentication pass phrase '%s': %s", pass, snmp_api_errstring(snmp_errno));
+               return (-1);
        }
-       return (-1);
+       return (0);
 }
 /* }}} */
 
@@ -1092,228 +1164,438 @@ static int netsnmp_session_gen_auth_key(struct snmp_session *s, char *pass TSRML
    Make key from pass phrase in the snmpv3 session */
 static int netsnmp_session_gen_sec_key(struct snmp_session *s, u_char *pass TSRMLS_DC)
 {
-       if ((s) && (pass) && strlen(pass)) {
-               s->securityPrivKeyLen = USM_PRIV_KU_LEN;
-               if (s->securityPrivProto == NULL) {
-                       /* get .conf set default */
-                       const oid *def = get_default_privtype(&(s->securityPrivProtoLen));
-                       s->securityPrivProto = snmp_duplicate_objid(def, s->securityPrivProtoLen);
-               }
-               if (s->securityPrivProto == NULL) {
-                       /* assume DES */
-                       s->securityPrivProto = snmp_duplicate_objid(usmDESPrivProtocol,
-                               OIDSIZE(usmDESPrivProtocol));
-                       s->securityPrivProtoLen = OIDSIZE(usmDESPrivProtocol);
-               }
-               if (generate_Ku(s->securityAuthProto, s->securityAuthProtoLen,
-                               pass, strlen(pass),
-                               s->securityPrivKey, &(s->securityPrivKeyLen)) != SNMPERR_SUCCESS) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error generating a key for privacy pass phrase");
-                       return (-2);
-               }
-               return (0);
+       int snmp_errno;
+
+       s->securityPrivKeyLen = USM_PRIV_KU_LEN;
+       if ((snmp_errno = generate_Ku(s->securityAuthProto, s->securityAuthProtoLen,
+                       pass, strlen(pass),
+                       s->securityPrivKey, &(s->securityPrivKeyLen)))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error generating a key for privacy pass phrase '%s': %s", pass, snmp_api_errstring(snmp_errno));
+               return (-2);
        }
-       return (-1);
+       return (0);
 }
 /* }}} */
 
-/* {{{ proto string snmp2_get(string host, string community, string object_id [, int timeout [, int retries]]) 
-   Fetch a SNMP object */
-PHP_FUNCTION(snmp2_get)
+/* {{{ in netsnmp_session_set_contextEngineID(struct snmp_session *s, u_char * contextEngineID)
+   Set context Engine Id in the snmpv3 session */
+static int netsnmp_session_set_contextEngineID(struct snmp_session *s, u_char * contextEngineID)
 {
-       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,SNMP_CMD_GET, SNMP_VERSION_2c);
-}
-/* }}} */
+       size_t  ebuf_len = 32, eout_len = 0;
+       u_char  *ebuf = (u_char *) malloc(ebuf_len); /* memory freed by SNMP library, strdup NOT estrdup */
 
-/* {{{ proto string snmp2_getnext(string host, string community, string object_id [, int timeout [, int retries]]) 
-   Fetch a SNMP object */
-PHP_FUNCTION(snmp2_getnext)
-{
-       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,SNMP_CMD_GETNEXT, SNMP_VERSION_2c);
+       if (ebuf == NULL) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "malloc failure setting contextEngineID");
+               return (-1);
+       }
+       if (!snmp_hex_to_binary(&ebuf, &ebuf_len, &eout_len, 1, contextEngineID)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad engine ID value '%s'", contextEngineID);
+               free(ebuf);
+               return (-1);
+       }
+       s->contextEngineID = ebuf;
+       s->contextEngineIDLen = eout_len;
+       return (0);
 }
 /* }}} */
 
-/* {{{ proto array snmp2_walk(string host, string community, string object_id [, int timeout [, int retries]]) 
-   Return all objects under the specified object id */
-PHP_FUNCTION(snmp2_walk)
+/* {{{ php_set_security(struct snmp_session *session, char *sec_level, char *auth_protocol, char *auth_passphrase, char *priv_protocol, char *priv_passphrase, char *contextName, char *contextEngineID)
+   Set all snmpv3-related security options */
+static int netsnmp_session_set_security(struct snmp_session *session, char *sec_level, char *auth_protocol, char *auth_passphrase, char *priv_protocol, char *priv_passphrase, char *contextName, char *contextEngineID)
 {
-       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,SNMP_CMD_WALK, SNMP_VERSION_2c);
-}
-/* }}} */
 
-/* {{{ proto array snmp2_real_walk(string host, string community, string object_id [, int timeout [, int retries]])
-   Return all objects including their respective object id withing the specified one */
-PHP_FUNCTION(snmp2_real_walk)
-{
-       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,SNMP_CMD_REALWALK, SNMP_VERSION_2c);
-}
-/* }}} */
+       /* Setting the security level. */
+       if (netsnmp_session_set_sec_level(session, sec_level)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid security level '%s'", sec_level);
+               return (-1);
+       }
 
-/* {{{ proto int snmp2_set(string host, string community, string object_id, string type, mixed value [, int timeout [, int retries]]) 
-   Set the value of a SNMP object */
-PHP_FUNCTION(snmp2_set)
-{
-       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,SNMP_CMD_SET, SNMP_VERSION_2c);
+       if (session->securityLevel == SNMP_SEC_LEVEL_AUTHNOPRIV || session->securityLevel == SNMP_SEC_LEVEL_AUTHPRIV) {
+
+               /* Setting the authentication protocol. */
+               if (netsnmp_session_set_auth_protocol(session, auth_protocol)) {
+                       /* Warning message sent already, just bail out */
+                       return (-1);
+               }
+
+               /* Setting the authentication passphrase. */
+               if (netsnmp_session_gen_auth_key(session, auth_passphrase)) {
+                       /* Warning message sent already, just bail out */
+                       return (-1);
+               }
+
+               if (session->securityLevel == SNMP_SEC_LEVEL_AUTHPRIV) {
+                       /* Setting the security protocol. */
+                       if (netsnmp_session_set_sec_protocol(session, priv_protocol)) {
+                               /* Warning message sent already, just bail out */
+                               return (-1);
+                       }
+
+                       /* Setting the security protocol passphrase. */
+                       if (netsnmp_session_gen_sec_key(session, priv_passphrase)) {
+                               /* Warning message sent already, just bail out */
+                               return (-1);
+                       }
+               }
+       }
+
+       /* Setting contextName if specified */
+       if (contextName) {
+               session->contextName = contextName;
+               session->contextNameLen = strlen(contextName);
+       }
+
+       /* Setting contextEngineIS if specified */
+       if (contextEngineID && strlen(contextEngineID) && netsnmp_session_set_contextEngineID(session, contextEngineID)) {
+               /* Warning message sent already, just bail out */
+               return (-1);
+       }
+
+       return (0);
 }
 /* }}} */
 
-/* {{{ proto void php_snmpv3(INTERNAL_FUNCTION_PARAMETERS, int st)
-*
-* Generic SNMPv3 object fetcher
-* From here is passed on the the common internal object fetcher.
+/* {{{ php_snmp
 *
-* st=SNMP_CMD_GET   snmp3_get() - query an agent and return a single value.
-* st=SNMP_CMD_GETNEXT   snmp3_getnext() - query an agent and return the next single value.
-* st=SNMP_CMD_WALK   snmp3_walk() - walk the mib and return a single dimensional array 
-*                       containing the values.
-* st=SNMP_CMD_REALWALK   snmp3_real_walk() - walk the mib and return an 
-*                            array of oid,value pairs.
-* st=SNMP_CMD_SET  snmp3_set() - query an agent and set a single value
+* Generic SNMP handler for all versions.
+* This function makes use of the internal SNMP object fetcher.
+* Used both in old (non-OO) and OO API
 *
 */
-static void php_snmpv3(INTERNAL_FUNCTION_PARAMETERS, int st)
+static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version)
 {
-       char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
-       int a1_len, a2_len, a3_len, a4_len, a5_len, a6_len, a7_len, a8_len;
-       struct snmp_session session;
+       zval **oid, **value, **type;
+       char *a1, *a2, *a3, *a4, *a5, *a6, *a7;
+       int a1_len, a2_len, a3_len, a4_len, a5_len, a6_len, a7_len;
        long timeout = SNMP_DEFAULT_TIMEOUT;
        long retries = SNMP_DEFAULT_RETRIES;
-       char type = (char) 0;
-       char *value = (char *) 0, *stype = "";
-       int stype_len, value_len;       
-       char hostname[MAX_NAME_LEN];
-       int remote_port = 161;
-       char *pptr;
+       int non_repeaters = 0;
+       int max_repetitions = 20;
        int argc = ZEND_NUM_ARGS();
-       
-       if (st == SNMP_CMD_SET) {       
-               if (zend_parse_parameters(argc TSRMLS_CC, "ssssssssss|ll", &a1, &a1_len, &a2, &a2_len, &a3, &a3_len,
-                       &a4, &a4_len, &a5, &a5_len, &a6, &a6_len, &a7, &a7_len, &a8, &a8_len, &stype, &stype_len, &value, &value_len, &timeout, &retries) == FAILURE) {
-                       return;
+       struct objid_set objid_set;
+       php_snmp_session *session;
+       int session_less_mode = (getThis() == NULL);
+       int valueretrieval = SNMP_G(valueretrieval);
+       php_snmp_object *snmp_object;
+       php_snmp_object glob_snmp_object;
+
+       if (session_less_mode) {
+               if (version == SNMP_VERSION_3) {
+                       if (st & SNMP_CMD_SET) {
+                               if (zend_parse_parameters(argc TSRMLS_CC, "sssssssZZZ|ll", &a1, &a1_len, &a2, &a2_len, &a3, &a3_len,
+                                       &a4, &a4_len, &a5, &a5_len, &a6, &a6_len, &a7, &a7_len, &oid, &type, &value, &timeout, &retries) == FAILURE) {
+                                       RETURN_FALSE;
+                               }
+                       } else {
+                               /* SNMP_CMD_GET
+                                * SNMP_CMD_GETNEXT
+                                * SNMP_CMD_WALK
+                                */
+                               if (zend_parse_parameters(argc TSRMLS_CC, "sssssssZ|ll", &a1, &a1_len, &a2, &a2_len, &a3, &a3_len,
+                                       &a4, &a4_len, &a5, &a5_len, &a6, &a6_len, &a7, &a7_len, &oid, &timeout, &retries) == FAILURE) {
+                                       RETURN_FALSE;
+                               }
+                       }
+               } else {
+                       if (st & SNMP_CMD_SET) {
+                               if (zend_parse_parameters(argc TSRMLS_CC, "ssZZZ|ll", &a1, &a1_len, &a2, &a2_len, &oid, &type, &value, &timeout, &retries) == FAILURE) {
+                                       RETURN_FALSE;
+                               }
+                       } else {
+                               /* SNMP_CMD_GET
+                                * SNMP_CMD_GETNEXT
+                                * SNMP_CMD_WALK
+                                */
+                               if (zend_parse_parameters(argc TSRMLS_CC, "ssZ|ll", &a1, &a1_len, &a2, &a2_len, &oid, &timeout, &retries) == FAILURE) {
+                                       RETURN_FALSE;
+                               }
+                       }
                }
        } else {
-               /* SNMP_CMD_GET
-                * SNMP_CMD_GETNEXT
-                * SNMP_CMD_WALK
-                * SNMP_CMD_REALWALK
-                */
-               if (zend_parse_parameters(argc TSRMLS_CC, "ssssssss|ll", &a1, &a1_len, &a2, &a2_len, &a3, &a3_len,
-                       &a4, &a4_len, &a5, &a5_len, &a6, &a6_len, &a7, &a7_len, &a8, &a8_len, &timeout, &retries) == FAILURE) {
-                       return;
+               if (st & SNMP_CMD_SET) {
+                       if (zend_parse_parameters(argc TSRMLS_CC, "ZZZ", &oid, &type, &value) == FAILURE) {
+                               RETURN_FALSE;
+                       }
+               } else if (st & SNMP_CMD_WALK) {
+                       if (zend_parse_parameters(argc TSRMLS_CC, "Z|ll", &oid, &non_repeaters, &max_repetitions) == FAILURE) {
+                               RETURN_FALSE;
+                       }
+               } else {
+                       /* SNMP_CMD_GET
+                        * SNMP_CMD_GETNEXT
+                        */
+                       if (zend_parse_parameters(argc TSRMLS_CC, "Z", &oid) == FAILURE) {
+                               RETURN_FALSE;
+                       }
                }
        }
 
-       snmp_sess_init(&session);
-       /* This is all SNMPv3 */
-       session.version = SNMP_VERSION_3;
-
-       /* Reading the hostname and its optional non-default port number */
-       strlcpy(hostname, a1, sizeof(hostname));
-       if ((pptr = strchr(hostname, ':'))) {
-               remote_port = strtol(pptr + 1, NULL, 0);
-       }
-       session.peername = hostname;
-       session.remote_port = remote_port;
-
-       /* Setting the security name. */
-       if (netsnmp_session_set_sec_name(&session, a2)) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could net set security name: %s", a2);
-               RETURN_FALSE;
-       }
-
-       /* Setting the security level. */
-       if (netsnmp_session_set_sec_level(&session, a3 TSRMLS_CC)) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid security level: %s", a3);
-               RETURN_FALSE;
-       }
-
-       /* Setting the authentication protocol. */
-       if (netsnmp_session_set_auth_protocol(&session, a4 TSRMLS_CC)) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid authentication protocol: %s", a4);
-               RETURN_FALSE;
-       }
-
-       /* Setting the authentication passphrase. */
-       if (netsnmp_session_gen_auth_key(&session, a5 TSRMLS_CC)) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not generate key for authentication pass phrase: %s", a5);
+       if (!php_snmp_parse_oid(st, &objid_set, oid, type, value)) {
                RETURN_FALSE;
        }
 
-       /* Setting the security protocol. */
-       if (netsnmp_session_set_sec_protocol(&session, a6 TSRMLS_CC) && a6_len) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid security protocol: %s", a6);
-               RETURN_FALSE;
+       if (session_less_mode) {
+               if (netsnmp_session_init(&session, version, a1, a2, timeout, retries)) {
+                       RETURN_FALSE;
+               }
+               if (version == SNMP_VERSION_3 && netsnmp_session_set_security(session, a3 TSRMLS_CC, a4 TSRMLS_CC, a5 TSRMLS_CC, a6 TSRMLS_CC, a7 TSRMLS_CC, NULL, NULL)) {
+                       /* Warning message sent already, just bail out */
+                       RETURN_FALSE;
+               }
+       } else {
+               zval *object = getThis();
+               PHP_SNMP_SESSION_FROM_OBJECT(session, object);
+               snmp_object = (php_snmp_object *)zend_object_store_get_object(object TSRMLS_CC);
+               valueretrieval = snmp_object->valueretrieval;
+#ifdef HAVE_NET_SNMP
+               glob_snmp_object.enum_print = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM);
+               netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM, snmp_object->enum_print);
+               glob_snmp_object.quick_print = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT);
+               netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT, snmp_object->quick_print);
+               glob_snmp_object.oid_output_format = netsnmp_ds_get_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT);
+               netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, snmp_object->oid_output_format);
+#else
+               glob_snmp_object.quick_print = snmp_get_quick_print();
+               snmp_set_quick_print(snmp_object->quick_print);
+#endif
        }
 
-       /* Setting the security protocol passphrase. */
-       if (netsnmp_session_gen_sec_key(&session, a7 TSRMLS_CC) && a7_len) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not generate key for security pass phrase: %s", a7);
-               RETURN_FALSE;
-       }
+       php_snmp_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, st, session, &objid_set, non_repeaters, max_repetitions, valueretrieval);
 
-       if (st == SNMP_CMD_SET) {
-               type = stype[0];
+       if (session_less_mode) {
+               netsnmp_session_free(&session);
+       } else {
+#ifdef HAVE_NET_SNMP
+               netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM, glob_snmp_object.enum_print);
+               netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT, glob_snmp_object.quick_print);
+               netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, glob_snmp_object.oid_output_format);
+#else
+               snmp_set_quick_print(glob_snmp_object.quick_print);
+#endif
        }
-
-       session.retries = retries;
-       session.timeout = timeout;
-
-       php_snmp_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, st, &session, a8, type, value);
 }
 /* }}} */
 
-/* {{{ proto int snmp3_get(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, string object_id [, int timeout [, int retries]])
-   Fetch the value of a SNMP object */
-PHP_FUNCTION(snmp3_get)
+/* {{{ proto mixed snmpget(string host, string community, mixed object_id [, int timeout [, int retries]]) 
+   Fetch a SNMP object */
+PHP_FUNCTION(snmpget)
 {
-       php_snmpv3(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GET);
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GET, SNMP_VERSION_1);
 }
 /* }}} */
 
-/* {{{ proto int snmp3_getnext(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, string object_id [, int timeout [, int retries]])
-   Fetch the value of a SNMP object */
-PHP_FUNCTION(snmp3_getnext)
+/* {{{ proto mixed snmpgetnext(string host, string community, mixed object_id [, int timeout [, int retries]]) 
+   Fetch a SNMP object */
+PHP_FUNCTION(snmpgetnext)
 {
-       php_snmpv3(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GETNEXT);
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GETNEXT, SNMP_VERSION_1);
 }
 /* }}} */
 
-/* {{{ proto int snmp3_walk(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, string object_id [, int timeout [, int retries]])
-   Fetch the value of a SNMP object */
-PHP_FUNCTION(snmp3_walk)
+/* {{{ proto mixed snmpwalk(string host, string community, mixed object_id [, int timeout [, int retries]]) 
+   Return all objects under the specified object id */
+PHP_FUNCTION(snmpwalk)
 {
-       php_snmpv3(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_WALK);
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, (SNMP_CMD_WALK | SNMP_NUMERIC_KEYS), SNMP_VERSION_1);
 }
 /* }}} */
 
-/* {{{ proto int snmp3_real_walk(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, string object_id [, int timeout [, int retries]])
-   Fetch the value of a SNMP object */
-PHP_FUNCTION(snmp3_real_walk)
+/* {{{ proto mixed snmprealwalk(string host, string community, mixed object_id [, int timeout [, int retries]])
+   Return all objects including their respective object id withing the specified one */
+PHP_FUNCTION(snmprealwalk)
 {
-       php_snmpv3(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_REALWALK);
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_WALK, SNMP_VERSION_1);
 }
 /* }}} */
 
-/* {{{ proto int snmp3_set(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, string object_id, string type, mixed value [, int timeout [, int retries]])
-   Fetch the value of a SNMP object */
-PHP_FUNCTION(snmp3_set)
+/* {{{ proto bool snmpset(string host, string community, mixed object_id, mixed type, mixed value [, int timeout [, int retries]]) 
+   Set the value of a SNMP object */
+PHP_FUNCTION(snmpset)
 {
-       php_snmpv3(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_SET);
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_SET, SNMP_VERSION_1);
 }
 /* }}} */
 
-/* {{{ proto void snmp_set_valueretrieval(int method)
-   Specify the method how the SNMP values will be returned */
-PHP_FUNCTION(snmp_set_valueretrieval)
+/* {{{ proto bool snmp_get_quick_print(void)
+   Return the current status of quick_print */
+PHP_FUNCTION(snmp_get_quick_print)
 {
-       long method;
+       if (zend_parse_parameters_none() == FAILURE) {
+               return;
+       }
+
+#ifdef HAVE_NET_SNMP
+       RETURN_BOOL(netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT));
+#else
+       RETURN_BOOL(snmp_get_quick_print());
+#endif
+}
+/* }}} */
+
+/* {{{ proto bool snmp_set_quick_print(int quick_print)
+   Return all objects including their respective object id withing the specified one */
+PHP_FUNCTION(snmp_set_quick_print)
+{
+       long a1;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &a1) == FAILURE) {
+               RETURN_FALSE;
+       }
+
+#ifdef HAVE_NET_SNMP
+       netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT, (int)a1);
+#else
+       snmp_set_quick_print((int)a1);
+#endif
+       RETURN_TRUE;
+}
+/* }}} */
+
+#ifdef HAVE_NET_SNMP
+/* {{{ proto bool snmp_set_enum_print(int enum_print)
+   Return all values that are enums with their enum value instead of the raw integer */
+PHP_FUNCTION(snmp_set_enum_print)
+{
+       long a1;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &a1) == FAILURE) {
+               RETURN_FALSE;
+       }
+
+       netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM, (int) a1);
+       RETURN_TRUE;
+} 
+/* }}} */
+
+/* {{{ proto bool snmp_set_oid_output_format(int oid_format)
+   Set the OID output format. */
+PHP_FUNCTION(snmp_set_oid_output_format)
+{
+       long a1;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &a1) == FAILURE) {
+               RETURN_FALSE;
+       }
+
+       switch((int) a1) {
+               case NETSNMP_OID_OUTPUT_SUFFIX:
+               case NETSNMP_OID_OUTPUT_MODULE:
+               case NETSNMP_OID_OUTPUT_FULL:
+               case NETSNMP_OID_OUTPUT_NUMERIC:
+               case NETSNMP_OID_OUTPUT_UCD:
+               case NETSNMP_OID_OUTPUT_NONE:
+                       netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, a1);
+                       RETURN_TRUE;
+                       break;
+               default:
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown SNMP output print format '%d'", (int) a1);
+                       RETURN_FALSE;
+                       break;
+       }
+} 
+/* }}} */
+#endif
+
+/* {{{ proto mixed snmp2_get(string host, string community, mixed object_id [, int timeout [, int retries]]) 
+   Fetch a SNMP object */
+PHP_FUNCTION(snmp2_get)
+{
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GET, SNMP_VERSION_2c);
+}
+/* }}} */
+
+/* {{{ proto mixed snmp2_getnext(string host, string community, mixed object_id [, int timeout [, int retries]]) 
+   Fetch a SNMP object */
+PHP_FUNCTION(snmp2_getnext)
+{
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GETNEXT, SNMP_VERSION_2c);
+}
+/* }}} */
+
+/* {{{ proto mixed snmp2_walk(string host, string community, mixed object_id [, int timeout [, int retries]]) 
+   Return all objects under the specified object id */
+PHP_FUNCTION(snmp2_walk)
+{
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, (SNMP_CMD_WALK | SNMP_NUMERIC_KEYS), SNMP_VERSION_2c);
+}
+/* }}} */
+
+/* {{{ proto mixed snmp2_real_walk(string host, string community, mixed object_id [, int timeout [, int retries]])
+   Return all objects including their respective object id withing the specified one */
+PHP_FUNCTION(snmp2_real_walk)
+{
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_WALK, SNMP_VERSION_2c);
+}
+/* }}} */
+
+/* {{{ proto bool snmp2_set(string host, string community, mixed object_id, mixed type, mixed value [, int timeout [, int retries]]) 
+   Set the value of a SNMP object */
+PHP_FUNCTION(snmp2_set)
+{
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_SET, SNMP_VERSION_2c);
+}
+/* }}} */
+
+/* {{{ proto mixed snmp3_get(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, mixed object_id [, int timeout [, int retries]])
+   Fetch the value of a SNMP object */
+PHP_FUNCTION(snmp3_get)
+{
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GET, SNMP_VERSION_3);
+}
+/* }}} */
+
+/* {{{ proto mixed snmp3_getnext(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, mixed object_id [, int timeout [, int retries]])
+   Fetch the value of a SNMP object */
+PHP_FUNCTION(snmp3_getnext)
+{
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GETNEXT, SNMP_VERSION_3);
+}
+/* }}} */
+
+/* {{{ proto mixed snmp3_walk(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, mixed object_id [, int timeout [, int retries]])
+   Fetch the value of a SNMP object */
+PHP_FUNCTION(snmp3_walk)
+{
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, (SNMP_CMD_WALK | SNMP_NUMERIC_KEYS), SNMP_VERSION_3);
+}
+/* }}} */
+
+/* {{{ proto mixed snmp3_real_walk(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, mixed object_id [, int timeout [, int retries]])
+   Fetch the value of a SNMP object */
+PHP_FUNCTION(snmp3_real_walk)
+{
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_WALK, SNMP_VERSION_3);
+}
+/* }}} */
+
+/* {{{ proto bool snmp3_set(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, mixed object_id, mixed type, mixed value [, int timeout [, int retries]])
+   Fetch the value of a SNMP object */
+PHP_FUNCTION(snmp3_set)
+{
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_SET, SNMP_VERSION_3);
+}
+/* }}} */
+
+/* {{{ proto bool snmp_set_valueretrieval(int method)
+   Specify the method how the SNMP values will be returned */
+PHP_FUNCTION(snmp_set_valueretrieval)
+{
+       long method;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &method) == FAILURE) {
-               return;
+               RETURN_FALSE;
        }
 
-       if ((method == SNMP_VALUE_LIBRARY) || (method == SNMP_VALUE_PLAIN) || (method == SNMP_VALUE_OBJECT)) {
-               SNMP_G(valueretrieval) = method;
+       switch(method) {
+               case SNMP_VALUE_LIBRARY:
+               case SNMP_VALUE_PLAIN:
+               case SNMP_VALUE_OBJECT:
+                       SNMP_G(valueretrieval) = method;
+                       RETURN_TRUE;
+                       break;
+               default:
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown SNMP value retrieval method '%d'", method);
+                       RETURN_FALSE;
        }
 }
 /* }}} */
@@ -1326,7 +1608,7 @@ PHP_FUNCTION(snmp_get_valueretrieval)
 }
 /* }}} */
 
-/* {{{ proto int snmp_read_mib(string filename)
+/* {{{ proto bool snmp_read_mib(string filename)
    Reads and parses a MIB file into the active MIB tree. */
 PHP_FUNCTION(snmp_read_mib)
 {
@@ -1334,12 +1616,9 @@ PHP_FUNCTION(snmp_read_mib)
        int filename_len;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filename, &filename_len) == FAILURE) {
-               return;
+               RETURN_FALSE;
        }
 
-       /* Prevent read_mib() from printing any errors. */
-       snmp_disable_stderrlog();
-       
        if (!read_mib(filename)) {
                char *error = strerror(errno);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error while reading MIB file '%s': %s", filename, error);
@@ -1349,6 +1628,610 @@ PHP_FUNCTION(snmp_read_mib)
 }
 /* }}} */
 
+/* {{{ proto SNMP SNMP::open(int version, string hostname, string community|securityName [, long timeout [, long retries]])
+       Creates a new SNMP session to specified host. */
+PHP_METHOD(snmp, open)
+{
+       php_snmp_object *snmp_object;
+       zval *object = getThis();
+       char *a1, *a2;
+       int a1_len, a2_len;
+       long timeout = SNMP_DEFAULT_TIMEOUT;
+       long retries = SNMP_DEFAULT_RETRIES;
+       int version = SNMP_DEFAULT_VERSION;
+       int argc = ZEND_NUM_ARGS();
+#if PHP_VERSION_ID > 50300
+       zend_error_handling error_handling;
+#endif
+
+       snmp_object = (php_snmp_object *)zend_object_store_get_object(object TSRMLS_CC);
+#if PHP_VERSION_ID > 50300
+       zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
+#else
+       php_set_error_handling(EH_THROW, zend_exception_get_default(TSRMLS_C) TSRMLS_CC);
+#endif
+       
+       if (zend_parse_parameters(argc TSRMLS_CC, "lss|ll", &version, &a1, &a1_len, &a2, &a2_len, &timeout, &retries) == FAILURE) {
+#if PHP_VERSION_ID > 50300
+               zend_restore_error_handling(&error_handling TSRMLS_CC);
+#else
+               php_std_error_handling();
+#endif
+               return;
+       }
+
+#if PHP_VERSION_ID > 50300
+       zend_restore_error_handling(&error_handling TSRMLS_CC);
+#else
+       php_std_error_handling();
+#endif
+
+       switch(version) {
+               case SNMP_VERSION_1:
+               case SNMP_VERSION_2c:
+               case SNMP_VERSION_3:
+                       break;
+               default:
+                       zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Unknown SNMP protocol version", 0 TSRMLS_CC);
+                       return;
+       }
+
+       if (netsnmp_session_init(&(snmp_object->session), version, a1, a2, timeout, retries)) {
+               return;
+       }
+       snmp_object->valueretrieval = SNMP_G(valueretrieval);
+#ifdef HAVE_NET_SNMP
+       snmp_object->enum_print = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM);
+       snmp_object->oid_output_format = netsnmp_ds_get_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT);
+       snmp_object->quick_print = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT);
+#else
+       snmp_object->quick_print = snmp_get_quick_print();
+#endif
+}
+/* }}} */
+
+/* {{{ proto bool SNMP::close() 
+       Close SNMP session */
+PHP_METHOD(snmp, close)
+{
+       php_snmp_object *snmp_object;
+       zval *object = getThis();
+
+       snmp_object = (php_snmp_object *)zend_object_store_get_object(object TSRMLS_CC);
+
+       if (zend_parse_parameters_none() == FAILURE) {
+               RETURN_FALSE;
+       }
+
+       netsnmp_session_free(&(snmp_object->session));
+
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto mixed SNMP::get_assoc(mixed object_id) 
+   Fetch a SNMP object returing scalar for single OID and array of oid->value pairs for multi OID request */
+PHP_METHOD(snmp, get)
+{
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GET, (-1));
+}
+/* }}} */
+
+/* {{{ proto mixed SNMP::getnext(mixed object_id) 
+   Fetch a SNMP object returing scalar for single OID and array of oid->value pairs for multi OID request */
+PHP_METHOD(snmp, getnext)
+{
+       zval *object = getThis();
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GETNEXT, (-1));
+}
+/* }}} */
+
+/* {{{ proto mixed SNMP::walk(mixed object_id)
+   Return all objects including their respective object id withing the specified one as array of oid->value pairs */
+PHP_METHOD(snmp, walk)
+{
+       zval *object = getThis();
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_WALK, (-1));
+}
+/* }}} */
+
+/* {{{ proto bool SNMP::set(mixed object_id, mixed type, mixed value) 
+   Set the value of a SNMP object */
+PHP_METHOD(snmp, set)
+{
+       zval *object = getThis();
+       php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_SET, (-1));
+}
+
+/* {{{ proto bool SNMP::set_security(resource session, string sec_level, [ string auth_protocol, string auth_passphrase [, string priv_protocol, string priv_passphrase [, string contextName [, string contextEngineID]]]])
+       Set SNMPv3 security-related session parameters */
+PHP_METHOD(snmp, set_security)
+{
+       php_snmp_object *snmp_object;
+       zval *object = getThis();
+       char *a1 = "", *a2 = "", *a3 = "", *a4 = "", *a5 = "", *a6 = "", *a7 = "";
+       int a1_len, a2_len, a3_len, a4_len, a5_len, a6_len, a7_len;
+       int argc = ZEND_NUM_ARGS();
+
+       snmp_object = (php_snmp_object *)zend_object_store_get_object(object TSRMLS_CC);
+       
+       if (zend_parse_parameters(argc TSRMLS_CC, "s|ssssss", &a1, &a1_len, &a2, &a2_len, &a3, &a3_len,
+               &a4, &a4_len, &a5, &a5_len, &a6, &a6_len, &a7, &a7_len) == FAILURE) {
+               RETURN_FALSE;
+       }
+
+       if (netsnmp_session_set_security(snmp_object->session, a1, a2, a3, a4, a5, a6, a7)) {
+               /* Warning message sent already, just bail out */
+               RETURN_FALSE;
+       }
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ */
+void php_snmp_add_property(HashTable *h, const char *name, size_t name_length, php_snmp_read_t read_func, php_snmp_write_t write_func TSRMLS_DC)
+{
+       php_snmp_prop_handler p;
+
+       p.name = (char*) name;
+       p.name_length = name_length;
+       p.read_func = (read_func) ? read_func : NULL;
+       p.write_func = (write_func) ? write_func : NULL;
+       zend_hash_add(h, (char *)name, name_length + 1, &p, sizeof(php_snmp_prop_handler), NULL);
+}
+/* }}} */
+
+/* {{{ php_snmp_read_property(zval *object, zval *member, int type)
+   Generic object property reader */
+zval *php_snmp_read_property(zval *object, zval *member, int type TSRMLS_DC)
+{
+       zval tmp_member;
+       zval *retval;
+       php_snmp_object *obj;
+       php_snmp_prop_handler *hnd;
+       int ret;
+
+       ret = FAILURE;
+       obj = (php_snmp_object *)zend_objects_get_address(object TSRMLS_CC);
+
+       if (Z_TYPE_P(member) != IS_STRING) {
+               tmp_member = *member;
+               zval_copy_ctor(&tmp_member);
+               convert_to_string(&tmp_member);
+               member = &tmp_member;
+       }
+
+       ret = zend_hash_find(&php_snmp_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd);
+
+       if (ret == SUCCESS && hnd->read_func) {
+               ret = hnd->read_func(obj, &retval TSRMLS_CC);
+               if (ret == SUCCESS) {
+                       /* ensure we're creating a temporary variable */
+                       Z_SET_REFCOUNT_P(retval, 0);
+               } else {
+                       retval = EG(uninitialized_zval_ptr);
+               }
+       } else {
+               zend_object_handlers * std_hnd = zend_get_std_object_handlers();
+               retval = std_hnd->read_property(object, member, type TSRMLS_CC);
+       }
+
+       if (member == &tmp_member) {
+               zval_dtor(member);
+       }
+       return(retval);
+}
+/* }}} */
+
+/* {{{ php_snmp_write_property(zval *object, zval *member, zval *value)
+   Generic object property writer */
+void php_snmp_write_property(zval *object, zval *member, zval *value TSRMLS_DC)
+{
+       zval tmp_member;
+       php_snmp_object *obj;
+       php_snmp_prop_handler *hnd;
+       int ret;
+
+       if (Z_TYPE_P(member) != IS_STRING) {
+               tmp_member = *member;
+               zval_copy_ctor(&tmp_member);
+               convert_to_string(&tmp_member);
+               member = &tmp_member;
+       }
+
+       ret = FAILURE;
+       obj = (php_snmp_object *)zend_objects_get_address(object TSRMLS_CC);
+
+       ret = zend_hash_find(&php_snmp_properties, Z_STRVAL_P(member), Z_STRLEN_P(member) + 1, (void **) &hnd);
+
+       if (ret == SUCCESS && hnd->write_func) {
+               hnd->write_func(obj, value TSRMLS_CC);
+               if (! PZVAL_IS_REF(value) && Z_REFCOUNT_P(value) == 0) {
+                       Z_ADDREF_P(value);
+                       zval_ptr_dtor(&value);
+               }
+       } else {
+               zend_object_handlers * std_hnd = zend_get_std_object_handlers();
+               std_hnd->write_property(object, member, value TSRMLS_CC);
+       }
+
+       if (member == &tmp_member) {
+               zval_dtor(member);
+       }
+}
+/* }}} */
+
+/* {{{ php_snmp_has_property(zval *object, zval *member, int has_set_exists)
+   Generic object property checker */
+static int php_snmp_has_property(zval *object, zval *member, int has_set_exists TSRMLS_DC)
+{
+       php_snmp_object *obj = (php_snmp_object *)zend_objects_get_address(object TSRMLS_CC);
+       php_snmp_prop_handler *hnd;
+       int ret = 0;
+
+       if (zend_hash_find(&php_snmp_properties, Z_STRVAL_P(member), Z_STRLEN_P(member) + 1, (void **)&hnd) == SUCCESS) {
+               switch (has_set_exists) {
+                       case 2:
+                               ret = 1;
+                               break;
+                       case 0: {
+                               zval *value = php_snmp_read_property(object, member, BP_VAR_IS TSRMLS_CC);
+                               if (value != EG(uninitialized_zval_ptr)) {
+                                       ret = Z_TYPE_P(value) != IS_NULL? 1:0;
+                                       /* refcount is 0 */
+                                       Z_ADDREF_P(value);
+                                       zval_ptr_dtor(&value);
+                               }
+                               break;
+                       }
+                       default: {
+                               zval *value = php_snmp_read_property(object, member, BP_VAR_IS TSRMLS_CC);
+                               if (value != EG(uninitialized_zval_ptr)) {
+                                       convert_to_boolean(value);
+                                       ret = Z_BVAL_P(value)? 1:0;
+                                       /* refcount is 0 */
+                                       Z_ADDREF_P(value);
+                                       zval_ptr_dtor(&value);
+                               }
+                               break;
+                       }
+               }
+       } else {
+               zend_object_handlers * std_hnd = zend_get_std_object_handlers();
+               ret = std_hnd->has_property(object, member, has_set_exists TSRMLS_CC);
+       }
+       return ret;
+}
+/* }}} */
+
+/* {{{ php_snmp_get_properties(zval *object)
+   Returns all object properties. Injects SNMP properties into object on first call */
+static HashTable *php_snmp_get_properties(zval *object TSRMLS_DC)
+{
+       php_snmp_object *obj;
+       php_snmp_prop_handler *hnd;
+       HashTable *props;
+       zval *val;
+       char *key;
+       uint key_len;
+       HashPosition pos;
+       ulong num_key;
+
+       obj = (php_snmp_object *)zend_objects_get_address(object TSRMLS_CC);
+       props = obj->zo.properties;
+
+       zend_hash_internal_pointer_reset_ex(&php_snmp_properties, &pos);
+
+       while (zend_hash_get_current_data_ex(&php_snmp_properties, (void**)&hnd, &pos) == SUCCESS) {
+               zend_hash_get_current_key_ex(&php_snmp_properties, &key, &key_len, &num_key, 0, &pos);
+               MAKE_STD_ZVAL(val);
+               if (!hnd->read_func || hnd->read_func(obj, &val TSRMLS_CC) != SUCCESS) {
+                       val = EG(uninitialized_zval_ptr);
+               }
+               zend_hash_update(props, key, key_len, (void *)&val, sizeof(zval *), NULL);
+               zend_hash_move_forward_ex(&php_snmp_properties, &pos);
+       }
+       return obj->zo.properties;
+}
+/* }}} */
+
+/* {{{ */
+static int php_snmp_read_valueretrieval(php_snmp_object *snmp_object, zval **retval TSRMLS_DC)
+{
+       MAKE_STD_ZVAL(*retval);
+       ZVAL_LONG(*retval, snmp_object->valueretrieval);
+       return SUCCESS;
+}
+/* }}} */
+
+/* {{{ */
+static int php_snmp_read_quick_print(php_snmp_object *snmp_object, zval **retval TSRMLS_DC)
+{
+       MAKE_STD_ZVAL(*retval);
+       ZVAL_BOOL(*retval, snmp_object->quick_print);
+       return SUCCESS;
+}
+/* }}} */
+
+#ifdef HAVE_NET_SNMP
+/* {{{ */
+static int php_snmp_read_enum_print(php_snmp_object *snmp_object, zval **retval TSRMLS_DC)
+{
+       MAKE_STD_ZVAL(*retval);
+       ZVAL_BOOL(*retval, snmp_object->enum_print);
+       return SUCCESS;
+}
+/* }}} */
+
+/* {{{ */
+static int php_snmp_read_oid_output_format(php_snmp_object *snmp_object, zval **retval TSRMLS_DC)
+{
+       MAKE_STD_ZVAL(*retval);
+       ZVAL_LONG(*retval, snmp_object->oid_output_format);
+       return SUCCESS;
+}
+/* }}} */
+#endif
+
+/* {{{ */
+static int php_snmp_write_valueretrieval(php_snmp_object *snmp_object, zval *newval TSRMLS_DC)
+{
+       zval ztmp;
+       int ret = SUCCESS;
+       if (Z_TYPE_P(newval) != IS_LONG) {
+               ztmp = *newval;
+               zval_copy_ctor(&ztmp);
+               convert_to_long(&ztmp);
+               newval = &ztmp;
+       }
+
+       switch(Z_LVAL_P(newval)) {
+               case SNMP_VALUE_LIBRARY:
+               case SNMP_VALUE_PLAIN:
+               case SNMP_VALUE_OBJECT:
+                       snmp_object->valueretrieval = Z_LVAL_P(newval);
+                       break;
+               default:
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown SNMP value retrieval method '%d'", Z_LVAL_P(newval));
+                       ret = FAILURE;
+                       break;
+       }
+       
+       if (newval == &ztmp) {
+               zval_dtor(newval);
+       }
+
+       return ret;
+}
+/* }}} */
+
+/* {{{ */
+static int php_snmp_write_quick_print(php_snmp_object *snmp_object, zval *newval TSRMLS_DC)
+{
+       zval ztmp;
+       if (Z_TYPE_P(newval) != IS_BOOL) {
+               ztmp = *newval;
+               zval_copy_ctor(&ztmp);
+               convert_to_boolean(&ztmp);
+               newval = &ztmp;
+       }
+       
+       snmp_object->quick_print = Z_LVAL_P(newval);
+
+       if (newval == &ztmp) {
+               zval_dtor(newval);
+       }
+       return SUCCESS;
+}
+/* }}} */
+
+#ifdef HAVE_NET_SNMP
+/* {{{ */
+static int php_snmp_write_enum_print(php_snmp_object *snmp_object, zval *newval TSRMLS_DC)
+{
+       zval ztmp;
+       if (Z_TYPE_P(newval) != IS_BOOL) {
+               ztmp = *newval;
+               zval_copy_ctor(&ztmp);
+               convert_to_boolean(&ztmp);
+               newval = &ztmp;
+       }
+
+       snmp_object->enum_print = Z_LVAL_P(newval);
+       
+       if (newval == &ztmp) {
+               zval_dtor(newval);
+       }
+       return SUCCESS;
+}
+/* }}} */
+
+/* {{{ */
+static int php_snmp_write_oid_output_format(php_snmp_object *snmp_object, zval *newval TSRMLS_DC)
+{
+       zval ztmp;
+       int ret = SUCCESS;
+       if (Z_TYPE_P(newval) != IS_LONG) {
+               ztmp = *newval;
+               zval_copy_ctor(&ztmp);
+               convert_to_long(&ztmp);
+               newval = &ztmp;
+       }
+       
+       switch(Z_LVAL_P(newval)) {
+               case NETSNMP_OID_OUTPUT_SUFFIX:
+               case NETSNMP_OID_OUTPUT_MODULE:
+               case NETSNMP_OID_OUTPUT_FULL:
+               case NETSNMP_OID_OUTPUT_NUMERIC:
+               case NETSNMP_OID_OUTPUT_UCD:
+               case NETSNMP_OID_OUTPUT_NONE:
+                       snmp_object->oid_output_format = Z_LVAL_P(newval);
+                       break;
+               default:
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown SNMP output print format '%d'", Z_LVAL_P(newval));
+                       ret = FAILURE;
+                       break;
+       }
+
+       if (newval == &ztmp) {
+               zval_dtor(newval);
+       }
+       return ret;
+}
+#endif
+/* }}} */
+
+/* {{{ php_snmp_class_methods[] */
+static zend_function_entry php_snmp_class_methods[] = {
+       PHP_ME(snmp,     open,                          arginfo_snmp_open,              ZEND_ACC_PUBLIC)
+       PHP_ME(snmp,     close,                         arginfo_snmp_void,              ZEND_ACC_PUBLIC)
+       PHP_ME(snmp,     set_security,                  arginfo_snmp_set_security,      ZEND_ACC_PUBLIC)
+
+       PHP_ME(snmp,     get,                           arginfo_snmp_get,               ZEND_ACC_PUBLIC)
+       PHP_ME(snmp,     getnext,                       arginfo_snmp_get,               ZEND_ACC_PUBLIC)
+       PHP_ME(snmp,     walk,                          arginfo_snmp_walk,              ZEND_ACC_PUBLIC)
+       PHP_ME(snmp,     set,                           arginfo_snmp_set,               ZEND_ACC_PUBLIC)
+
+       PHP_MALIAS(snmp, __construct,   open,           arginfo_snmp_open,              ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       {NULL, NULL, NULL}
+};
+
+#define PHP_SNMP_PROPERTY_ENTRY_RECORD(name) \
+       { "" #name "",          sizeof("" #name "") - 1,        php_snmp_read_##name,   php_snmp_write_##name }
+
+const php_snmp_prop_handler php_snmp_property_entries[] = {
+       PHP_SNMP_PROPERTY_ENTRY_RECORD(valueretrieval),
+       PHP_SNMP_PROPERTY_ENTRY_RECORD(quick_print),
+#ifdef HAVE_NET_SNMP
+       PHP_SNMP_PROPERTY_ENTRY_RECORD(enum_print),
+       PHP_SNMP_PROPERTY_ENTRY_RECORD(oid_output_format),
+#endif
+       { NULL, 0, NULL, NULL}
+};
+/* }}} */
+
+/* {{{ PHP_MINIT_FUNCTION
+ */
+PHP_MINIT_FUNCTION(snmp)
+{
+       netsnmp_log_handler *logh;
+       zend_class_entry ce;
+
+       le_snmp_session = zend_register_list_destructors_ex(php_snmp_session_destructor, NULL, PHP_SNMP_SESSION_RES_NAME, module_number);
+
+       init_snmp("snmpapp");
+
+#ifdef NETSNMP_DS_LIB_DONT_PERSIST_STATE
+       /* Prevent update of the snmpapp.conf file */
+       netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DONT_PERSIST_STATE, 1);
+#endif
+
+       /* Disable logging, use exit status'es and related variabled to detect errors */
+       shutdown_snmp_logging();
+       logh = netsnmp_register_loghandler(NETSNMP_LOGHANDLER_NONE, LOG_ERR);
+       if (logh) {
+               logh->pri_max = LOG_ERR;
+       }
+
+       memcpy(&php_snmp_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       php_snmp_object_handlers.read_property = php_snmp_read_property;
+       php_snmp_object_handlers.write_property = php_snmp_write_property;
+       php_snmp_object_handlers.has_property = php_snmp_has_property;
+       php_snmp_object_handlers.get_properties = php_snmp_get_properties;
+
+       /* Register SNMP Class */
+       INIT_CLASS_ENTRY(ce, "SNMP", php_snmp_class_methods);
+       ce.create_object = php_snmp_object_new;
+       php_snmp_object_handlers.clone_obj = NULL;
+       php_snmp_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
+
+       /* Register SNMP Class properties */
+       zend_hash_init(&php_snmp_properties, 0, NULL, NULL, 1);
+       PHP_SNMP_ADD_PROPERTIES(&php_snmp_properties, php_snmp_property_entries);
+
+#ifdef HAVE_NET_SNMP
+       REGISTER_LONG_CONSTANT("SNMP_OID_OUTPUT_SUFFIX", NETSNMP_OID_OUTPUT_SUFFIX, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_OID_OUTPUT_MODULE", NETSNMP_OID_OUTPUT_MODULE, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_OID_OUTPUT_FULL", NETSNMP_OID_OUTPUT_FULL, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_OID_OUTPUT_NUMERIC", NETSNMP_OID_OUTPUT_NUMERIC, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_OID_OUTPUT_UCD", NETSNMP_OID_OUTPUT_UCD, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_OID_OUTPUT_NONE", NETSNMP_OID_OUTPUT_NONE, CONST_CS | CONST_PERSISTENT);
+#endif
+
+       REGISTER_LONG_CONSTANT("SNMP_VALUE_LIBRARY", SNMP_VALUE_LIBRARY, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_VALUE_PLAIN", SNMP_VALUE_PLAIN, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_VALUE_OBJECT", SNMP_VALUE_OBJECT, CONST_CS | CONST_PERSISTENT);
+
+       REGISTER_LONG_CONSTANT("SNMP_BIT_STR", ASN_BIT_STR, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_OCTET_STR", ASN_OCTET_STR, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_OPAQUE", ASN_OPAQUE, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_NULL", ASN_NULL, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_OBJECT_ID", ASN_OBJECT_ID, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_IPADDRESS", ASN_IPADDRESS, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_COUNTER", ASN_GAUGE, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_UNSIGNED", ASN_UNSIGNED, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_TIMETICKS", ASN_TIMETICKS, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_UINTEGER", ASN_UINTEGER, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_INTEGER", ASN_INTEGER, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_COUNTER64", ASN_COUNTER64, CONST_CS | CONST_PERSISTENT);
+
+       REGISTER_LONG_CONSTANT("SNMP_VERSION_1", SNMP_VERSION_1, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_VERSION_2c", SNMP_VERSION_2c, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("SNMP_VERSION_3", SNMP_VERSION_3, CONST_CS | CONST_PERSISTENT);
+
+       return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_MSHUTDOWN_FUNCTION
+ */
+PHP_MSHUTDOWN_FUNCTION(snmp)
+{
+       snmp_shutdown("snmpapp");
+       
+       zend_hash_destroy(&php_snmp_properties);
+
+       return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_MINFO_FUNCTION
+ */
+PHP_MINFO_FUNCTION(snmp)
+{
+       php_info_print_table_start();
+#ifdef HAVE_NET_SNMP
+       php_info_print_table_row(2, "NET-SNMP Support", "enabled");
+       php_info_print_table_row(2, "NET-SNMP Version", netsnmp_get_version());
+#else
+       php_info_print_table_row(2, "UCD-SNMP Support", "enabled");
+       php_info_print_table_row(2, "UCD-SNMP Version", VersionInfo);
+#endif
+       php_info_print_table_row(2, "PHP SNMP Version", PHP_SNMP_VERSION);
+       php_info_print_table_end();
+}
+/* }}} */
+
+/* {{{ snmp_module_entry
+ */
+zend_module_entry snmp_module_entry = {
+       STANDARD_MODULE_HEADER,
+       "snmp",
+       snmp_functions,
+       PHP_MINIT(snmp),
+       PHP_MSHUTDOWN(snmp),
+       NULL,
+       NULL,
+       PHP_MINFO(snmp),
+       PHP_SNMP_VERSION,
+       PHP_MODULE_GLOBALS(snmp),
+       PHP_GINIT(snmp),
+       NULL,
+       NULL,
+       STANDARD_MODULE_PROPERTIES_EX
+};
+/* }}} */
+
 #endif
 
 /*
diff --git a/ext/snmp/tests/README b/ext/snmp/tests/README
new file mode 100644 (file)
index 0000000..d87d17a
--- /dev/null
@@ -0,0 +1,63 @@
+SNMP Tests
+----------
+
+To enable these tests, you must have :
+- PHP compiled with SNMP (--with-snmp)
+- an SNMP server running.
+
+
+** How to test **
+You need to give credentials with environment vars if default ones are not
+sutable (see snmp_include.inc for more info):
+SNMP_HOSTNAME : IP or IP:PORT to connect to
+SNMP_COMMUNITY : community name
+SNMP_COMMUNITY_WRITE : community used for write tests (snmpset()).
+SNMP_MIBDIR : Directory containing MIBS
+
+** Configuring the SNMPD server **
+
+On Linux/FreeBSD
+--------
+
+- Install package net-snmpd (name may differ based on your distribution)
+- Edit config file (by default this is /etc/snmp/snmpd.conf on Linux and
+  usr/local/etc/snmp/snmpd.conf on FreeBSD) and replace whole content 
+  with following lines:
+  
+###### Config file #####
+rocommunity public 127.0.0.1
+rwcommunity private 127.0.0.1
+
+Do not enable them - being set here they make appropriate OID switch into r/o
+#syslocation  "Somewhere in the world"
+#syscontact  "root"
+
+#SNMPv3 credentials
+rouser adminMD5
+rouser adminSHA
+rwuser adminMD5AES
+rouser adminMD5AES128
+rouser adminMD5DES
+createUser adminMD5 MD5 test1234
+createUser adminSHA SHA test1234
+createUser adminMD5AES MD5 test1234 AES test1234
+createUser adminMD5AES128 MD5 test1234 AES test1234
+createUser adminMD5DES MD5 test1234 DES test1234
+
+createUser noAuthUser
+authuser read noAuthUser noauth
+###### End #####
+
+Before launching daemon make sure that there is no file /var/net-snmp/snmpd.conf
+Delete it if exists. Ingoring to to so will fail SNMPv3 tests
+
+Make snmpd bind on localhost only. To do so, pass '127.0.0.1' into it's startup arguments
+(see /etc/init.d/snmpd on Linux and set snmpd_flags="127.0.0.1" in rc.conf in FreeBSD).
+Otherwise your SNMP daemon will answer SNMPv3 messages from remote clients.
+
+- Launch snmpd (service snmpd start  or /etc/init.d/snmpd start)
+
+On Windows
+----------
+
+[to be completed]
diff --git a/ext/snmp/tests/clean.inc b/ext/snmp/tests/clean.inc
new file mode 100644 (file)
index 0000000..70ac0f5
--- /dev/null
@@ -0,0 +1,4 @@
+<?php
+include_once(dirname(__FILE__) . '/snmp_include.inc');
+
+// To be completed if necessary
diff --git a/ext/snmp/tests/generic_timeout_error.phpt b/ext/snmp/tests/generic_timeout_error.phpt
new file mode 100644 (file)
index 0000000..8a06c50
--- /dev/null
@@ -0,0 +1,22 @@
+--TEST--                                 
+Generic timeout (wrong community)
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+var_dump(snmpget($hostname, 'timeout_community_432', '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+
+?>
+--EXPECTF--
+Warning: snmpget(): No response from %s in %s on line %d
+bool(false)
\ No newline at end of file
diff --git a/ext/snmp/tests/skipif.inc b/ext/snmp/tests/skipif.inc
new file mode 100644 (file)
index 0000000..4d37902
--- /dev/null
@@ -0,0 +1,13 @@
+<?php
+extension_loaded('snmp') or die('skip snmp extension not available in this build');
+require_once (dirname(__FILE__).'/snmp_include.inc');
+
+//test server is available
+// this require snmpget to work ...
+//snmpget  ( string $hostname  , string $community  , 
+//string $object_id  [, int $timeout  [, int $retries  ]] )
+
+if (snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout) === false)
+       die('NO SNMPD on this host or community invalid');
+
diff --git a/ext/snmp/tests/snmp-object-error.phpt b/ext/snmp/tests/snmp-object-error.phpt
new file mode 100644 (file)
index 0000000..820ca2c
--- /dev/null
@@ -0,0 +1,84 @@
+--TEST--                                 
+Errors in SNMP session-wise functions 
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+try {
+var_dump(new SNMP(SNMP_VERSION_1, $hostname));
+} catch (Exception $e) {
+    print $e->getMessage() . "\n";
+}
+try {
+var_dump(new SNMP(SNMP_VERSION_1, $hostname, $community, ''));
+} catch (Exception $e) {
+    print $e->getMessage() . "\n";
+}
+try {
+var_dump(new SNMP(SNMP_VERSION_1, $hostname, $community, $timeout, ''));
+} catch (Exception $e) {
+    print $e->getMessage() . "\n";
+}
+try {
+var_dump(new SNMP(7, $hostname, $community));
+} catch (Exception $e) {
+    print $e->getMessage() . "\n";
+}
+
+echo "Open normal session\n";
+$session = new SNMP(SNMP_VERSION_3, $hostname, $user_noauth, $timeout, $retries);
+$session->valueretrieval = 67;
+var_dump($session->valueretrieval);
+echo "Closing session\n";
+var_dump($session->close(''));
+var_dump($session->close());
+var_dump($session->get('.1.3.6.1.2.1.1.1.0'));
+var_dump($session->close());
+
+$session = new SNMP(SNMP_VERSION_2c, $hostname, $community, $timeout, $retries);
+var_dump($session->walk('.1.3.6.1.2.1.1', ''));
+var_dump($session->walk('.1.3.6.1.2.1.1', 0, ''));
+var_dump($session->get());
+var_dump($session->set());
+
+?>
+--EXPECTF--
+SNMP::__construct() expects at least 3 parameters, 2 given
+SNMP::__construct() expects parameter 4 to be long, string given
+SNMP::__construct() expects parameter 5 to be long, string given
+Unknown SNMP protocol version
+Open normal session
+
+Warning: main(): Unknown SNMP value retrieval method '67' in %s on line %d
+int(%d)
+Closing session
+
+Warning: SNMP::close() expects exactly 0 parameters, 1 given in %s on line %d
+bool(false)
+bool(true)
+
+Warning: SNMP::get(): Invalid or uninitialized SNMP object in %s on line %d
+bool(false)
+bool(true)
+
+Warning: SNMP::walk() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+Warning: SNMP::walk() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+Warning: SNMP::get() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
+
+Warning: SNMP::set() expects exactly 3 parameters, 0 given in %s on line %d
+bool(false)
diff --git a/ext/snmp/tests/snmp-object-properties.phpt b/ext/snmp/tests/snmp-object-properties.phpt
new file mode 100644 (file)
index 0000000..6b368d6
--- /dev/null
@@ -0,0 +1,118 @@
+--TEST--                                 
+OO API: SNMP object properties
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_enum_print(false);
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+snmp_set_oid_output_format(SNMP_OID_OUTPUT_FULL);
+
+echo "Check working\n";
+
+$session = new SNMP(SNMP_VERSION_1, $hostname, $community, $timeout, $retries);
+var_dump($session);
+
+$session->enum_print = TRUE;
+$session->quick_print = TRUE;
+$session->valueretrieval = SNMP_VALUE_LIBRARY;
+$session->oid_output_format = SNMP_OID_OUTPUT_NUMERIC;
+
+var_dump($session);
+
+$session->enum_print = "1";
+$session->quick_print = "1";
+$session->valueretrieval = "1";
+$session->oid_output_format = "3";
+
+var_dump($session);
+
+var_dump(property_exists($session, "enum_print"));
+var_dump(isset($session->enum_print));
+var_dump(empty($session->enum_print));
+
+$param=123;
+$session->$param = "param_value";
+var_dump($session);
+var_dump($session->$param);
+var_dump(property_exists($session, $param));
+
+echo "Error handling\n";
+$param = 'there is no such parameter';
+var_dump($session->$param);
+var_dump(property_exists($session, $param));
+
+$session->valueretrieval = 67;
+var_dump($session->valueretrieval);
+$session->oid_output_format = 78;
+var_dump($session->oid_output_format);
+
+?>
+--EXPECTF--
+Check working
+object(SNMP)#%d (%d) {
+  ["valueretrieval"]=>
+  int(1)
+  ["quick_print"]=>
+  bool(false)
+  ["enum_print"]=>
+  bool(false)
+  ["oid_output_format"]=>
+  int(3)
+}
+object(SNMP)#%d (%d) {
+  ["valueretrieval"]=>
+  int(0)
+  ["quick_print"]=>
+  bool(true)
+  ["enum_print"]=>
+  bool(true)
+  ["oid_output_format"]=>
+  int(4)
+}
+object(SNMP)#%d (%d) {
+  ["valueretrieval"]=>
+  int(1)
+  ["quick_print"]=>
+  bool(true)
+  ["enum_print"]=>
+  bool(true)
+  ["oid_output_format"]=>
+  int(3)
+}
+bool(true)
+bool(true)
+bool(false)
+object(SNMP)#%d (%d) {
+  ["valueretrieval"]=>
+  int(1)
+  ["quick_print"]=>
+  bool(true)
+  ["enum_print"]=>
+  bool(true)
+  ["oid_output_format"]=>
+  int(3)
+  ["123"]=>
+  string(11) "param_value"
+}
+string(11) "param_value"
+bool(true)
+Error handling
+
+Notice: Undefined property: SNMP::$there is no such parameter in %s on line %d
+NULL
+bool(false)
+
+Warning: main(): Unknown SNMP value retrieval method '67' in %s on line %d
+int(1)
+
+Warning: main(): Unknown SNMP output print format '78' in %s on line %d
+int(3)
\ No newline at end of file
diff --git a/ext/snmp/tests/snmp-object-set_security_error.phpt b/ext/snmp/tests/snmp-object-set_security_error.phpt
new file mode 100644 (file)
index 0000000..c6cadb1
--- /dev/null
@@ -0,0 +1,66 @@
+--TEST--                                 
+OO API SNMP::set_security (errors)
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+$session = new SNMP(SNMP_VERSION_3, $hostname, $user_noauth, $timeout, $retries);
+$session->set_security('noAuthNoPriv');
+
+#echo "Checking error handling\n";
+var_dump($session->set_security());
+var_dump($session->set_security(''));
+var_dump($session->set_security('bugusPriv'));
+var_dump($session->set_security('authNoPriv', 'TTT'));
+var_dump($session->set_security('authNoPriv', 'MD5', ''));
+var_dump($session->set_security('authNoPriv', 'MD5', 'te'));
+var_dump($session->set_security('authPriv', 'MD5', $auth_pass, 'BBB'));
+var_dump($session->set_security('authPriv', 'MD5', $auth_pass, 'AES', ''));
+var_dump($session->set_security('authPriv', 'MD5', $auth_pass, 'AES', 'ty'));
+var_dump($session->set_security('authPriv', 'MD5', $auth_pass, 'AES', 'test12345', 'context', 'dsa'));
+
+var_dump($session->close());
+
+?>
+--EXPECTF--
+
+Warning: SNMP::set_security() expects at least 1 parameter, 0 given in %s on line %d
+bool(false)
+
+Warning: SNMP::set_security(): Invalid security level '' in %s on line %d
+bool(false)
+
+Warning: SNMP::set_security(): Invalid security level 'bugusPriv' in %s on line %d
+bool(false)
+
+Warning: SNMP::set_security(): Unknown authentication protocol 'TTT' in %s on line %d
+bool(false)
+
+Warning: SNMP::set_security(): Error generating a key for authentication pass phrase '': Generic error (The supplied password length is too short.) in %s on line %d
+bool(false)
+
+Warning: SNMP::set_security(): Error generating a key for authentication pass phrase 'te': Generic error (The supplied password length is too short.) in %s on line %d
+bool(false)
+
+Warning: SNMP::set_security(): Unknown security protocol 'BBB' in %s on line %d
+bool(false)
+
+Warning: SNMP::set_security(): Error generating a key for privacy pass phrase '': Generic error (The supplied password length is too short.) in %s on line %d
+bool(false)
+
+Warning: SNMP::set_security(): Error generating a key for privacy pass phrase 'ty': Generic error (The supplied password length is too short.) in %s on line %d
+bool(false)
+
+Warning: SNMP::set_security(): Bad engine ID value 'dsa' in %s on line %d
+bool(false)
+bool(true)
\ No newline at end of file
diff --git a/ext/snmp/tests/snmp-object.phpt b/ext/snmp/tests/snmp-object.phpt
new file mode 100644 (file)
index 0000000..c20be12
--- /dev/null
@@ -0,0 +1,161 @@
+--TEST--                                 
+OO API
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_enum_print(false);
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+snmp_set_oid_output_format(SNMP_OID_OUTPUT_FULL);
+
+echo "SNMPv1\n";
+$session = new SNMP(SNMP_VERSION_1, $hostname, $community, $timeout, $retries);
+$session->valueretrieval = SNMP_VALUE_LIBRARY;
+var_dump($session->get('.1.3.6.1.2.1.1.1.0'));
+var_dump($session->get(array('.1.3.6.1.2.1.1.1.0', '.1.3.6.1.2.1.1.3.0')));
+var_dump($session->getnext('.1.3.6.1.2.1.1.1.0'));
+var_dump($session->close());
+
+echo "SNMPv2\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->getnext('.1.3.6.1.2.1.1.1.0'));
+var_dump($session->close());
+
+echo "WALK multiple on single OID\n";
+$session = new SNMP(SNMP_VERSION_2c, $hostname, $community, $timeout, $retries);
+$z = $session->walk('.1.3.6.1.2.1.1');
+var_dump(gettype($z));
+var_dump(count($z));
+var_dump(key($z));
+var_dump(array_shift($z));
+var_dump($session->close());
+
+echo "WALK multiple on single OID, non_repeaters set to 0\n";
+$session = new SNMP(SNMP_VERSION_2c, $hostname, $community, $timeout, $retries);
+$z = $session->walk('.1.3.6.1.2.1.1', 0);
+var_dump(gettype($z));
+var_dump(count($z));
+var_dump(key($z));
+var_dump(array_shift($z));
+var_dump($session->close());
+
+echo "WALK multiple on single OID, non_repeaters set to 0, max_repetitions set to 30\n";
+$session = new SNMP(SNMP_VERSION_2c, $hostname, $community, $timeout, $retries);
+$z = $session->walk('.1.3.6.1.2.1.1', 0, 30);
+var_dump(gettype($z));
+var_dump(count($z));
+var_dump(key($z));
+var_dump(array_shift($z));
+var_dump($session->close());
+
+echo "SNMPv3 (default security settings)\n";
+$session = new SNMP(SNMP_VERSION_3, $hostname, $user_noauth, $timeout, $retries);
+#$session->set_security($user_noauth, 'noAuthNoPriv', '', '', '', '', '', '');
+var_dump($session->get('.1.3.6.1.2.1.1.1.0'));
+var_dump($session->getnext('.1.3.6.1.2.1.1.1.0'));
+var_dump($session->close());
+
+echo "SNMPv3 (noAuthNoPriv)\n";
+$session = new SNMP(SNMP_VERSION_3, $hostname, $user_noauth, $timeout, $retries);
+$session->set_security('noAuthNoPriv');
+var_dump($session->get('.1.3.6.1.2.1.1.1.0'));
+var_dump($session->getnext('.1.3.6.1.2.1.1.1.0'));
+var_dump($session->close());
+
+echo "SNMPv3 (authPriv)\n";
+$session = new SNMP(SNMP_VERSION_3, $hostname, $rwuser, $timeout, $retries);
+$session->set_security('authPriv', 'MD5', $auth_pass, 'AES', $priv_pass);
+var_dump($session->get('.1.3.6.1.2.1.1.1.0'));
+var_dump($session->getnext('.1.3.6.1.2.1.1.1.0'));
+var_dump($session->walk('.1.3.6.1.2.1.1.1.0'));
+var_dump($session->close());
+
+echo "SET single OID\n";
+$session = new SNMP(SNMP_VERSION_3, $hostname, $rwuser, $timeout, $retries);
+$session->set_security('authPriv', 'MD5', $auth_pass, 'AES', $priv_pass);
+$oid1 = 'SNMPv2-MIB::sysContact.0';
+$oldvalue1 = $session->get($oid1);
+$newvalue1 = $oldvalue1 . '0';
+
+$z = $session->set($oid1, 's', $newvalue1);
+var_dump($z);
+var_dump(($session->get($oid1) === $newvalue1));
+$z = $session->set($oid1, 's', $oldvalue1);
+var_dump($z);
+var_dump(($session->get($oid1) === $oldvalue1));
+var_dump($session->close());
+
+echo "SNMPv3, setting contextEngineID (authPriv)\n";
+$session = new SNMP(SNMP_VERSION_3, $hostname, $rwuser, $timeout, $retries);
+$session->set_security('authPriv', 'MD5', $auth_pass, 'AES', $priv_pass, '', 'aeeeff');
+var_dump($session->get('.1.3.6.1.2.1.1.1.0'));
+var_dump($session->close());
+
+?>
+--EXPECTF--
+SNMPv1
+string(%d) "%S"
+array(2) {
+  ["%s"]=>
+  string(%d) "%S"
+  ["%s"]=>
+  string(%d) "%S"
+}
+string(%d) "%S"
+bool(true)
+SNMPv2
+string(%d) "%S"
+string(%d) "%S"
+bool(true)
+WALK multiple on single OID
+string(5) "array"
+int(%d)
+string(%d) "%S"
+string(%d) "%S"
+bool(true)
+WALK multiple on single OID, non_repeaters set to 0
+string(5) "array"
+int(%d)
+string(%d) "%S"
+string(%d) "%S"
+bool(true)
+WALK multiple on single OID, non_repeaters set to 0, max_repetitions set to 30
+string(5) "array"
+int(%d)
+string(%d) "%S"
+string(%d) "%S"
+bool(true)
+SNMPv3 (default security settings)
+string(%d) "%S"
+string(%d) "%S"
+bool(true)
+SNMPv3 (noAuthNoPriv)
+string(%d) "%S"
+string(%d) "%S"
+bool(true)
+SNMPv3 (authPriv)
+string(%d) "%S"
+string(%d) "%S"
+array(1) {
+  [%s]=>
+  string(%d) "%S"
+}
+bool(true)
+SET single OID
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+SNMPv3, setting contextEngineID (authPriv)
+string(%d) "%S"
+bool(true)
\ No newline at end of file
diff --git a/ext/snmp/tests/snmp2_get.phpt b/ext/snmp/tests/snmp2_get.phpt
new file mode 100644 (file)
index 0000000..cc192c9
--- /dev/null
@@ -0,0 +1,107 @@
+--TEST--                                 
+Function snmp2_get
+--CREDITS--
+Olivier Doucet & Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+echo "Checking error handling\n";
+var_dump(snmp2_get($hostname, $community, '.1.3.6.1.2.1.1.1.0', ''));
+var_dump(snmp2_get($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout, ''));
+echo "Empty OID array\n";
+var_dump(snmp2_get($hostname, $community, array(), $timeout, $retries));
+
+echo "Checking working\n";
+echo "Single OID\n";
+var_dump(snmp2_get($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+echo "Single OID in array\n";
+var_dump(snmp2_get($hostname, $community, array('.1.3.6.1.2.1.1.1.0'), $timeout, $retries));
+echo "Multiple OID\n";
+var_dump(snmp2_get($hostname, $community, array('.1.3.6.1.2.1.1.1.0', '.1.3.6.1.2.1.1.3.0'), $timeout, $retries));
+
+echo "More error handling\n";
+echo "Single OID\n";
+var_dump(snmp2_get($hostname, $community, '.1.3.6.1.2..1.1.1.0', $timeout, $retries));
+echo "Single OID in array\n";
+var_dump(snmp2_get($hostname, $community, array('.1.3.6.1.2.1...1.1.0'), $timeout, $retries));
+echo "Multiple OID\n";
+var_dump(snmp2_get($hostname, $community, array('.1.3.6.1.2.1...1.1.0', '.1.3.6.1.2.1.1.3.0'), $timeout, $retries));
+
+echo "noSuchName checks\n";
+echo "Single OID\n";
+var_dump(snmp2_get($hostname, $community, '.1.3.6.1.2.1.1.1.110', $timeout, $retries));
+echo "Single OID in array\n";
+var_dump(snmp2_get($hostname, $community, array('.1.3.6.1.2.1.1.1.110'), $timeout, $retries));
+echo "Multiple OID\n";
+var_dump(snmp2_get($hostname, $community, array('.1.3.6.1.2.1.1.1.0', '.1.3.6.1.2.1.1.3.220'), $timeout, $retries));
+
+
+?>
+--EXPECTF--
+Checking error handling
+
+Warning: snmp2_get() expects parameter 4 to be long,%s given in %s on line %d
+bool(false)
+
+Warning: snmp2_get() expects parameter 5 to be long,%s given in %s on line %d
+bool(false)
+Empty OID array
+
+Warning: snmp2_get(): Got empty OID array in %s on line %d
+bool(false)
+Checking working
+Single OID
+%unicode|string%(%d) "%s"
+Single OID in array
+array(1) {
+  ["%s"]=>
+  %unicode|string%(%d) "%s"
+}
+Multiple OID
+array(2) {
+  ["%s"]=>
+  %unicode|string%(%d) "%s"
+  ["%s"]=>
+  %unicode|string%(%d) "%d"
+}
+More error handling
+Single OID
+
+Warning: snmp2_get(): Invalid object identifier: .1.3.6.1.2..1.1.1.0 in %s on line %d
+bool(false)
+Single OID in array
+
+Warning: snmp2_get(): Invalid object identifier: .1.3.6.1.2.1...1.1.0 in %s on line %d
+bool(false)
+Multiple OID
+
+Warning: snmp2_get(): Invalid object identifier: .1.3.6.1.2.1...1.1.0 in %s on line %d
+array(1) {
+  ["%s"]=>
+  %unicode|string%(%d) "%d"
+}
+noSuchName checks
+Single OID
+
+Warning: snmp2_get(): Error in packet at 'SNMPv2-MIB::sysDescr.110': No Such Instance currently exists at this OID in %s on line %d
+bool(false)
+Single OID in array
+
+Warning: snmp2_get(): Error in packet at 'SNMPv2-MIB::sysDescr.110': No Such Instance currently exists at this OID in %s on line %d
+bool(false)
+Multiple OID
+
+Warning: snmp2_get(): Error in packet at 'SNMPv2-MIB::sysUpTime.220': No Such Instance currently exists at this OID in %s on line %d
+array(1) {
+  ["%s"]=>
+  %unicode|string%(%d) "%s"
+}
diff --git a/ext/snmp/tests/snmp2_getnext.phpt b/ext/snmp/tests/snmp2_getnext.phpt
new file mode 100644 (file)
index 0000000..5c5abf4
--- /dev/null
@@ -0,0 +1,39 @@
+--TEST--                                 
+Function snmp2_getnext
+--CREDITS--
+Olivier Doucet & Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+echo "Single OID\n";
+var_dump(snmp2_getnext($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+echo "Single OID in array\n";
+var_dump(snmp2_getnext($hostname, $community, array('.1.3.6.1.2.1.1.1.0'), $timeout, $retries));
+echo "Multiple OID\n";
+var_dump(snmp2_getnext($hostname, $community, array('.1.3.6.1.2.1.1.1.0', '.1.3.6.1.2.1.1.6.0'), $timeout, $retries));
+
+?>
+--EXPECTF--
+Single OID
+%unicode|string%(%d) "%s"
+Single OID in array
+array(1) {
+  ["%s"]=>
+  %unicode|string%(%d) "%s"
+}
+Multiple OID
+array(2) {
+  ["%s"]=>
+  %unicode|string%(%d) "%s"
+  ["%s"]=>
+  %unicode|string%(%d) "%d"
+}
diff --git a/ext/snmp/tests/snmp2_real_walk.phpt b/ext/snmp/tests/snmp2_real_walk.phpt
new file mode 100644 (file)
index 0000000..afaabd4
--- /dev/null
@@ -0,0 +1,86 @@
+--TEST--                                 
+Function snmp2_real_walk
+--CREDITS--
+Olivier Doucet Olivier Doucet Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+echo "Checking error handling\n";
+var_dump(snmp2_real_walk($hostname, $community, '.1.3.6.1.2.1.1', ''));
+var_dump(snmp2_real_walk($hostname, $community, '.1.3.6.1.2.1.1', $timeout, ''));
+
+echo "Checking working\n";
+echo "Single OID\n";
+$return = snmp2_real_walk($hostname, $community, '.1.3.6.1.2.1.1', $timeout, $retries);
+var_dump(gettype($return));
+var_dump(sizeof($return));
+var_dump(key($return));
+var_dump(array_shift($return));
+
+echo "Single OID in array\n";
+$return = snmp2_real_walk($hostname, $community, array('.1.3.6.1.2.1.1'), $timeout, $retries);
+var_dump(gettype($return));
+var_dump(sizeof($return));
+var_dump(key($return));
+var_dump(array_shift($return));
+
+echo "More error handling\n";
+echo "Multiple correct OID\n";
+$return = snmp2_real_walk($hostname, $community, array('.1.3.6.1.2.1.1', '.1.3.6'), $timeout, $retries);
+var_dump($return);
+
+echo "Multiple OID with wrong OID\n";
+$return = snmp2_real_walk($hostname, $community, array('.1.3.6.1.2.1.1', '.1.3.6...1'), $timeout, $retries);
+var_dump($return);
+$return = snmp2_real_walk($hostname, $community, array('.1.3.6...1', '.1.3.6.1.2.1.1'), $timeout, $retries);
+var_dump($return);
+
+echo "Single nonexisting OID\n";
+$return = snmp2_real_walk($hostname, $community, array('.1.3.6.99999.0.99999.111'), $timeout, $retries);
+var_dump($return);
+
+?>
+--EXPECTF--
+Checking error handling
+
+Warning: snmp2_real_walk() expects parameter 4 to be long, %s given in %s on line %d
+bool(false)
+
+Warning: snmp2_real_walk() expects parameter 5 to be long, %s given in %s on line %d
+bool(false)
+Checking working
+Single OID
+%unicode|string%(5) "array"
+int(%d)
+string(%d) "%s"
+string(%d) "%s"
+Single OID in array
+%unicode|string%(5) "array"
+int(%d)
+string(%d) "%s"
+string(%d) "%s"
+More error handling
+Multiple correct OID
+
+Warning: snmp2_real_walk(): Multi OID walks are not supported! in %s on line %d
+bool(false)
+Multiple OID with wrong OID
+
+Warning: snmp2_real_walk(): Multi OID walks are not supported! in %s on line %d
+bool(false)
+
+Warning: snmp2_real_walk(): Multi OID walks are not supported! in %s on line %d
+bool(false)
+Single nonexisting OID
+
+Warning: snmp2_real_walk(): Error in packet at '%s': No more variables left in this MIB View (It is past the end of the MIB tree) in %s on line %d
+bool(false)
diff --git a/ext/snmp/tests/snmp2_set-nomib.phpt b/ext/snmp/tests/snmp2_set-nomib.phpt
new file mode 100644 (file)
index 0000000..e8106d8
--- /dev/null
@@ -0,0 +1,59 @@
+--TEST--                                 
+Function snmp2_set (without MIBs loading)
+--CREDITS--
+Boris Lytockin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--ENV--
+return <<<END
+MIBS=
+END;
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+echo "Check error handing\n";
+echo "Nonexisting OID\n";
+$z = snmp2_set($hostname, $communityWrite, '.1.3.6.777.888.999.444.0', 's', 'bbb', $timeout, $retries);
+var_dump($z);
+
+echo "Bogus OID\n";
+$z = snmp2_set($hostname, $communityWrite, '.1.3.6...777.888.999.444.0', 's', 'bbb', $timeout, $retries);
+var_dump($z);
+
+echo "Checking working\n";
+$oid1 = '.1.3.6.1.2.1.1.4.0';
+$oldvalue1 = snmpget($hostname, $communityWrite, $oid1, $timeout, $retries);
+$newvalue1 = $oldvalue1 . '0';
+
+echo "Single OID\n";
+$z = snmp2_set($hostname, $communityWrite, $oid1, 's', $newvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $newvalue1));
+$z = snmp2_set($hostname, $communityWrite, $oid1, 's', $oldvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+
+?>
+--EXPECTF--
+Check error handing
+Nonexisting OID
+
+Warning: snmp2_set(): Error in packet at '%s': notWritable (That object does not support modification) in %s on line %d
+bool(false)
+Bogus OID
+
+Warning: snmp2_set(): Invalid object identifier: %s in %s on line %d
+bool(false)
+Checking working
+Single OID
+bool(true)
+bool(true)
+bool(true)
+bool(true)
\ No newline at end of file
diff --git a/ext/snmp/tests/snmp2_set.phpt b/ext/snmp/tests/snmp2_set.phpt
new file mode 100644 (file)
index 0000000..d7c1364
--- /dev/null
@@ -0,0 +1,248 @@
+--TEST--                                 
+Function snmp2_set
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+echo "Check error handing\n";
+echo "4args (5 needed)\n";
+$z = snmp2_set($hostname, $communityWrite, 'SNMPv2-MIB::sysLocation.0');
+var_dump($z);
+
+echo "No type & no value (timeout & retries instead)\n";
+$z = snmp2_set($hostname, $communityWrite, 'SNMPv2-MIB::sysLocation.0', $timeout, $retries);
+var_dump($z);
+
+echo "No value (timeout instead), retries instead of timeout\n";
+$z = snmp2_set($hostname, $communityWrite, 'SNMPv2-MIB::sysLocation.0', 'q', $timeout, $retries);
+var_dump($z);
+
+echo "Bogus OID\n";
+$z = snmp2_set($hostname, $communityWrite, '.1.3.6.777.888.999.444.0', 's', 'bbb', $timeout, $retries);
+var_dump($z);
+
+echo "Checking working\n";
+$oid1 = 'SNMPv2-MIB::sysContact.0';
+$oldvalue1 = snmpget($hostname, $communityWrite, $oid1, $timeout, $retries);
+$newvalue1 = $oldvalue1 . '0';
+$oid2 = 'SNMPv2-MIB::sysLocation.0';
+$oldvalue2 = snmpget($hostname, $communityWrite, $oid1, $timeout, $retries);
+$newvalue2 = $oldvalue2 . '0';
+
+echo "Single OID\n";
+$z = snmp2_set($hostname, $communityWrite, $oid1, 's', $newvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $newvalue1));
+$z = snmp2_set($hostname, $communityWrite, $oid1, 's', $oldvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+
+echo "Multiple OID\n";
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), array('s','s'), array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $newvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $newvalue2));
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), array('s','s'), array($oldvalue1, $oldvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, single type & value\n";
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), 's', $newvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $newvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $newvalue1));
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), array('s','s'), array($oldvalue1, $oldvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, single type, multiple value\n";
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), 's', array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $newvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $newvalue2));
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), array('s','s'), array($oldvalue1, $oldvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+
+echo "More error handing\n";
+echo "Single OID, single type in array, single value\n";
+$z = snmp2_set($hostname, $communityWrite, $oid1, array('s'), $newvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Single OID, single type, single value in array\n";
+$z = snmp2_set($hostname, $communityWrite, $oid1, 's', array($newvalue1), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, 1st wrong type\n";
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), array('sw','s'), array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, 2nd wrong type\n";
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), array('s','sb'), array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, single type in array, multiple value\n";
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), array('s'), array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID & type, singe value in array\n";
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), array('s', 's'), array($newvalue1), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, 1st bogus, single type, multiple value\n";
+$z = snmp2_set($hostname, $communityWrite, array($oid1 . '44.55.66.77', $oid2), 's', array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, 2nd bogus, single type, multiple value\n";
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2 . '44.55.66.77'), 's', array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, single multiple type (1st bogus), multiple value\n";
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), array('q', 's'), array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, single multiple type (2nd bogus), multiple value\n";
+$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), array('s', 'w'), array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+?>
+--EXPECTF--
+Check error handing
+4args (5 needed)
+
+Warning: snmp2_set() expects at least 5 parameters, 3 given in %s on line %d
+bool(false)
+No type & no value (timeout & retries instead)
+
+Warning: snmp2_set(): Bogus type '-1', should be single char, got 2 in %s on line %d
+bool(false)
+No value (timeout instead), retries instead of timeout
+
+Warning: snmp2_set(): Could not add variable: OID='%s' type='q' value='%i': Bad variable type ("q") in %s on line %d
+bool(false)
+Bogus OID
+
+Warning: snmp2_set(): Error in packet at '%s': notWritable (That object does not support modification) in %s on line %d
+bool(false)
+Checking working
+Single OID
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Multiple OID
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Multiple OID, single type & value
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Multiple OID, single type, multiple value
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+More error handing
+Single OID, single type in array, single value
+
+Warning: snmp2_set(): Single objid and multiple type or values are not supported in %s on line %s
+bool(false)
+bool(true)
+bool(true)
+Single OID, single type, single value in array
+
+Warning: snmp2_set(): Single objid and multiple type or values are not supported in %s on line %s
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, 1st wrong type
+
+Warning: snmp2_set(): '%s': bogus type 'sw', should be single char, got 2 in %s on line %s
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, 2nd wrong type
+
+Warning: snmp2_set(): '%s': bogus type 'sb', should be single char, got 2 in %s on line %s
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, single type in array, multiple value
+
+Warning: snmp2_set(): '%s': no type set in %s on line %d
+bool(false)
+bool(true)
+bool(true)
+Multiple OID & type, singe value in array
+
+Warning: snmp2_set(): '%s': no value set in %s on line %d
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, 1st bogus, single type, multiple value
+
+Warning: snmp2_set(): Error in packet at '%s': noCreation (That table does not support row creation or that object can not ever be created) in %s on line %d
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, 2nd bogus, single type, multiple value
+
+Warning: snmp2_set(): Error in packet at '%s': noCreation (That table does not support row creation or that object can not ever be created) in %s on line %d
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, single multiple type (1st bogus), multiple value
+
+Warning: snmp2_set(): Could not add variable: OID='%s' type='q' value='%s': Bad variable type ("q") in %s on line %d
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, single multiple type (2nd bogus), multiple value
+
+Warning: snmp2_set(): Could not add variable: OID='%s' type='w' value='%s': Bad variable type ("w") in %s on line %d
+bool(false)
+bool(true)
+bool(true)
diff --git a/ext/snmp/tests/snmp2_walk.phpt b/ext/snmp/tests/snmp2_walk.phpt
new file mode 100644 (file)
index 0000000..e34fbe9
--- /dev/null
@@ -0,0 +1,99 @@
+--TEST--                                 
+Function snmp2_walk
+--CREDITS--
+Olivier Doucet Olivier Doucet Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+echo "Checking error handling\n";
+var_dump(snmp2_walk($hostname, $community, '.1.3.6.1.2.1.1', ''));
+var_dump(snmp2_walk($hostname, $community, '.1.3.6.1.2.1.1', $timeout, ''));
+
+echo "Checking working\n";
+echo "Single OID\n";
+$return = snmp2_walk($hostname, $community, '.1.3.6.1.2.1.1', $timeout, $retries);
+
+var_dump(gettype($return));
+var_dump(sizeof($return));
+var_dump(gettype($return[0]));
+var_dump(gettype($return[1]));
+
+echo "Single OID in array\n";
+$return = snmp2_walk($hostname, $community, array('.1.3.6.1.2.1.1'), $timeout, $retries);
+var_dump(gettype($return));
+var_dump(gettype($return[0]));
+
+echo "Default OID\n";
+$return = snmpwalk($hostname, $community, '', $timeout, $retries);
+var_dump(gettype($return));
+var_dump(gettype($return[0]));
+
+echo "More error handling\n";
+echo "Single incorrect OID\n";
+$return = snmpwalk($hostname, $community, '.1.3.6...1', $timeout, $retries);
+var_dump($return);
+
+echo "Multiple correct OID\n";
+$return = snmp2_walk($hostname, $community, array('.1.3.6.1.2.1.1', '.1.3.6'), $timeout, $retries);
+var_dump($return);
+
+echo "Multiple OID with wrong OID\n";
+$return = snmp2_walk($hostname, $community, array('.1.3.6.1.2.1.1', '.1.3.6...1'), $timeout, $retries);
+var_dump($return);
+$return = snmp2_walk($hostname, $community, array('.1.3.6...1', '.1.3.6.1.2.1.1'), $timeout, $retries);
+var_dump($return);
+
+echo "Single nonexisting OID\n";
+$return = snmp2_walk($hostname, $community, array('.1.3.6.99999.0.99999.111'), $timeout, $retries);
+var_dump($return);
+
+?>
+--EXPECTF--
+Checking error handling
+
+Warning: snmp2_walk() expects parameter 4 to be long, %s given in %s on line %d
+bool(false)
+
+Warning: snmp2_walk() expects parameter 5 to be long, %s given in %s on line %d
+bool(false)
+Checking working
+Single OID
+%unicode|string%(5) "array"
+int(32)
+%unicode|string%(6) "string"
+%unicode|string%(6) "string"
+Single OID in array
+%unicode|string%(5) "array"
+%unicode|string%(6) "string"
+Default OID
+%unicode|string%(5) "array"
+%unicode|string%(6) "string"
+More error handling
+Single incorrect OID
+
+Warning: snmpwalk(): Invalid object identifier: %s in %s on line %d
+bool(false)
+Multiple correct OID
+
+Warning: snmp2_walk(): Multi OID walks are not supported! in %s on line %d
+bool(false)
+Multiple OID with wrong OID
+
+Warning: snmp2_walk(): Multi OID walks are not supported! in %s on line %d
+bool(false)
+
+Warning: snmp2_walk(): Multi OID walks are not supported! in %s on line %d
+bool(false)
+Single nonexisting OID
+
+Warning: snmp2_walk(): Error in packet at '%s': No more variables left in this MIB View (It is past the end of the MIB tree) in %s on line %d
+bool(false)
diff --git a/ext/snmp/tests/snmp3-error.phpt b/ext/snmp/tests/snmp3-error.phpt
new file mode 100644 (file)
index 0000000..26551e7
--- /dev/null
@@ -0,0 +1,76 @@
+--TEST--                                 
+SNMPv3 Support (errors)
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+echo "Checking error handling\n";
+
+//int snmp3_get(string host, string sec_name, string sec_level, string auth_protocol, 
+//              string auth_passphrase, string priv_protocol, string priv_passphrase, 
+//              string object_id [, int timeout [, int retries]]);
+
+var_dump(snmp3_get($hostname, $community, '', '', '', '', ''));
+var_dump(snmp3_get($hostname, $community, '', '', '', '', '', ''));
+var_dump(snmp3_get($hostname, $community, 'bugusPriv', '', '', '', '', ''));
+var_dump(snmp3_get($hostname, $community, 'authNoPriv', 'TTT', '', '', '', ''));
+var_dump(snmp3_get($hostname, $community, 'authNoPriv', 'MD5', '', '', '', ''));
+var_dump(snmp3_get($hostname, $community, 'authNoPriv', 'MD5', 'te', '', '', ''));
+var_dump(snmp3_get($hostname, $community, 'authPriv', 'MD5', $auth_pass, 'BBB', '', ''));
+var_dump(snmp3_get($hostname, $community, 'authPriv', 'MD5', $auth_pass, 'AES', '', ''));
+var_dump(snmp3_get($hostname, $community, 'authPriv', 'MD5', $auth_pass, 'AES', 'ty', ''));
+var_dump(snmp3_get($hostname, 'somebogususer', 'authPriv', 'MD5', $auth_pass, 'AES', $priv_pass, '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+
+var_dump(snmp3_set($hostname, $community, 'authPriv', 'MD5', $auth_pass, 'AES', $priv_pass, '', 's'));
+
+var_dump(snmp3_set($hostname, $rwuser, 'authPriv', 'MD5', $auth_pass, 'AES', $priv_pass, '.1.3.6.777...7.5.3', 's', 'ttt', $timeout, $retries));
+var_dump(snmp3_set($hostname, $rwuser, 'authPriv', 'MD5', $auth_pass, 'AES', $priv_pass, '.1.3.6.777.7.5.3', array('s'), 'yyy', $timeout, $retries));
+
+?>
+--EXPECTF--
+Checking error handling
+
+Warning: snmp3_get() expects at least 8 parameters, 7 given in %s on line %d
+bool(false)
+
+Warning: snmp3_get(): Invalid security level '' in %s on line %d
+bool(false)
+
+Warning: snmp3_get(): Invalid security level 'bugusPriv' in %s on line %d
+bool(false)
+
+Warning: snmp3_get(): Unknown authentication protocol 'TTT' in %s on line %d
+bool(false)
+
+Warning: snmp3_get(): Error generating a key for authentication pass phrase '': Generic error (The supplied password length is too short.) in %s on line %d
+bool(false)
+
+Warning: snmp3_get(): Error generating a key for authentication pass phrase 'te': Generic error (The supplied password length is too short.) in %s on line %d
+bool(false)
+
+Warning: snmp3_get(): Unknown security protocol 'BBB' in %s on line %d
+bool(false)
+
+Warning: snmp3_get(): Error generating a key for privacy pass phrase '': Generic error (The supplied password length is too short.) in %s on line %d
+bool(false)
+
+Warning: snmp3_get(): Error generating a key for privacy pass phrase 'ty': Generic error (The supplied password length is too short.) in %s on line %d
+bool(false)
+
+Warning: snmp3_get(): Fatal error: Unknown user name in %s on line %d
+bool(false)
+
+Warning: snmp3_set() expects at least 10 parameters, 9 given in %s on line %d
+bool(false)
+
+Warning: snmp3_set(): Invalid object identifier: .1.3.6.777...7.5.3 in %s on line %d
+bool(false)
+
+Warning: snmp3_set(): Single objid and multiple type or values are not supported in %s on line %d
+bool(false)
\ No newline at end of file
diff --git a/ext/snmp/tests/snmp3.phpt b/ext/snmp/tests/snmp3.phpt
new file mode 100644 (file)
index 0000000..49d205f
--- /dev/null
@@ -0,0 +1,127 @@
+--TEST--                                 
+SNMPv3 Support
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//int snmp3_get(string host, string sec_name, string sec_level, string auth_protocol, 
+//              string auth_passphrase, string priv_protocol, string priv_passphrase, 
+//              string object_id [, int timeout [, int retries]]);
+
+echo "Working version\n";
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+echo "GET single: noAuthNoPriv\n";
+var_dump(snmp3_get($hostname, $user_noauth, 'noAuthNoPriv', '', '', '', '', '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+
+foreach(array('MD5', 'SHA') as $signalg) {
+       echo "GET single: $signalg\n";
+       var_dump(snmp3_get($hostname, $user_auth_prefix . $signalg, 'authNoPriv', $signalg, $auth_pass, '', '', '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+}
+
+foreach(array('AES', 'DES', 'AES128') as $chipher) {
+       echo "GET single: MD5/$chipher\n";
+       var_dump(snmp3_get($hostname, $user_auth_prefix . 'MD5' . $chipher, 'authPriv', 'MD5', $auth_pass, $chipher, $priv_pass, '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+}
+$username = $user_auth_prefix . 'MD5';
+echo "GET multiple\n";
+var_dump(snmp3_get($hostname, $username, 'authNoPriv', 'MD5', $auth_pass, '', '', array('.1.3.6.1.2.1.1.1.0', '.1.3.6.1.2.1.1.3.0'), $timeout, $retries));
+echo "GETNEXT single\n";
+var_dump(snmp3_getnext($hostname, $username, 'authNoPriv', 'MD5', $auth_pass, '', '', '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+
+echo "WALK single on single OID\n";
+$z = snmp3_walk($hostname, $username, 'authNoPriv', 'MD5', $auth_pass, '', '', '.1.3.6.1.2.1.1.1.0', $timeout, $retries);
+var_dump(gettype($z));
+var_dump(count($z));
+var_dump($z);
+
+echo "REALWALK single on single OID\n";
+$z = snmp3_real_walk($hostname, $username, 'authNoPriv', 'MD5', $auth_pass, '', '', '.1.3.6.1.2.1.1.1.0', $timeout, $retries);
+var_dump(gettype($z));
+var_dump(count($z));
+var_dump($z);
+
+echo "WALK multiple on single OID\n";
+$z = snmp3_walk($hostname, $username, 'authNoPriv', 'MD5', $auth_pass, '', '', '.1.3.6.1.2.1.1', $timeout, $retries);
+var_dump(gettype($z));
+var_dump(count($z));
+var_dump(key($z));
+var_dump(array_shift($z));
+
+echo "REALWALK multiple on single OID\n";
+$z = snmp3_real_walk($hostname, $username, 'authNoPriv', 'MD5', $auth_pass, 'AES', '', '.1.3.6.1.2.1.1', $timeout, $retries);
+var_dump(gettype($z));
+var_dump(count($z));
+var_dump(key($z));
+var_dump(array_shift($z));
+
+echo "SET single OID\n";
+$oid1 = 'SNMPv2-MIB::sysContact.0';
+$oldvalue1 = snmp3_get($hostname, $rwuser, 'authPriv', 'MD5', $auth_pass, 'AES', $priv_pass, $oid1, $timeout, $retries);
+$newvalue1 = $oldvalue1 . '0';
+
+$z = snmp3_set($hostname, $rwuser, 'authPriv', 'MD5', $auth_pass, 'AES', $priv_pass, $oid1, 's', $newvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmp3_get($hostname, $rwuser, 'authPriv', 'MD5', $auth_pass, 'AES', $priv_pass, $oid1, $timeout, $retries) === $newvalue1));
+$z = snmp3_set($hostname, $rwuser, 'authPriv', 'MD5', $auth_pass, 'AES', $priv_pass, $oid1, 's', $oldvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmp3_get($hostname, $rwuser, 'authPriv', 'MD5', $auth_pass, 'AES', $priv_pass, $oid1, $timeout, $retries) === $oldvalue1));
+
+?>
+--EXPECTF--
+Working version
+GET single: noAuthNoPriv
+%string|unicode%(%d) "%s"
+GET single: MD5
+%string|unicode%(%d) "%s"
+GET single: SHA
+%string|unicode%(%d) "%s"
+GET single: MD5/AES
+%string|unicode%(%d) "%s"
+GET single: MD5/DES
+%string|unicode%(%d) "%s"
+GET single: MD5/AES128
+%string|unicode%(%d) "%s"
+GET multiple
+array(2) {
+  ["%s"]=>
+  %string|unicode%(%d) "%s"
+  ["%s"]=>
+  %string|unicode%(%d) "%s"
+}
+GETNEXT single
+%string|unicode%(%d) "%s"
+WALK single on single OID
+%string|unicode%(5) "array"
+int(1)
+array(1) {
+  [0]=>
+  %string|unicode%(%d) "%s"
+}
+REALWALK single on single OID
+%string|unicode%(5) "array"
+int(1)
+array(1) {
+  ["%s"]=>
+  %string|unicode%(%d) "%s"
+}
+WALK multiple on single OID
+%string|unicode%(5) "array"
+int(%d)
+int(0)
+%string|unicode%(%d) "%s"
+REALWALK multiple on single OID
+%string|unicode%(5) "array"
+int(%d)
+%string|unicode%(%d) "%s"
+%string|unicode%(%d) "%s"
+SET single OID
+bool(true)
+bool(true)
+bool(true)
+bool(true)
diff --git a/ext/snmp/tests/snmp_get_quick_print.phpt b/ext/snmp/tests/snmp_get_quick_print.phpt
new file mode 100644 (file)
index 0000000..9abfd92
--- /dev/null
@@ -0,0 +1,41 @@
+--TEST--                                 
+Function snmp_get_quick_print / snmp_set_quick_print
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+echo "Checking error handling\n";
+var_dump(snmp_get_quick_print('noarg'));
+var_dump(snmp_set_quick_print('noarg'));
+var_dump(snmp_set_quick_print());
+
+echo "Checking working\n";
+var_dump(snmp_get_quick_print());
+snmp_set_quick_print(false);
+var_dump(snmp_get_quick_print());
+snmp_set_quick_print(true);
+var_dump(snmp_get_quick_print());
+
+?>
+--EXPECTF--
+Checking error handling
+
+Warning: snmp_get_quick_print() expects exactly 0 parameters, 1 given in %s on line %d
+NULL
+
+Warning: snmp_set_quick_print() expects parameter 1 to be long, %s given in %s on line %d
+bool(false)
+
+Warning: snmp_set_quick_print() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
+Checking working
+bool(%s)
+bool(false)
+bool(true)
+
diff --git a/ext/snmp/tests/snmp_get_valueretrieval.phpt b/ext/snmp/tests/snmp_get_valueretrieval.phpt
new file mode 100644 (file)
index 0000000..90bd0ba
--- /dev/null
@@ -0,0 +1,41 @@
+--TEST--                                 
+Function snmp_get_valueretrieval / snmp_set_valueretrieval
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+echo "Checking error handling\n";
+var_dump(snmp_get_valueretrieval('noarg'));
+var_dump(snmp_set_valueretrieval('noarg'));
+var_dump(snmp_set_valueretrieval(67));
+
+echo "Checking working\n";
+var_dump(snmp_get_valueretrieval());
+snmp_set_valueretrieval(SNMP_VALUE_LIBRARY);
+var_dump(snmp_get_valueretrieval() === SNMP_VALUE_LIBRARY);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+var_dump(snmp_get_valueretrieval() === SNMP_VALUE_PLAIN);
+snmp_set_valueretrieval(SNMP_VALUE_OBJECT);
+var_dump(snmp_get_valueretrieval() === SNMP_VALUE_OBJECT);
+
+?>
+--EXPECTF--
+Checking error handling
+int(%d)
+
+Warning: snmp_set_valueretrieval() expects parameter 1 to be long, %s given in %s on line %d
+bool(false)
+
+Warning: snmp_set_valueretrieval(): Unknown SNMP value retrieval method '67' in %s on line %d
+bool(false)
+Checking working
+int(%d)
+bool(true)
+bool(true)
+bool(true)
diff --git a/ext/snmp/tests/snmp_getvalue.phpt b/ext/snmp/tests/snmp_getvalue.phpt
new file mode 100644 (file)
index 0000000..0eefbb3
--- /dev/null
@@ -0,0 +1,46 @@
+--TEST--                                 
+Function snmp_getvalue
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+
+echo "Get with SNMP_VALUE_LIBRARY\n";
+snmp_set_valueretrieval(SNMP_VALUE_LIBRARY);
+var_dump(snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+
+echo "Get with SNMP_VALUE_PLAIN\n";
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+var_dump(snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+
+echo "Get with SNMP_VALUE_OBJECT\n";
+snmp_set_valueretrieval(SNMP_VALUE_OBJECT);
+$z = snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout, $retries);
+echo gettype($z)."\n";
+var_dump($z->type);
+var_dump($z->value);
+
+echo "Check parsing of different OID types\n";
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+var_dump(count(snmp2_walk($hostname, $community, '.', $timeout, $retries)));
+
+?>
+--EXPECTF--
+Get with SNMP_VALUE_LIBRARY
+string(%d) "STRING: %s"
+Get with SNMP_VALUE_PLAIN
+string(%d) "%s"
+Get with SNMP_VALUE_OBJECT
+object
+int(4)
+string(%d) "%s"
+Check parsing of different OID types
+int(%d)
diff --git a/ext/snmp/tests/snmp_include.inc b/ext/snmp/tests/snmp_include.inc
new file mode 100644 (file)
index 0000000..c914990
--- /dev/null
@@ -0,0 +1,29 @@
+<?php
+
+/*
+By default tests will try to access SNMP agent @ '127.0.0.1:161' and will use 'public' community for read
+requests and 'private' community for write requests.
+Default timeout is 1000ms and there will be one request performed.
+*/
+
+$hostname =    getenv('SNMP_HOSTNAME')         ? getenv('SNMP_HOSTNAME') :     '127.0.0.1';
+$port =                getenv('SNMP_PORT')             ? getenv('SNMP_PORT') :         '161';
+$hostname .= ":$port";
+$community =   getenv('SNMP_COMMUNITY')        ? getenv('SNMP_COMMUNITY') :    'public';
+$communityWrite = getenv('SNMP_COMMUNITY_WRITE')? getenv('SNMP_COMMUNITY_WRITE'):'private';
+
+$timeout =     getenv('SNMP_TIMEOUT') ?        getenv('SNMP_TIMEOUT') :        -1;
+$retries =     getenv('SNMP_RETRIES') ?        getenv('SNMP_RETRIES') :        1;
+
+if (stristr(PHP_OS, "FreeBSD")) {
+       $mibdir =       getenv('SNMP_MIBDIR')   ?       getenv('SNMP_MIBDIR') :         "/usr/local/share/snmp/mibs";
+} else {
+       $mibdir =       getenv('SNMP_MIBDIR')   ?       getenv('SNMP_MIBDIR') :         "/usr/share/snmp/mibs";
+}
+
+
+$user_noauth = getenv('SNMP_USER_NOAUTH') ?    getenv('SNMP_USER_NOAUTH') :    'noAuthUser';
+$user_auth_prefix = getenv('SNMP_USER_PREFIX') ? getenv('SNMP_USER_PREFIX') :  'admin';
+$rwuser =      getenv('SNMP_RWUSER') ?         getenv('SNMP_RWUSER') :         ($user_auth_prefix . 'MD5AES');
+$auth_pass =   getenv('SNMP_AUTH_PASS') ?      getenv('SNMP_AUTH_PASS') :      'test1234';
+$priv_pass =   getenv('SNMP_PRIV_PASS') ?      getenv('SNMP_PRIV_PASS') :      'test1234';
diff --git a/ext/snmp/tests/snmp_parse_oid.phpt b/ext/snmp/tests/snmp_parse_oid.phpt
new file mode 100644 (file)
index 0000000..e0017f5
--- /dev/null
@@ -0,0 +1,36 @@
+--TEST--                                 
+Function snmp_parse_oid
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+$oid1 = 'SNMPv2-MIB::sysContact.0';
+$type1 = 's';
+$oldvalue1 = snmpget($hostname, $communityWrite, $oid1, $timeout, $retries);
+$newvalue1 = $oldvalue1 . '0';
+
+echo "Checking SNMP_MAXOIDS_IN_PDU\n";
+$i  = 0;
+$oids = array();
+while($i++ < 128){
+       $oids[] = '.1.3.6.1.2.1.1.7.0';
+}
+$z = snmp2_get($hostname, $community, $oids, $timeout, $retries);
+var_dump($z);
+
+?>
+--EXPECTF--
+Checking SNMP_MAXOIDS_IN_PDU
+
+Warning: snmp2_get(): Could not process more than %d OIDs in singe GET/GETNEXT/SET query in %s on line %d
+bool(false)
\ No newline at end of file
diff --git a/ext/snmp/tests/snmp_read_mib.phpt b/ext/snmp/tests/snmp_read_mib.phpt
new file mode 100644 (file)
index 0000000..b26ba5e
--- /dev/null
@@ -0,0 +1,34 @@
+--TEST--                                 
+Function snmp_read_mib
+--CREDITS--
+Olivier Doucet Olivier Doucet Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+if (!file_exists($mibdir . '/SNMPv2-MIB.txt')) die('MIB file not in the system');
+
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+echo "Checking error handling\n";
+var_dump(snmp_read_mib());
+var_dump(snmp_read_mib(dirname(__FILE__).'/cannotfindthisfile'));
+
+echo "Checking working\n";
+var_dump(snmp_read_mib($mibdir . '/SNMPv2-MIB.txt'));
+
+?>
+--EXPECTF--
+Checking error handling
+
+Warning: snmp_read_mib() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
+
+Warning: snmp_read_mib(): Error while reading MIB file '%s': No such file or directory in %s on line %d
+bool(false)
+Checking working
+bool(true)
diff --git a/ext/snmp/tests/snmp_set_enum_print.phpt b/ext/snmp/tests/snmp_set_enum_print.phpt
new file mode 100644 (file)
index 0000000..9768344
--- /dev/null
@@ -0,0 +1,28 @@
+--TEST--                                 
+Function snmp_set_enum_print
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+if (!function_exists('snmp_set_enum_print')) die('This function is only available if using NET_SNMP');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+echo "Checking error handling\n";
+var_dump(snmp_set_enum_print());
+
+echo "Checking working\n";
+var_dump(snmp_set_enum_print(0));
+var_dump(snmp_set_enum_print(1));
+?>
+--EXPECTF--
+Checking error handling
+
+Warning: snmp_set_enum_print() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
+Checking working
+bool(true)
+bool(true)
diff --git a/ext/snmp/tests/snmp_set_oid_output_format.phpt b/ext/snmp/tests/snmp_set_oid_output_format.phpt
new file mode 100644 (file)
index 0000000..20a48d4
--- /dev/null
@@ -0,0 +1,32 @@
+--TEST--                                 
+Function snmp_set_oid_output_format
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+if (!function_exists('snmp_set_oid_output_format')) die('This function is only available if using NET_SNMP');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+echo "Checking error handling\n";
+var_dump(snmp_set_oid_output_format());
+var_dump(snmp_set_oid_output_format(123));
+
+echo "Checking working\n";
+var_dump(snmp_set_oid_output_format(SNMP_OID_OUTPUT_FULL));
+var_dump(snmp_set_oid_output_format(SNMP_OID_OUTPUT_NUMERIC));
+?>
+--EXPECTF--
+Checking error handling
+
+Warning: snmp_set_oid_output_format() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
+
+Warning: snmp_set_oid_output_format(): Unknown SNMP output print format '123' in %s on line %d
+bool(false)
+Checking working
+bool(true)
+bool(true)
diff --git a/ext/snmp/tests/snmpget.phpt b/ext/snmp/tests/snmpget.phpt
new file mode 100644 (file)
index 0000000..c2fca2d
--- /dev/null
@@ -0,0 +1,109 @@
+--TEST--                                 
+Function snmpget
+--CREDITS--
+Olivier Doucet & Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+echo "Checking error handling\n";
+var_dump(snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0', ''));
+var_dump(snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout, ''));
+
+echo "Checking working\n";
+echo "Single OID, default timeout and retries\n";
+var_dump(snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0'));
+echo "Single OID, default retries\n";
+var_dump(snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout));
+echo "Single OID\n";
+var_dump(snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+echo "Single OID in array\n";
+var_dump(snmpget($hostname, $community, array('.1.3.6.1.2.1.1.1.0'), $timeout, $retries));
+echo "Multiple OID\n";
+var_dump(snmpget($hostname, $community, array('.1.3.6.1.2.1.1.1.0', '.1.3.6.1.2.1.1.3.0'), $timeout, $retries));
+
+echo "More error handling\n";
+echo "Single OID\n";
+var_dump(snmpget($hostname, $community, '.1.3.6.1.2.1..1.1.0', $timeout, $retries));
+echo "Single OID in array\n";
+var_dump(snmpget($hostname, $community, array('.1.3.6.1.2.1...1.1.0'), $timeout, $retries));
+echo "Multiple OID\n";
+var_dump(snmpget($hostname, $community, array('.1.3.6.1.2.1...1.1.0', '.1.3.6.1.2.1.1.3.0'), $timeout, $retries));
+
+echo "noSuchName checks\n";
+echo "Single OID\n";
+var_dump(snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.110', $timeout, $retries));
+echo "Single OID in array\n";
+var_dump(snmpget($hostname, $community, array('.1.3.6.1.2.1.1.1.110'), $timeout, $retries));
+echo "Multiple OID\n";
+var_dump(snmpget($hostname, $community, array('.1.3.6.1.2.1.1.1.0', '.1.3.6.1.2.1.1.3.220'), $timeout, $retries));
+
+
+?>
+--EXPECTF--
+Checking error handling
+
+Warning: snmpget() expects parameter 4 to be long,%s given in %s on line %d
+bool(false)
+
+Warning: snmpget() expects parameter 5 to be long,%s given in %s on line %d
+bool(false)
+Checking working
+Single OID, default timeout and retries
+%unicode|string%(%d) "%s"
+Single OID, default retries
+%unicode|string%(%d) "%s"
+Single OID
+%unicode|string%(%d) "%s"
+Single OID in array
+array(1) {
+  ["%s"]=>
+  %unicode|string%(%d) "%s"
+}
+Multiple OID
+array(2) {
+  ["%s"]=>
+  %unicode|string%(%d) "%s"
+  ["%s"]=>
+  %unicode|string%(%d) "%d"
+}
+More error handling
+Single OID
+
+Warning: snmpget(): Invalid object identifier: .1.3.6.1.2.1..1.1.0 in %s on line %d
+bool(false)
+Single OID in array
+
+Warning: snmpget(): Invalid object identifier: .1.3.6.1.2.1...1.1.0 in %s on line %d
+bool(false)
+Multiple OID
+
+Warning: snmpget(): Invalid object identifier: .1.3.6.1.2.1...1.1.0 in %s on line %d
+array(1) {
+  ["%s"]=>
+  %unicode|string%(%d) "%d"
+}
+noSuchName checks
+Single OID
+
+Warning: snmpget(): Error in packet at 'SNMPv2-MIB::sysDescr.110': (noSuchName) There is no such variable name in this MIB. in %s on line %d
+bool(false)
+Single OID in array
+
+Warning: snmpget(): Error in packet at 'SNMPv2-MIB::sysDescr.110': (noSuchName) There is no such variable name in this MIB. in %s on line %d
+bool(false)
+Multiple OID
+
+Warning: snmpget(): Error in packet at 'SNMPv2-MIB::sysUpTime.220': (noSuchName) There is no such variable name in this MIB. in %s on line %d
+array(1) {
+  ["%s"]=>
+  %unicode|string%(%d) "%s"
+}
diff --git a/ext/snmp/tests/snmpgetnext.phpt b/ext/snmp/tests/snmpgetnext.phpt
new file mode 100644 (file)
index 0000000..af92d56
--- /dev/null
@@ -0,0 +1,39 @@
+--TEST--                                 
+Function snmpgetnext
+--CREDITS--
+Olivier Doucet & Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+echo "Single OID\n";
+var_dump(snmpgetnext($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+echo "Single OID in array\n";
+var_dump(snmpgetnext($hostname, $community, array('.1.3.6.1.2.1.1.1.0'), $timeout, $retries));
+echo "Multiple OID\n";
+var_dump(snmpgetnext($hostname, $community, array('.1.3.6.1.2.1.1.1.0', '.1.3.6.1.2.1.1.6.0'), $timeout, $retries));
+
+?>
+--EXPECTF--
+Single OID
+%unicode|string%(%d) "%s"
+Single OID in array
+array(1) {
+  ["%s"]=>
+  %unicode|string%(%d) "%s"
+}
+Multiple OID
+array(2) {
+  ["%s"]=>
+  %unicode|string%(%d) "%s"
+  ["%s"]=>
+  %unicode|string%(%d) "%d"
+}
diff --git a/ext/snmp/tests/snmprealwalk.phpt b/ext/snmp/tests/snmprealwalk.phpt
new file mode 100644 (file)
index 0000000..d1e343e
--- /dev/null
@@ -0,0 +1,86 @@
+--TEST--                                 
+Function snmprealwalk
+--CREDITS--
+Olivier Doucet Olivier Doucet Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+echo "Checking error handling\n";
+var_dump(snmprealwalk($hostname, $community, '.1.3.6.1.2.1.1', ''));
+var_dump(snmprealwalk($hostname, $community, '.1.3.6.1.2.1.1', $timeout, ''));
+
+echo "Checking working\n";
+echo "Single OID\n";
+$return = snmprealwalk($hostname, $community, '.1.3.6.1.2.1.1', $timeout, $retries);
+var_dump(gettype($return));
+var_dump(sizeof($return));
+var_dump(key($return));
+var_dump(array_shift($return));
+
+echo "Single OID in array\n";
+$return = snmprealwalk($hostname, $community, array('.1.3.6.1.2.1.1'), $timeout, $retries);
+var_dump(gettype($return));
+var_dump(sizeof($return));
+var_dump(key($return));
+var_dump(array_shift($return));
+
+echo "More error handling\n";
+echo "Multiple correct OID\n";
+$return = snmprealwalk($hostname, $community, array('.1.3.6.1.2.1.1', '.1.3.6'), $timeout, $retries);
+var_dump($return);
+
+echo "Multiple OID with wrong OID\n";
+$return = snmprealwalk($hostname, $community, array('.1.3.6.1.2.1.1', '.1.3.6...1'), $timeout, $retries);
+var_dump($return);
+$return = snmprealwalk($hostname, $community, array('.1.3.6...1', '.1.3.6.1.2.1.1'), $timeout, $retries);
+var_dump($return);
+
+echo "Single nonexisting OID\n";
+$return = snmprealwalk($hostname, $community, array('.1.3.6.99999.0.99999.111'), $timeout, $retries);
+var_dump($return);
+
+?>
+--EXPECTF--
+Checking error handling
+
+Warning: snmprealwalk() expects parameter 4 to be long, %s given in %s on line %d
+bool(false)
+
+Warning: snmprealwalk() expects parameter 5 to be long, %s given in %s on line %d
+bool(false)
+Checking working
+Single OID
+%unicode|string%(5) "array"
+int(%d)
+string(%d) "%s"
+string(%d) "%s"
+Single OID in array
+%unicode|string%(5) "array"
+int(%d)
+string(%d) "%s"
+string(%d) "%s"
+More error handling
+Multiple correct OID
+
+Warning: snmprealwalk(): Multi OID walks are not supported! in %s on line %d
+bool(false)
+Multiple OID with wrong OID
+
+Warning: snmprealwalk(): Multi OID walks are not supported! in %s on line %d
+bool(false)
+
+Warning: snmprealwalk(): Multi OID walks are not supported! in %s on line %d
+bool(false)
+Single nonexisting OID
+
+Warning: snmprealwalk(): Error in packet at '%s': (noSuchName) There is no such variable name in this MIB. in %s on line %d
+bool(false)
diff --git a/ext/snmp/tests/snmpset-nomib.phpt b/ext/snmp/tests/snmpset-nomib.phpt
new file mode 100644 (file)
index 0000000..39a455b
--- /dev/null
@@ -0,0 +1,60 @@
+--TEST--                                 
+Function snmpset (without MIBs loading)
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--ENV--
+return <<<END
+MIBS=
+END;
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+echo "Check error handing\n";
+echo "Nonexisting OID\n";
+$z = snmpset($hostname, $communityWrite, '.1.3.6.777.888.999.444.0', 's', 'bbb', $timeout, $retries);
+var_dump($z);
+
+echo "Bogus OID\n";
+$z = snmpset($hostname, $communityWrite, '.1.3...6.777.888.999.444.0', 's', 'bbb', $timeout, $retries);
+var_dump($z);
+
+
+echo "Checking working\n";
+$oid1 = '.1.3.6.1.2.1.1.4.0';
+$oldvalue1 = snmpget($hostname, $communityWrite, $oid1, $timeout, $retries);
+$newvalue1 = $oldvalue1 . '0';
+
+echo "Single OID\n";
+$z = snmpset($hostname, $communityWrite, $oid1, 's', $newvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $newvalue1));
+$z = snmpset($hostname, $communityWrite, $oid1, 's', $oldvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+
+?>
+--EXPECTF--
+Check error handing
+Nonexisting OID
+
+Warning: snmpset(): Error in packet at '%s': (noSuchName) There is no such variable name in this MIB. in %s on line %d
+bool(false)
+Bogus OID
+
+Warning: snmpset(): Invalid object identifier: %s in %s on line %d
+bool(false)
+Checking working
+Single OID
+bool(true)
+bool(true)
+bool(true)
+bool(true)
\ No newline at end of file
diff --git a/ext/snmp/tests/snmpset.phpt b/ext/snmp/tests/snmpset.phpt
new file mode 100644 (file)
index 0000000..055b789
--- /dev/null
@@ -0,0 +1,248 @@
+--TEST--                                 
+Function snmpset
+--CREDITS--
+Olivier Doucet Olivier Doucet Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+echo "Check error handing\n";
+echo "4args (5 needed)\n";
+$z = snmpset($hostname, $communityWrite, 'SNMPv2-MIB::sysLocation.0');
+var_dump($z);
+
+echo "No type & no value (timeout & retries instead)\n";
+$z = snmpset($hostname, $communityWrite, 'SNMPv2-MIB::sysLocation.0', $timeout, $retries);
+var_dump($z);
+
+echo "No value (timeout instead), retries instead of timeout\n";
+$z = snmpset($hostname, $communityWrite, 'SNMPv2-MIB::sysLocation.0', 'q', $timeout, $retries);
+var_dump($z);
+
+echo "Bogus OID\n";
+$z = snmpset($hostname, $communityWrite, '.1.3.6.777.888.999.444.0', 's', 'bbb', $timeout, $retries);
+var_dump($z);
+
+echo "Checking working\n";
+$oid1 = 'SNMPv2-MIB::sysContact.0';
+$oldvalue1 = snmpget($hostname, $communityWrite, $oid1, $timeout, $retries);
+$newvalue1 = $oldvalue1 . '0';
+$oid2 = 'SNMPv2-MIB::sysLocation.0';
+$oldvalue2 = snmpget($hostname, $communityWrite, $oid1, $timeout, $retries);
+$newvalue2 = $oldvalue2 . '0';
+
+echo "Single OID\n";
+$z = snmpset($hostname, $communityWrite, $oid1, 's', $newvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $newvalue1));
+$z = snmpset($hostname, $communityWrite, $oid1, 's', $oldvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+
+echo "Multiple OID\n";
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), array('s','s'), array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $newvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $newvalue2));
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), array('s','s'), array($oldvalue1, $oldvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, single type & value\n";
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), 's', $newvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $newvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $newvalue1));
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), array('s','s'), array($oldvalue1, $oldvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, single type, multiple value\n";
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), 's', array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $newvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $newvalue2));
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), array('s','s'), array($oldvalue1, $oldvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+
+echo "More error handing\n";
+echo "Single OID, single type in array, single value\n";
+$z = snmpset($hostname, $communityWrite, $oid1, array('s'), $newvalue1, $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Single OID, single type, single value in array\n";
+$z = snmpset($hostname, $communityWrite, $oid1, 's', array($newvalue1), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, 1st wrong type\n";
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), array('sw','s'), array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, 2nd wrong type\n";
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), array('s','sb'), array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, single type in array, multiple value\n";
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), array('s'), array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID & type, singe value in array\n";
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), array('s', 's'), array($newvalue1), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, 1st bogus, single type, multiple value\n";
+$z = snmpset($hostname, $communityWrite, array($oid1 . '44.55.66.77', $oid2), 's', array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, 2nd bogus, single type, multiple value\n";
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2 . '44.55.66.77'), 's', array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, single multiple type (1st bogus), multiple value\n";
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), array('q', 's'), array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+echo "Multiple OID, single multiple type (2nd bogus), multiple value\n";
+$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), array('s', 'w'), array($newvalue1, $newvalue2), $timeout, $retries);
+var_dump($z);
+var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
+var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
+
+?>
+--EXPECTF--
+Check error handing
+4args (5 needed)
+
+Warning: snmpset() expects at least 5 parameters, 3 given in %s on line %d
+bool(false)
+No type & no value (timeout & retries instead)
+
+Warning: snmpset(): Bogus type '-1', should be single char, got 2 in %s on line %d
+bool(false)
+No value (timeout instead), retries instead of timeout
+
+Warning: snmpset(): Could not add variable: OID='%s' type='q' value='%i': Bad variable type ("q") in %s on line %d
+bool(false)
+Bogus OID
+
+Warning: snmpset(): Error in packet at '%s': (noSuchName) There is no such variable name in this MIB. in %s on line %d
+bool(false)
+Checking working
+Single OID
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Multiple OID
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Multiple OID, single type & value
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Multiple OID, single type, multiple value
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+More error handing
+Single OID, single type in array, single value
+
+Warning: snmpset(): Single objid and multiple type or values are not supported in %s on line %s
+bool(false)
+bool(true)
+bool(true)
+Single OID, single type, single value in array
+
+Warning: snmpset(): Single objid and multiple type or values are not supported in %s on line %s
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, 1st wrong type
+
+Warning: snmpset(): '%s': bogus type 'sw', should be single char, got 2 in %s on line %s
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, 2nd wrong type
+
+Warning: snmpset(): '%s': bogus type 'sb', should be single char, got 2 in %s on line %s
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, single type in array, multiple value
+
+Warning: snmpset(): '%s': no type set in %s on line %d
+bool(false)
+bool(true)
+bool(true)
+Multiple OID & type, singe value in array
+
+Warning: snmpset(): '%s': no value set in %s on line %d
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, 1st bogus, single type, multiple value
+
+Warning: snmpset(): Error in packet at '%s': (noSuchName) There is no such variable name in this MIB. in %s on line %d
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, 2nd bogus, single type, multiple value
+
+Warning: snmpset(): Error in packet at '%s': (noSuchName) There is no such variable name in this MIB. in %s on line %d
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, single multiple type (1st bogus), multiple value
+
+Warning: snmpset(): Could not add variable: OID='%s' type='q' value='%s': Bad variable type ("q") in %s on line %d
+bool(false)
+bool(true)
+bool(true)
+Multiple OID, single multiple type (2nd bogus), multiple value
+
+Warning: snmpset(): Could not add variable: OID='%s' type='w' value='%s': Bad variable type ("w") in %s on line %d
+bool(false)
+bool(true)
+bool(true)
diff --git a/ext/snmp/tests/snmpwalk.phpt b/ext/snmp/tests/snmpwalk.phpt
new file mode 100644 (file)
index 0000000..dd184d6
--- /dev/null
@@ -0,0 +1,99 @@
+--TEST--                                 
+Function snmpwalk
+--CREDITS--
+Olivier Doucet Olivier Doucet Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+echo "Checking error handling\n";
+var_dump(snmpwalk($hostname, $community, '.1.3.6.1.2.1.1', ''));
+var_dump(snmpwalk($hostname, $community, '.1.3.6.1.2.1.1', $timeout, ''));
+
+echo "Checking working\n";
+echo "Single OID\n";
+$return = snmpwalk($hostname, $community, '.1.3.6.1.2.1.1', $timeout, $retries);
+
+var_dump(gettype($return));
+var_dump(sizeof($return));
+var_dump(gettype($return[0]));
+var_dump(gettype($return[1]));
+
+echo "Single OID in array\n";
+$return = snmpwalk($hostname, $community, array('.1.3.6.1.2.1.1'), $timeout, $retries);
+var_dump(gettype($return));
+var_dump(gettype($return[0]));
+
+echo "Default OID\n";
+$return = snmpwalk($hostname, $community, '', $timeout, $retries);
+var_dump(gettype($return));
+var_dump(gettype($return[0]));
+
+echo "More error handling\n";
+echo "Single incorrect OID\n";
+$return = snmpwalk($hostname, $community, '.1.3.6...1', $timeout, $retries);
+var_dump($return);
+
+echo "Multiple correct OID\n";
+$return = snmpwalk($hostname, $community, array('.1.3.6.1.2.1.1', '.1.3.6'), $timeout, $retries);
+var_dump($return);
+
+echo "Multiple OID with wrong OID\n";
+$return = snmpwalk($hostname, $community, array('.1.3.6.1.2.1.1', '.1.3.6...1'), $timeout, $retries);
+var_dump($return);
+$return = snmpwalk($hostname, $community, array('.1.3.6...1', '.1.3.6.1.2.1.1'), $timeout, $retries);
+var_dump($return);
+
+echo "Single nonexisting OID\n";
+$return = snmpwalk($hostname, $community, array('.1.3.6.99999.0.99999.111'), $timeout, $retries);
+var_dump($return);
+
+?>
+--EXPECTF--
+Checking error handling
+
+Warning: snmpwalk() expects parameter 4 to be long, %s given in %s on line %d
+bool(false)
+
+Warning: snmpwalk() expects parameter 5 to be long, %s given in %s on line %d
+bool(false)
+Checking working
+Single OID
+%unicode|string%(5) "array"
+int(%d)
+%unicode|string%(6) "string"
+%unicode|string%(6) "string"
+Single OID in array
+%unicode|string%(5) "array"
+%unicode|string%(6) "string"
+Default OID
+%unicode|string%(5) "array"
+%unicode|string%(6) "string"
+More error handling
+Single incorrect OID
+
+Warning: snmpwalk(): Invalid object identifier: %s in %s on line %d
+bool(false)
+Multiple correct OID
+
+Warning: snmpwalk(): Multi OID walks are not supported! in %s on line %d
+bool(false)
+Multiple OID with wrong OID
+
+Warning: snmpwalk(): Multi OID walks are not supported! in %s on line %d
+bool(false)
+
+Warning: snmpwalk(): Multi OID walks are not supported! in %s on line %d
+bool(false)
+Single nonexisting OID
+
+Warning: snmpwalk(): Error in packet at '%s': (noSuchName) There is no such variable name in this MIB. in %s on line %d
+bool(false)
diff --git a/ext/snmp/tests/wrong_hostname.phpt b/ext/snmp/tests/wrong_hostname.phpt
new file mode 100644 (file)
index 0000000..e7e18fc
--- /dev/null
@@ -0,0 +1,22 @@
+--TEST--                                 
+Generic timeout (wrong community)
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+//EXPECTF format is quickprint OFF
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
+
+var_dump(snmpget('192.168..6.1', 'community', '.1.3.6.1.2.1.1.1.0', $timeout, $retries));
+
+?>
+--EXPECTF--
+Warning: snmpget(): Could not open snmp connection: Unknown host (192.168..6.1) (Bad file descriptor) in %s on line %d
+bool(false)
\ No newline at end of file