[PHP-CVS] cvs: php4 /ext/snmp snmp.c

[Jani Taskinen]

sniper          Tue Oct 15 20:58:16 2002 EDT

  Modified files:              
    /php4/ext/snmp      snmp.c 
  Log:
  Some more compatibility fixes for net-snmp vs ucd-snmp
  
  
Index: php4/ext/snmp/snmp.c
diff -u php4/ext/snmp/snmp.c:1.63 php4/ext/snmp/snmp.c:1.64
--- php4/ext/snmp/snmp.c:1.63   Tue Oct 15 20:29:56 2002
+++ php4/ext/snmp/snmp.c        Tue Oct 15 20:58:15 2002
@@ -17,7 +17,7 @@
 |          Steven Lawrance <[EMAIL PROTECTED]>                |
 +----------------------------------------------------------------------+
 */
-/* $Id: snmp.c,v 1.63 2002/10/16 00:29:56 sniper Exp $ */
+/* $Id: snmp.c,v 1.64 2002/10/16 00:58:15 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -276,9 +276,11 @@
        session.community_len = Z_STRLEN_PP(a2);
        session.retries = retries;
        session.timeout = timeout;
-       
        session.authenticator = NULL;
+
+#ifndef HAVE_NET_SNMP
        snmp_synch_setup(&session);
+#endif
 
        if ((ss = snmp_open(&session)) == NULL) {
                php_error(E_WARNING,"Could not open snmp\n");
@@ -446,7 +448,11 @@
                WRONG_PARAM_COUNT;
        }
 
-       RETURN_LONG(snmp_get_quick_print() ? 1 : 0);
+#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
 }
 /* }}} */
 
@@ -461,7 +467,11 @@
                return;
        }
 
+#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
 }
 /* }}} */
 



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