net-snmp 3.9.7 → 3.9.9

package/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [markabrahams]

package/README.md

@@ -3305,6 +3305,14 @@ Example programs are included under the module's `example` directory.
 
  * Add tolerance for reading malformed 32-bit unsigned integers
 
+## Version 3.9.8 - 13/01/2024
+
+ * Fix subtree callback termination
+
+## Version 3.9.9 - 17/01/2024
+
+ * Add SMIv1 integer enumeration support
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/example/test.js

@@ -1,54 +1,27 @@
-/* eslint-disable no-unused-vars */
+const snmp = require("../");
 
-var snmp = require ("../");
-var getopts = require ("getopts");
+const store = snmp.createModuleStore();
 
-var options = getopts(process.argv.slice(2));
-var providers;
-var mibDir = '/var/tmp/mibs/';
+//store.loadFromFile("/var/tmp/mibs/CISCO-SMI.mib");
+//store.loadFromFile("/var/tmp/mibs/CISCO-TC.mib");
+//store.loadFromFile("/home/mark/snmp/test/CISCO-CONFIG-MAN-MIB.MIB");
+store.loadFromFile("/home/mark/snmp/test/smiv1.mib");
+// store.loadFromFile("/home/mark/snmp/test/smiv2.mib");
 
-var counter64 = function (num) {
-    var buf = Buffer.alloc (4);
-    buf.writeUInt32BE (num);
-    return buf;
-};
+const mod1 = store.getModule("SMIv1-TEST-MIB");
+// const mod2 = store.getModule("SMIv2-TEST-MIB");
 
-var snmpOptions = {
-    disableAuthorization: options.n,
-    port: options.p,
-    engineID: options.e,
-    debug: options.d
-};
+// Object.keys(mod1)
+//   .forEach(key => console.log(key));
 
-var callback = function (error, data) {
-    if ( error ) {
-        console.error (error);
-    } else {
-        console.log (data.pdu.varbinds[0].oid);
-    }
-};
+console.log(JSON.stringify(mod1, null, 2));
+// console.log(JSON.stringify(mod2, null, 2));
 
-var store = snmp.createModuleStore ();
-var agent = snmp.createAgent (snmpOptions, callback);
-var mib = agent.getMib ();
-
-var authorizer = agent.getAuthorizer ();
-authorizer.addCommunity ("public");
-
-// IF-MIB load and providers registration
-store.loadFromFile (mibDir + "IPv6-TC.mib");
-store.loadFromFile (mibDir + "IPv6-MIB.mib");
-providers = store.getProvidersForModule ("IPV6-MIB");
-mib.registerProviders (providers);
-
-// agent.getMib ().dumpProviders ();
-
-// mib.dump ();
-
-var modules = store.getModules (true);
-var one = store.getModule ("IPV6-MIB");
-var names = store.getModuleNames (true);
-
-// console.log("All modules: ", JSON.stringify(modules, '', 2));
-console.log("Modules: ", names);
-console.log("Single module definition: ", JSON.stringify(one, '', 2));
+//const mod = store.getModule("CISCO-CONFIG-MAN-MIB");
+//console.log(mod);
+//console.log(JSON.stringify(mod.ccmHistoryEventTerminalUser, null, 2));
+//console.log(JSON.stringify(mod.ciscoConfigManCTIDNotifyGroup, null, 2));
+//console.log(JSON.stringify(mod.ciscoConfigManCTIDObjectGroup, null, 2));
+//console.log(JSON.stringify(mod.HistoryEventMedium, null, 2));
+//console.log(JSON.stringify(mod.ccmHistoryRunningLastChanged, null, 2));
+//console.log(JSON.stringify(mod.ccmHistoryRunningLastSaved, null, 2));

package/index.js

@@ -2296,8 +2296,11 @@ function subtreeCb (req, varbinds) {
 		}
 	}
 
-	if (varbinds.length > 0)
-		req.feedCb (varbinds);
+	if (varbinds.length > 0) {
+		if (req.feedCb (varbinds)) {
+			done = 1;
+		}
+	}
 
 	if (done)
 		return true;

package/lib/mib.js

@@ -679,22 +679,10 @@ var MIB = function (dir) {
             var SYNTAX = Symbols[c1];
             var val = Symbols[c1 + 1];
 
+            // Normal MACROs
             if (this.MACROS.indexOf(macro) > -1 && m < 10) {
                 if (val[0] === "{") {
-                    c1++;
-                    while (Symbols[c1].indexOf("}") == -1) {
-                        c1++;
-                        val += Symbols[c1].trim();
-                    }
-                    val = val.replace("{", "").replace("}", "").split(",");
-
-                    Object[ObjectName]['SYNTAX'] = {};
-                    Object[ObjectName]['SYNTAX'][SYNTAX] = {};
-
-                    for (var TC = 0; TC < val.length; TC++) {
-                        let openParenSplit = val[TC].split(/\s*\(\s*/);
-                        Object[ObjectName]['SYNTAX'][SYNTAX][openParenSplit[1].replace(/\s*\)\s*$/, '')] = openParenSplit[0].trimStart();
-                    }
+                    this.BuildObjectEnumeration(Object, ObjectName, c1, SYNTAX, val, Symbols);
                 } else if (val[0] === '(') {
                     const key = val.startsWith('(SIZE')? 'sizes' : 'ranges';
                     Object[ObjectName]['SYNTAX'] = {};
@@ -702,6 +690,28 @@ var MIB = function (dir) {
                 } else {
                     Object[ObjectName]['SYNTAX'] = SYNTAX;
                 }
+            // SMIv1 INTEGER enumerations
+            } else if ( Symbols[i + 1] == 'INTEGER' ) {
+                c1 = i + 1;
+                SYNTAX = 'INTEGER';
+                val = Symbols[c1 + 1];
+                if ( val[0] === '{' ) {
+                    this.BuildObjectEnumeration(Object, ObjectName, c1, SYNTAX, val, Symbols);
+                }
+            }
+        },
+        BuildObjectEnumeration: function (Object, ObjectName, c1, SYNTAX, val, Symbols) {
+            c1++;
+            while (Symbols[c1].indexOf("}") == -1) {
+                c1++;
+                val += Symbols[c1].trim();
+            }
+            val = val.replace("{", "").replace("}", "").split(",");
+            Object[ObjectName]['SYNTAX'] = {};
+            Object[ObjectName]['SYNTAX'][SYNTAX] = {};
+            for (var TC = 0; TC < val.length; TC++) {
+                let openParenSplit = val[TC].split(/\s*\(\s*/);
+                Object[ObjectName]['SYNTAX'][SYNTAX][openParenSplit[1].replace(/\s*\)\s*$/, '')] = openParenSplit[0].trimStart();
             }
         },
         GetSummary: function (callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "net-snmp",
-  "version": "3.9.7",
+  "version": "3.9.9",
   "description": "JavaScript implementation of the Simple Network Management Protocol (SNMP)",
   "main": "index.js",
   "directories": {