Commit Graph

268 Commits

Author SHA1 Message Date
Boris Lytochkin
cc1ccefc0d backport r313324 2011-07-17 14:06:05 +00:00
Boris Lytochkin
281d0eade4 update ARG_INFO_EX for walk and get methods, fix comments 2011-07-17 13:57:28 +00:00
Boris Lytochkin
7a0bd8b967 remove PHP_VERSION_ID ifdef's, limiting to 5.4 branch 2011-06-12 12:26:51 +00:00
Boris Lytochkin
2b8026cfff merging from trunk (r312088...r312092):
move SNMP VERSION constants into SNMP class itself
fix typo in comment
no more method open
fix method names in header
2011-06-12 12:10:01 +00:00
Boris Lytochkin
edd80c571d move SNMP VERSION constants into SNMP class itself 2011-06-12 11:58:49 +00:00
Boris Lytochkin
0db6d3b16c fix typo in comment 2011-06-12 11:25:20 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Felipe Pena
4737910b69 - Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Boris Lytochkin
dbed284039 fixed typos in tests
ucd-snmp epoch is over, drop legacy memory allocation (non e*)
tune 'buggy snmp_snprint_value' detection on some systems
2011-05-10 20:04:26 +00:00
Boris Lytochkin
97930e9170 method renaming:
SNMP::get_errno() -> SNMP::getErrno()
SNMP::get_error() -> SNMP::getError()
2011-05-10 11:48:10 +00:00
Boris Lytochkin
9d2f7c1e3e remove method open, __construct is enough 2011-05-09 19:34:07 +00:00
Boris Lytochkin
ee0d7f3207 * new option for SNMP::get: force keys of return array be as in request array
* new option for SNMP::walk: use suffix of OID for keys in return array, not full OID
2011-05-08 13:58:37 +00:00
Boris Lytochkin
1dc02ac2de fix error reporting on OID not increasing
calling arguments markup
2011-05-08 09:20:58 +00:00
Boris Lytochkin
bbb4f679ae * Net-SNMP version detection and proper processing
* more UCD-SNMP-related code removal
2011-04-06 06:58:25 +00:00
Boris Lytochkin
cab643f615 * added detection and walkaround for net-snmp library bug (net-snmp BUGid 2027834)
* drop UCD-SNMP support, R.I.P.
2011-04-05 12:20:35 +00:00
Boris Lytochkin
14eaa5ac58 follow CS:
- method set_security should be named as setSecurity
 - SNMP_VERSION_2C constant
2011-03-20 20:07:33 +00:00
Boris Lytochkin
5d0c948296 revert r309111 (name_len was not a typo) 2011-03-19 20:50:39 +00:00
Boris Lytochkin
d890ece3fc fix typo in SNMP_SNPRINT_VALUE usage: use val_len, not name_length 2011-03-11 07:21:13 +00:00
Boris Lytochkin
8e600b817e * tune snmp2_walk.phpt
* more net-snmp v5.3 compatibility (OPAQUE_SPECIAL_TYPES)
2011-03-04 19:23:25 +00:00
Boris Lytochkin
3c0f1d5b95 * fix warning about redefining REGISTER_PDO_CLASS_CONST_LONG (damn copy'n'paste)
* tuned two unit test that failed at gcov.php.net/PHP_HEAD
2011-03-04 18:58:01 +00:00
Boris Lytochkin
661b552938 fix warnings mentioned in 'Parameter Parsing Report' 2011-03-02 22:12:02 +00:00
Boris Lytochkin
e9920cce1c remove compiler warnings
fix various memory leaks seen with --enable-debug
2011-02-26 19:08:55 +00:00
Boris Lytochkin
1c65920819 * new methods get_errno, get_error to get errno and error string
of last SNMP-related error
* formatting markup
* some fixes in max_oids logic: NULL will set it to default value,
    do not allow non-positive user-supplied values
* unit tests for changes
2011-02-26 08:27:26 +00:00
Boris Lytochkin
3ab69c4cff fix parse errors for non_repeaters & max_repetitions: aligment errors 2011-02-25 19:22:15 +00:00
Boris Lytochkin
430af9a0ab push most of SNMP query options into objid_query structure 2011-02-19 11:13:10 +00:00
Boris Lytochkin
73f5ee551c enable HAVE_SHUTDOWN_SNMP_LOGGING 2011-02-17 12:12:22 +00:00
Boris Lytochkin
6b81a9ac2e * Fix memory leak on concurrent new, open
* change comments to ANSI-C style
* added compatibility with net-snmp prior 5.4
2011-02-17 12:02:16 +00:00
Felipe Pena
b58c6f5ede - Fixed crash on unserialize(serialize(new SNMP)) 2011-02-15 00:07:26 +00:00
Felipe Pena
aef9557333 - Fixed memory leak on serialize(new SNMP) 2011-02-14 23:58:52 +00:00
Felipe Pena
be2bfd1bcf - Fixed memory leak 2011-02-14 23:43:22 +00:00
Boris Lytochkin
c50b3d7add fix crash caused by incorrect offset altering 2011-02-05 13:22:38 +00:00
Boris Lytochkin
f69e1100ce added r/o info property with basic session info,
fix crash in _get_properties in trunk
2011-02-05 00:29:31 +00:00
Pierre Joye
fefe9fc5c7 - fix build, wrong version id 2011-02-01 13:57:06 +00:00
Boris Lytochkin
2bc31f8027 preprocessed changes made in rev.307894:
keeping ext/snmp backwards compatible
2011-02-01 08:20:13 +00:00
Boris Lytochkin
dc781e2520 - Improved SNMP extension:
. Allow ~infinite OIDs in GET/GETNEXT/SET queries. Autochunk them to max_oids
    upon request.
2011-02-01 07:45:30 +00:00
Felipe Pena
ca9b3511f8 - Fixed build 2011-02-01 01:02:00 +00:00
Boris Lytochkin
5e82e334dd Improved SNMP extension. FR #53594 2011-01-31 11:41:33 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Sebastian Bergmann
22f4ef45fe sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Jani Taskinen
64389f1b31 - Fixed bug #49990 (SNMP3 warning message about security level printed twice). 2009-10-25 20:17:04 +00:00
Stanislav Malyshev
60cbce382b fix parameter parsing for SNMP 2009-08-17 22:15:18 +00:00
Ilia Alshanetsky
5904ee8f8e MFB: Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values). 2009-06-01 13:11:09 +00:00
Ilia Alshanetsky
a1df5c8cb3 MFB: Fixed bug #48359 (Script hangs on snmprealwalk if OID is not
increasing)
2009-05-31 14:11:14 +00:00
Jani Taskinen
abda62eace - Revert bad patch (which caused bug #48133) 2009-05-02 21:13:39 +00:00
Marcus Boerger
d4f5b3f0a9 - This is PHP 6 - if this ... ever gets out 2009-03-10 23:40:06 +00:00
Sebastian Bergmann
7f4dc8702a Bump copyright year, 3 of 3. 2008-12-31 11:12:40 +00:00
Felipe Pena
43791516db - Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro (again!) 2008-11-17 11:26:25 +00:00
Felipe Pena
e006a89e71 - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:10:13 +00:00
Felipe Pena
7eb2715464 - Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:34:17 +00:00
Alexey Zakhlestin
22693d1c46 MFB: Fixed bug #45405 (snmp extension memory leak) 2008-09-06 07:58:09 +00:00
Felipe Pena
6638c4c7b7 - New parameter parsing API 2008-08-13 14:05:55 +00:00
Felipe Pena
97695562da - MFB: Added arginfo 2008-07-01 19:14:28 +00:00
Felipe Pena
a1e8d340c3 New macro for check void parameters 2008-02-28 14:16:25 +00:00
Sebastian Bergmann
9b620d50b4 Bump copyright year, 2 of 2. 2007-12-31 07:12:20 +00:00
Dmitry Stogov
8146078f7b Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:28:44 +00:00
Jani Taskinen
708320ce6e - Use the defined values instead of plain integers here 2007-07-09 13:41:45 +00:00
Sebastian Bergmann
3717df72ae Bump year. 2007-01-01 09:29:37 +00:00
foobar
0d16411077 - Fixed bug #37164 (snmp_set_oid_numeric_print() misbehaves)
. 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. :)
2006-07-27 05:12:33 +00:00
foobar
87182b1071 - Fixed bug #37564 (AES privacy encryption not possible due to net-snmp 5.2 compatibility issue) 2006-07-26 23:56:09 +00:00
Dmitry Stogov
943960c324 Added automatic module globals management 2006-06-13 13:12:20 +00:00
foobar
251c5173fd bump year and license version 2006-01-01 13:10:10 +00:00
foobar
a208d9a966 - Nuke php3 legacy 2005-12-06 02:28:26 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
foobar
924b4c016d ws 2005-05-10 12:19:33 +00:00
foobar
760b955dd1 MFB: - Fixed bug #32613 (ext/snmp: use of snmp_shutdown() causes snmpapp.conf
access errors). (Jani, ric at arizona dot edu)
2005-05-10 12:17:01 +00:00
foobar
56b3cac365 Better use zval_ptr_dtor() instead (thanks Andi) 2005-04-27 23:27:37 +00:00
foobar
0eb271add6 - Fix memleak 2005-04-23 21:15:24 +00:00
foobar
82819f3061 - Use correct type (bug #32720) 2005-04-15 22:06:03 +00:00
Harrie Hazewinkel
e9224d0bd1 Converting the usage of the integer based internal commands into
MACROS to ease future extensions.
2005-04-11 14:59:42 +00:00
Harrie Hazewinkel
452b4cdba1 Adding support for a getbulk oriented walk.
The getbulk can only be used for SNMPv2c and SNMPv3.
2005-04-11 14:56:44 +00:00
Harrie Hazewinkel
e6ae6fc62d Adding SNMPv2 community based (i.e. protocol version) functions. 2005-03-16 14:29:40 +00:00
foobar
f485fc1a83 Missed one place.. 2005-02-12 18:29:42 +00:00
foobar
751712628a This was not good idea. 2005-02-12 18:27:22 +00:00
foobar
9ea10c5cec - Fix some memory leaks 2005-01-08 12:02:22 +00:00
Ilia Alshanetsky
d0cbaa911f Fixed bug #30995 (snmp extension does not build with net-snmp 5.2). 2004-12-07 00:33:24 +00:00
Anantha Kesari H Y
e510e26aa6 removed unwanted NEW_LIBC checks and comments 2004-09-27 14:19:07 +00:00
Ilia Alshanetsky
0bdfab022a Fixed bug #27661 (snmpget() does not close the socket in some cases). 2004-03-23 23:12:50 +00:00
Ilia Alshanetsky
6dca37c50c Fixed possible overflow. 2004-02-03 03:10:28 +00:00
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00
Wez Furlong
51c342efae Make these build with new win32 build system. 2003-12-19 17:00:14 +00:00
Ilia Alshanetsky
4c4d5a02b9 Fixed formatting issues (patch by: Joe Orton) 2003-10-17 02:21:27 +00:00
Ilia Alshanetsky
b9823393ea Fixed bug #25636 (SNMP Session not closed on success).
Patch by: nesslage[at]mwsc[dot]edu
2003-09-23 18:26:02 +00:00
Zeev Suraski
9db05a36a5 Remove 'proto' from internal functions 2003-08-07 16:46:11 +00:00
Harrie Hazewinkel
4d2229d6a3 Bug 24760 fix, in which the port number when non-default is not handled
correctly and ends up as the default port. This seems to be caused by
some buffer overflow where the port number is assign zero, even though
it it is not assigned to the port variable.
FIx was reported and a fix proposed by "chuck+php at 2003 dot snew dot com"
2003-07-24 21:48:55 +00:00
foobar
704a7e5653 - Added snmp_read_mib() which reads a MIB file into the active MIB tree. 2003-07-16 09:28:47 +00:00
foobar
82701d48c2 - Fixes some problems (debug mode only). (bug #23051 and bug #23685) 2003-07-16 06:03:46 +00:00
foobar
9887afad9c Remove extra proto. (copy/paste error?) 2003-07-16 05:10:29 +00:00
foobar
6676e6f2e9 Fixed bug #22529 (object_id parameter in all snmp*() functions broken.) 2003-07-16 04:54:40 +00:00
Harrie Hazewinkel
a8d156177f Adding an SNMP GETNEXT.
This is a basic SNMP operation that retrieves the next value as the
one provided to the command.
NOTE: snmpgetnext does not follow the official naming convetions of
functions, but now it is equal to it version 1 equivalents snmpget
and snmpset.
I also would like to reserve the snmp_getnext for a function to
which a session can be given instead of the multiple values to
create the session internally. (Work in progress).
2003-07-14 18:10:22 +00:00
Harrie Hazewinkel
fa910bd2b0 (RE applying)
Cleaning up some very old definitions of version 3.3.1 until 3.5.3.
Those versions are that old that people better upgrade the SNMP libraries.
2003-07-14 17:34:56 +00:00
Harrie Hazewinkel
6dd04c368e (RE-)Applying the contributed patch of Johan Hanne to the main tree.
The patch enables control on the way the values are returned
into the PHP script, instaed of always strings. Also the
type of the value is now returned when configured to do so.
This enables better management scripts to do more automatic
processing and value calculations.
(By default the values are returned as strings, as was before)
2003-07-14 17:11:04 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Wez Furlong
0a18a9d744 A add much more useful select(2) implementation than is provided by
windows sockets.  The winsock implementation will only work with sockets;
our implementation works with sockets and file descriptors.
By association, stream_select() will now operate correctly with files, pipes and sockets.

This change required linking against the winsock2 library.  In terms of
compatibility, only older versions of windows 95 do not have winsock2
installed by default.  It is available as a redistributable file, and is most likely installed by any OS patches (eg: Internet Explorer) applied by the user.

Also, add a win32 compatible pipe test when opening a stream from a pipe.  This test will only work on NT, win2k and XP platforms.  Without this test, interleaved fread() and select() calls would cause the read buffer to be clobbered.  I will be working on a fix for this issue for win9x.
2003-02-16 03:48:49 +00:00
foobar
e771bdb23d Fixed bug: #20857, snmpset() fails 2003-01-24 09:52:46 +00:00
foobar
45f1f1711d ws fixes 2003-01-24 09:40:53 +00:00
Sebastian Bergmann
b506f5c8f8 Bump year. 2002-12-31 16:08:15 +00:00
Edin Kadribasic
28c32e1fc8 MFB: Fix ZTS build. 2002-12-10 17:07:40 +00:00
Derick Rethans
83741be445 - Renamed snmpv3_* to snmp3_*
- Conversion to php_error_docref
- Whitespace fixes
2002-12-05 19:33:03 +00:00
Harrie Hazewinkel
6a14b16e34 Adding a more detail print functions, that assist/make it easier for
creating SNMP scripts.
They are only supported when you have NET-SNMP.
Need to be documented still though.
2002-11-11 21:37:19 +00:00
Harrie Hazewinkel
957f651708 Adding SNMPv3 support.
This splits the old php_snmp function into an argument parsing part and
a data retrieval part. The data retrieval part is reused for SNMPv3.
SNMPv3 has only a different argument parsing.

THe code is not extremely beautiful, but having NET-SNMP and
UCD-SNMP support creates this. :-(
Documentation must still be done.
2002-11-11 21:09:19 +00:00
Harrie Hazewinkel
e1f884c4bc Fixing the php_info function.
Print UCD-SNMP when UCD-SNMP is used.
Print NET-SNMP when NET-SNMP is used.
2002-11-11 18:45:50 +00:00
foobar
9870028d05 Fix this for Wez and his antique ucd-snmp 2002-10-17 06:39:55 +00:00
foobar
8aaa004980 ws fixes 2002-10-17 02:51:22 +00:00
foobar
16de7dd8a7 - Fixed memleak when connection fails.
- Fixed snmpget() to work with net-snmp
- Fixed the error messages to use the new style.
2002-10-16 02:33:47 +00:00
foobar
e99b3cdff2 Some more compatibility fixes for net-snmp vs ucd-snmp 2002-10-16 00:58:15 +00:00
foobar
3c863a6da1 - Fix the last commit..(thanks to Harrie Hazewinkel <harrie@lisanza.net>) 2002-10-16 00:29:56 +00:00
foobar
23706f18d6 Make this thing to compile with net-snmp-5.0.x 2002-10-15 00:43:34 +00:00
foobar
1fa263a4ec This is not zval.. 2002-10-14 02:46:52 +00:00
Anantha Kesari H Y
bbc162d164 NetWare related additions/modifications 2002-09-05 11:50:43 +00:00
foobar
3624b97ff1 Kill compile warning 2002-07-13 05:42:01 +00:00
Sterling Hughes
e15a3c42f3 remove stale 1 2002-05-11 17:41:16 +00:00
Sterling Hughes
2e72f8cc1f WS Fixes (and similair stylistic changes) 2002-05-11 17:00:49 +00:00
Yasuo Ohgaki
d5412f3952 Fix compiler warnings 2002-03-01 03:31:01 +00:00
Sebastian Bergmann
90613d2282 Maintain headers. 2002-02-28 08:29:35 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
Stig Bakken
0130405168 fix bug #13479 2001-10-15 18:36:43 +00:00
Stig Bakken
689252082c * zend_module_entry change: apino, debug and zts are moved first,
see README.EXTENSIONS file for upgrade help.
@Introduced extension version numbers (Stig)
2001-10-11 23:33:59 +00:00
Jeroen van Wolffelaar
6cfba2a3ea 2nd phase in back-substitution those macro's
I've got pretty much everything now...
2001-09-25 22:49:04 +00:00
Jeroen van Wolffelaar
c033288573 Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know. 2001-09-25 21:58:48 +00:00
Derick Rethans
78747bd2df - Don't wrap lines... this is annoying while coding. 2001-09-09 13:29:31 +00:00
Zeev Suraski
0116a7b911 Fix crashes in parse_parameters calls
HEADS UP:  Make sure you supply TSRMLS_CC for this function!
I'll try to think of a way that'd allow us to find this issue using
the compiler.
2001-08-13 19:31:18 +00:00
Rasmus Lerdorf
4d11d90880 Track down a few more functions that don't check for 0 args and use
faster mechanism
2001-08-13 07:55:39 +00:00
Rasmus Lerdorf
8c497f05c4 We don't consistently check for args passed to functions that don't
take any args.  In some cases we probably want to skip the check for
performance reasons, but in other cases where performance is unlikely
to be a factor, not throwing a warning on the wrong number of args passed
to a function is at best inconsistent, and at worst it could hide a bug.
So, add a few such checks.  There are still lots of cases out there.
2001-08-13 06:43:47 +00:00
Zeev Suraski
1159c84ab7 - TSRMLS_FETCH work
- whitespace fixes
2001-08-05 01:43:02 +00:00
Rasmus Lerdorf
65c8679b26 Fix for bug #12081
@ - Fix return value for a failed snmpset() - now returns false  (Rasmus)
2001-07-13 05:21:37 +00:00
Rasmus Lerdorf
60c8e4409f Add port support to snmp functions
@ - Add hostname:port support to snmp functions
@   (nbougues@axialys.net, Rasmus)
2001-07-13 05:09:40 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Rasmus Lerdorf
25c3a3a39d vim-6 does folding - clean up a bunch of missing folding tags plus
some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 13:12:10 +00:00
Stig Bakken
1beda9ee1e * include "config.h" if HAVE_CONFIG_H is defined (for standalone dso build) 2001-05-24 10:07:29 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Andrei Zmievski
da3c43182a Fix warnings. 2000-09-14 20:22:02 +00:00
Colin Viebrock
9d62ac18ce more info for phpinfo() 2000-08-30 15:52:07 +00:00
Sterling Hughes
b87f5e93a3 revert + note. 2000-07-01 22:39:27 +00:00
Sterling Hughes
a43572123c - strdup -> estrdup
- check whether return_value array is initialized.
2000-07-01 21:34:45 +00:00
Sascha Schumann
0c03253635 Stop including dl/phpdl.h. 2000-06-24 15:36:04 +00:00
Andi Gutmans
3701bc4207 - ARG_COUNT(ht) -> ZEND_NUM_ARGS() mega patch 2000-06-05 19:47:54 +00:00
Sascha Schumann
4686a3b50e Use #ifdef COMPILE_DL_EXTNAME solely. 2000-05-23 09:33:51 +00:00
Zeev Suraski
e043439ff6 Update the license with the new clause 6 2000-05-18 15:34:45 +00:00
Sascha Schumann
fe50664d4d #if COMPILE_DL
becomes

    #if defined(COMPILE_DL) || defined(COMPILE_DL_EXTENSION_NAME)
2000-05-02 00:44:35 +00:00
Sascha Schumann
0d383d9373 Replace the various get_module() functions with a uniform
ZEND_GET_MODULE(name) macro.
2000-05-02 00:30:36 +00:00
Colin Viebrock
a7c8bfb9fb phpinfo() prettying 2000-04-06 21:07:44 +00:00
Sterling Hughes
76a32c0ce8 fix bug 3971, SNMP now compiles on FreeBSD. 2000-03-30 00:19:24 +00:00
Sterling Hughes
6a048bfd64 Return value corrected. 2000-03-26 14:43:24 +00:00
Sterling Hughes
b880fb5bcc Tid Bit More. 2000-03-25 22:27:30 +00:00
Sterling Hughes
a9f0e0176b - snmpwalkoid is an alias now
- small optimizations
- delete that switch case in php_snmp
  =The different functions are now in the PHP_FUNCTION declaration thingies
- If-else blocks have brackets
2000-03-25 19:58:19 +00:00
Sterling Hughes
c0cede82f1 Fixed a few protos and ... 2000-03-25 04:05:13 +00:00
Sascha Schumann
e5ceb99a1e Fix build problems with UCD-SNMP 4.1.x.
First, we need to include default_store.h.

Second, UCD-SNMP supports OpenSSL now, so we additionally need to
link against that.

The changes should be completely backwards-compatible.

Partly suggested by: thor2001@gmx.net
PR: #3451, #3668, #3868
2000-03-19 12:38:53 +00:00
Stig Bakken
d02fe90b00 Change extension names in all extensions' zend_module_entry to their
directory name.
2000-03-06 18:44:01 +00:00
Egon Schmid
5bccee70ae More protos. 2000-02-24 07:38:19 +00:00
Zeev Suraski
86fa2aade2 the pipe is breaking all the time 2000-02-19 23:41:32 +00:00