From 61d53e6464ed9525c91b12722e8c2906cb2aba35 Mon Sep 17 00:00:00 2001 From: glenn <> Date: Sat, 16 Jan 1999 03:48:15 +0000 Subject: [PATCH] SNMP Agent now returns object instances correctly instead of objects --- ChangeLog | 1 + src/mib.txt | 10 +- src/snmp_core.cc | 235 +++++++++++++++++++++++++++++++++++------------ 3 files changed, 185 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index d59a050ae2..05fda2ad6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Changes to Squid-2.2 (): Request Hit Ratio's Byte Hit Ratio's Number of Clients + - Changed SNMP Agent to return object instances correctly. - Added our own assert() macro so we can use debug() instead of printing to stderr. - Added eventFreeMemory(). diff --git a/src/mib.txt b/src/mib.txt index 92f8aa52ed..ec08e26a5d 100644 --- a/src/mib.txt +++ b/src/mib.txt @@ -1,6 +1,6 @@ SQUID-MIB DEFINITIONS ::= BEGIN -- --- $Id: mib.txt,v 1.21 1998/11/18 00:16:37 glenn Exp $ +-- $Id: mib.txt,v 1.22 1999/01/15 20:48:16 glenn Exp $ -- IMPORTS @@ -36,6 +36,10 @@ squid MODULE-IDENTITY REVISION "9809220000Z" DESCRIPTION "Move to SMIv2. Prepare to split into proxy/squid." + REVISION "9901010000Z" + DESCRIPTION + "Added objects and corrected asn.1 syntax and + descriptions." ::= { nlanr 1 } -- @@ -391,7 +395,9 @@ squid MODULE-IDENTITY cacheHttpHitSvcTime Integer32, cacheIcpQuerySvcTime Integer32, cacheIcpReplySvcTime Integer32, - cacheDnsSvcTime Integer32 + cacheDnsSvcTime Integer32, + cacheRequestHitRatio Integer32, + cacheRequestByteRatio Integer32 } cacheMedianTime OBJECT-TYPE diff --git a/src/snmp_core.cc b/src/snmp_core.cc index c39dcc8ab0..11f6971dd4 100644 --- a/src/snmp_core.cc +++ b/src/snmp_core.cc @@ -1,5 +1,5 @@ /* - * $Id: snmp_core.cc,v 1.26 1999/01/12 23:38:37 wessels Exp $ + * $Id: snmp_core.cc,v 1.27 1999/01/15 20:48:17 glenn Exp $ * * DEBUG: section 49 SNMP support * AUTHOR: Glenn Chisholm @@ -108,95 +108,173 @@ snmpInit(void) snmpAddNode(snmpCreateOid(LEN_SQ_SYS, SQ_SYS), LEN_SQ_SYS, NULL, 3, snmpAddNode(snmpCreateOid(LEN_SQ_SYS + 1, SQ_SYS, 1), - LEN_SQ_SYS + 1, snmp_sysFn, 0), + LEN_SQ_SYS + 1, snmp_sysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_SYS + 2, SQ_SYS, 1, 0), + LEN_SQ_SYS + 2, snmp_sysFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_SYS + 1, SQ_SYS, 2), - LEN_SQ_SYS + 1, snmp_sysFn, 0), + LEN_SQ_SYS + 1, snmp_sysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_SYS + 2, SQ_SYS, 2, 0), + LEN_SQ_SYS + 2, snmp_sysFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_SYS + 1, SQ_SYS, 3), - LEN_SQ_SYS + 1, snmp_sysFn, 0)), + LEN_SQ_SYS + 1, snmp_sysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_SYS + 2, SQ_SYS, 3, 0), + LEN_SQ_SYS + 2, snmp_sysFn, 0))), snmpAddNode(snmpCreateOid(LEN_SQ_CONF, SQ_CONF), LEN_SQ_CONF, NULL, 5, snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 1, SQ_CONF, 1), - LEN_SQ_CONF + 1, snmp_confFn, 0), + LEN_SQ_CONF + 1, snmp_confFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 1, 0), + LEN_SQ_CONF + 2, snmp_confFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 1, SQ_CONF, 2), - LEN_SQ_CONF + 1, snmp_confFn, 0), + LEN_SQ_CONF + 1, snmp_confFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 2, 0), + LEN_SQ_CONF + 2, snmp_confFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 1, SQ_CONF, 3), - LEN_SQ_CONF + 1, snmp_confFn, 0), + LEN_SQ_CONF + 1, snmp_confFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 3, 0), + LEN_SQ_CONF + 2, snmp_confFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 1, SQ_CONF, 4), - LEN_SQ_CONF + 1, snmp_confFn, 0), + LEN_SQ_CONF + 1, snmp_confFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 4, 0), + LEN_SQ_CONF + 2, snmp_confFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 1, SQ_CONF, 5), LEN_SQ_CONF + 1, NULL, 6, snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 5, 1), - LEN_SQ_CONF + 2, snmp_confFn, 0), + LEN_SQ_CONF + 2, snmp_confFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 3, SQ_CONF, 5, 1, 0), + LEN_SQ_CONF + 3, snmp_confFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 5, 2), - LEN_SQ_CONF + 2, snmp_confFn, 0), + LEN_SQ_CONF + 2, snmp_confFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 3, SQ_CONF, 5, 2, 0), + LEN_SQ_CONF + 3, snmp_confFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 5, 3), - LEN_SQ_CONF + 2, snmp_confFn, 0), + LEN_SQ_CONF + 2, snmp_confFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 3, SQ_CONF, 5, 3, 0), + LEN_SQ_CONF + 3, snmp_confFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 5, 4), - LEN_SQ_CONF + 2, snmp_confFn, 0), + LEN_SQ_CONF + 2, snmp_confFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 3, SQ_CONF, 5, 4, 0), + LEN_SQ_CONF + 3, snmp_confFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 5, 5), - LEN_SQ_CONF + 2, snmp_confFn, 0), + LEN_SQ_CONF + 2, snmp_confFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 3, SQ_CONF, 5, 5, 0), + LEN_SQ_CONF + 3, snmp_confFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 5, 6), - LEN_SQ_CONF + 2, snmp_confFn, 0))), + LEN_SQ_CONF + 2, snmp_confFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 3, SQ_CONF, 5, 6, 0), + LEN_SQ_CONF + 3, snmp_confFn, 0)))), snmpAddNode(snmpCreateOid(LEN_SQ_PRF, SQ_PRF), LEN_SQ_PRF, NULL, 2, snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 1, SQ_PRF, 1), LEN_SQ_PRF + 1, NULL, 11, snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 1, 1), - LEN_SQ_PRF + 2, snmp_prfSysFn, 0), + LEN_SQ_PRF + 2, snmp_prfSysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 1, 1, 0), + LEN_SQ_PRF + 3, snmp_prfSysFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 1, 2), - LEN_SQ_PRF + 2, snmp_prfSysFn, 0), + LEN_SQ_PRF + 2, snmp_prfSysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 1, 2, 0), + LEN_SQ_PRF + 3, snmp_prfSysFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 1, 3), - LEN_SQ_PRF + 2, snmp_prfSysFn, 0), + LEN_SQ_PRF + 2, snmp_prfSysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 1, 3, 0), + LEN_SQ_PRF + 3, snmp_prfSysFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 1, 4), - LEN_SQ_PRF + 2, snmp_prfSysFn, 0), + LEN_SQ_PRF + 2, snmp_prfSysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 1, 4, 0), + LEN_SQ_PRF + 3, snmp_prfSysFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 1, 5), - LEN_SQ_PRF + 2, snmp_prfSysFn, 0), + LEN_SQ_PRF + 2, snmp_prfSysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 1, 5, 0), + LEN_SQ_PRF + 3, snmp_prfSysFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 1, 6), - LEN_SQ_PRF + 2, snmp_prfSysFn, 0), + LEN_SQ_PRF + 2, snmp_prfSysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 1, 6, 0), + LEN_SQ_PRF + 3, snmp_prfSysFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 1, 7), - LEN_SQ_PRF + 2, snmp_prfSysFn, 0), + LEN_SQ_PRF + 2, snmp_prfSysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 1, 7, 0), + LEN_SQ_PRF + 3, snmp_prfSysFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 1, 8), - LEN_SQ_PRF + 2, snmp_prfSysFn, 0), + LEN_SQ_PRF + 2, snmp_prfSysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 1, 8, 0), + LEN_SQ_PRF + 3, snmp_prfSysFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 1, 9), - LEN_SQ_PRF + 2, snmp_prfSysFn, 0), + LEN_SQ_PRF + 2, snmp_prfSysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 1, 9, 0), + LEN_SQ_PRF + 3, snmp_prfSysFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 1, 10), - LEN_SQ_PRF + 2, snmp_prfSysFn, 0), + LEN_SQ_PRF + 2, snmp_prfSysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 1, 10, 0), + LEN_SQ_PRF + 3, snmp_prfSysFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 1, 11), - LEN_SQ_PRF + 2, snmp_prfSysFn, 0)), + LEN_SQ_PRF + 2, snmp_prfSysFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 1, 11, 0), + LEN_SQ_PRF + 3, snmp_prfSysFn, 0))), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 1, SQ_PRF, 2), LEN_SQ_PRF + 1, NULL, 2, snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 2, 1), LEN_SQ_PRF + 2, NULL, 15, snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 1), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 1, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 2), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 2, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 3), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 3, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 4), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 4, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 5), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 5, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 6), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 6, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 7), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 7, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 8), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 8, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 9), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 9, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 10), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 10, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 11), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 11, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 12), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 12, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 13), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 13, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 14), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 14, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 15), - LEN_SQ_PRF + 3, snmp_prfProtoFn, 0)), + LEN_SQ_PRF + 3, snmp_prfProtoFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 1, 15, 0), + LEN_SQ_PRF + 4, snmp_prfProtoFn, 0))), snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 2, 2), LEN_SQ_PRF + 2, NULL, 1, snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 2, 1), @@ -286,45 +364,81 @@ snmpInit(void) snmpAddNode(snmpCreateOid(LEN_SQ_NET + 1, SQ_NET, 1), LEN_SQ_NET + 1, NULL, 8, snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 1, 1), - LEN_SQ_NET + 2, snmp_netIpFn, 0), + LEN_SQ_NET + 2, snmp_netIpFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 1, 1, 0), + LEN_SQ_NET + 3, snmp_netIpFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 1, 2), - LEN_SQ_NET + 2, snmp_netIpFn, 0), + LEN_SQ_NET + 2, snmp_netIpFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 1, 2, 0), + LEN_SQ_NET + 3, snmp_netIpFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 1, 3), - LEN_SQ_NET + 2, snmp_netIpFn, 0), + LEN_SQ_NET + 2, snmp_netIpFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 1, 3, 0), + LEN_SQ_NET + 3, snmp_netIpFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 1, 4), - LEN_SQ_NET + 2, snmp_netIpFn, 0), + LEN_SQ_NET + 2, snmp_netIpFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 1, 4, 0), + LEN_SQ_NET + 3, snmp_netIpFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 1, 5), - LEN_SQ_NET + 2, snmp_netIpFn, 0), + LEN_SQ_NET + 2, snmp_netIpFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 1, 5, 0), + LEN_SQ_NET + 3, snmp_netIpFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 1, 6), - LEN_SQ_NET + 2, snmp_netIpFn, 0), + LEN_SQ_NET + 2, snmp_netIpFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 1, 6, 0), + LEN_SQ_NET + 3, snmp_netIpFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 1, 7), - LEN_SQ_NET + 2, snmp_netIpFn, 0), + LEN_SQ_NET + 2, snmp_netIpFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 1, 7, 0), + LEN_SQ_NET + 3, snmp_netIpFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 1, 8), - LEN_SQ_NET + 2, snmp_netIpFn, 0)), + LEN_SQ_NET + 2, snmp_netIpFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 1, 8, 0), + LEN_SQ_NET + 3, snmp_netIpFn, 0))), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 1, SQ_NET, 2), LEN_SQ_NET + 1, NULL, 7, snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 2, 1), - LEN_SQ_NET + 2, snmp_netFqdnFn, 0), + LEN_SQ_NET + 2, snmp_netFqdnFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 2, 1, 0), + LEN_SQ_NET + 3, snmp_netFqdnFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 2, 2), - LEN_SQ_NET + 2, snmp_netFqdnFn, 0), + LEN_SQ_NET + 2, snmp_netFqdnFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 2, 2, 0), + LEN_SQ_NET + 3, snmp_netFqdnFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 2, 3), - LEN_SQ_NET + 2, snmp_netFqdnFn, 0), + LEN_SQ_NET + 2, snmp_netFqdnFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 2, 3, 0), + LEN_SQ_NET + 3, snmp_netFqdnFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 2, 4), - LEN_SQ_NET + 2, snmp_netFqdnFn, 0), + LEN_SQ_NET + 2, snmp_netFqdnFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 2, 4, 0), + LEN_SQ_NET + 3, snmp_netFqdnFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 2, 5), - LEN_SQ_NET + 2, snmp_netFqdnFn, 0), + LEN_SQ_NET + 2, snmp_netFqdnFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 2, 5, 0), + LEN_SQ_NET + 3, snmp_netFqdnFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 2, 6), - LEN_SQ_NET + 2, snmp_netFqdnFn, 0), + LEN_SQ_NET + 2, snmp_netFqdnFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 2, 6, 0), + LEN_SQ_NET + 3, snmp_netFqdnFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 2, 7), - LEN_SQ_NET + 2, snmp_netFqdnFn, 0)), + LEN_SQ_NET + 2, snmp_netFqdnFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 2, 7, 0), + LEN_SQ_NET + 3, snmp_netFqdnFn, 0))), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 1, SQ_NET, 3), LEN_SQ_NET + 1, NULL, 3, snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 3, 1), - LEN_SQ_NET + 2, snmp_netDnsFn, 0), + LEN_SQ_NET + 2, snmp_netDnsFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 3, 1, 0), + LEN_SQ_NET + 3, snmp_netDnsFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 3, 2), - LEN_SQ_NET + 2, snmp_netDnsFn, 0), + LEN_SQ_NET + 2, snmp_netDnsFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 3, 2, 0), + LEN_SQ_NET + 3, snmp_netDnsFn, 0)), snmpAddNode(snmpCreateOid(LEN_SQ_NET + 2, SQ_NET, 3, 3), - LEN_SQ_NET + 2, snmp_netDnsFn, 0))), + LEN_SQ_NET + 2, snmp_netDnsFn, 1, + snmpAddNode(snmpCreateOid(LEN_SQ_NET + 3, SQ_NET, 3, 3, 0), + LEN_SQ_NET + 3, snmp_netDnsFn, 0)))), snmpAddNode(snmpCreateOid(LEN_SQ_MESH, SQ_MESH), LEN_SQ_MESH, NULL, 2, snmpAddNode(snmpCreateOid(LEN_SQ_MESH + 1, SQ_MESH, 1), @@ -757,6 +871,9 @@ snmpTreeNext(oid * Current, snint CurrentLen, oid ** Next, snint * NextLen) while ((mibTreeEntry) && (!mibTreeEntry->parsefunction)) { mibTreeEntry = mibTreeEntry->leaves[0]; } + + if((mibTreeEntry) && (mibTreeEntry->children == 1)) + mibTreeEntry = mibTreeEntry->leaves[0]; } if (mibTreeEntry) { *Next = snmpOidDup(mibTreeEntry->name, mibTreeEntry->len); @@ -862,7 +979,7 @@ snmpAddNode(va_alist) /* End of tree utility functions */ /* - * Returns the list of parameters in an oid[] + * Returns the list of parameters in an oid */ #if STDC_HEADERS oid * -- 2.47.3