archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- Fixed bug #37164 (snmp_set_oid_numeric_print() misbehaves)

Browse source 
. Renamed the function to snmp_set_oid_output_format() which describes
    it's behaviour better. Old one was left as an alias for it.
  . Added 2 new constants: SNMP_OID_OUTPUT_FULL and SNMP_OID_OUTPUT_NUMERIC
- Fixed some memleaks
# Included some ws fixes to annoy Derick. :)
This commit is contained in:
foobar 2006-07-27 05:12:33 +00:00
parent feaeb45937
commit 0d16411077
1 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

38
ext/snmp/snmp.c
View file

@ -124,7 +124,8 @@ zend_function_entry snmp_functions[] = {
PHP_FE(snmp_set_quick_print, NULL) PHP_FE(snmp_set_quick_print, NULL)
#ifdef HAVE_NET_SNMP #ifdef HAVE_NET_SNMP
PHP_FE(snmp_set_enum_print, NULL) PHP_FE(snmp_set_enum_print, NULL)
PHP_FE(snmp_set_oid_numeric_print, NULL) PHP_FE(snmp_set_oid_output_format, NULL)
PHP_FALIAS(snmp_set_oid_numeric_print, snmp_set_oid_output_format, NULL)
#endif #endif
PHP_FE(snmpset, NULL) PHP_FE(snmpset, NULL)
@ -198,6 +199,11 @@ PHP_MINIT_FUNCTION(snmp)
netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DONT_PERSIST_STATE, 1); netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DONT_PERSIST_STATE, 1);
#endif #endif
#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
REGISTER_LONG_CONSTANT("SNMP_VALUE_LIBRARY", SNMP_VALUE_LIBRARY, CONST_CS | CONST_PERSISTENT); 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_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_VALUE_OBJECT", SNMP_VALUE_OBJECT, CONST_CS | CONST_PERSISTENT);
@ -432,13 +438,13 @@ static void php_snmp_internal(INTERNAL_FUNCTION_PARAMETERS, int st,
RETURN_FALSE; RETURN_FALSE;
} }
} else if (st >= SNMP_CMD_WALK) { } else if (st >= SNMP_CMD_WALK) {
if (session->version == SNMP_VERSION_1) { if (session->version == SNMP_VERSION_1) {
pdu = snmp_pdu_create(SNMP_MSG_GETNEXT); pdu = snmp_pdu_create(SNMP_MSG_GETNEXT);
} else { } else {
pdu = snmp_pdu_create(SNMP_MSG_GETBULK); pdu = snmp_pdu_create(SNMP_MSG_GETBULK);
pdu->non_repeaters = 0; pdu->non_repeaters = 0;
pdu->max_repetitions = 20; pdu->max_repetitions = 20;
} }
snmp_add_null_var(pdu, name, name_length); snmp_add_null_var(pdu, name, name_length);
} }
@ -522,6 +528,9 @@ retry:
} }
} }
snmp_close(ss); snmp_close(ss);
if (st == SNMP_CMD_WALK || st == SNMP_CMD_REALWALK) {
zval_dtor(return_value);
}
RETURN_FALSE; RETURN_FALSE;
} }
} }
@ -731,9 +740,9 @@ PHP_FUNCTION(snmp_set_enum_print)
} }
/* }}} */ /* }}} */
/* {{{ proto void snmp_set_oid_numeric_print(int oid_numeric_print) /* {{{ proto void snmp_set_oid_output_format(int oid_format)
Return all objects including their respective object id withing the specified one */ Set the OID output format. */
PHP_FUNCTION(snmp_set_oid_numeric_print) PHP_FUNCTION(snmp_set_oid_output_format)
{ {
int argc = ZEND_NUM_ARGS(); int argc = ZEND_NUM_ARGS();
long a1; long a1;
@ -741,11 +750,20 @@ PHP_FUNCTION(snmp_set_oid_numeric_print)
if (zend_parse_parameters(argc TSRMLS_CC, "l", &a1) == FAILURE) { if (zend_parse_parameters(argc TSRMLS_CC, "l", &a1) == FAILURE) {
return; return;
} }
if ((int) a1 != 0) {
netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, switch ((int) a1) {
NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, case 0:
NETSNMP_OID_OUTPUT_NUMERIC); case NETSNMP_OID_OUTPUT_FULL:
a1 = NETSNMP_OID_OUTPUT_FULL;
break;
default:
case NETSNMP_OID_OUTPUT_NUMERIC:
a1 = NETSNMP_OID_OUTPUT_NUMERIC;
break;
} }
netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, a1);
} }
/* }}} */ /* }}} */
#endif #endif