net-snmp 3.5.0 → 3.5.4

package/.vscode/launch.json

@@ -259,16 +259,7 @@
             ],
             "program": "${workspaceFolder}/example/test.js",
             "args": [
-                "-d",
-                "-v", "3",
-                "-l", "authPriv",
-                "-u", "test256",
-                "-a", "sha",
-                "-A", "maybeitsok",
-                "-x", "aes256b",
-                "-X", "maybeitsok",
-                "127.0.0.1",
-                "1.3.6.1.2.1.1.1.0"
+                "-p", "1161"
             ]
         },
         {

package/README.md

@@ -3134,6 +3134,22 @@ Example programs are included under the module's `example` directory.
 
  * Add engineID option to v3 session
 
+## Version 3.5.1 - 28/02/2021
+
+ * Fix MIB parsing of sized integers without whitespace
+
+## Version 3.5.2 - 02/03/2021
+
+ * Fix MIB table index handling of Buffer type
+
+## Version 3.5.3 - 22/08/2021
+
+ * Fix error with empty varbind array in walk
+
+## Version 3.5.4 - 24/08/2021
+
+ * Align accessible-for-notify row cell behaviour with not-accessible behaviour
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/example/test.js

@@ -1,21 +1,54 @@
-
-// Copyright 2013 Stephen Vickers
+/* eslint-disable no-unused-vars */
 
 var snmp = require ("../");
-var options = require("./option-parser");
-
-var session = options.session;
-var oids = options.oids;
-
-session.get (oids, function (error, varbinds) {
-	if (error) {
-		console.error (error.toString ());
-	} else {
-		for (var i = 0; i < varbinds.length; i++) {
-			if (snmp.isVarbindError (varbinds[i]))
-				console.error (snmp.varbindError (varbinds[i]));
-			else
-				console.log (varbinds[i].oid + "|" + varbinds[i].value);
-		}
-	}
-});
+var getopts = require ("getopts");
+
+var options = getopts(process.argv.slice(2));
+var providers;
+var mibDir = '/var/tmp/mibs/';
+
+var counter64 = function (num) {
+    var buf = Buffer.alloc (4);
+    buf.writeUInt32BE (num);
+    return buf;
+};
+
+var snmpOptions = {
+    disableAuthorization: options.n,
+    port: options.p,
+    engineID: options.e,
+    debug: options.d
+};
+
+var callback = function (error, data) {
+    if ( error ) {
+        console.error (error);
+    } else {
+        console.log (data.pdu.varbinds[0].oid);
+    }
+};
+
+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));

package/index.js

@@ -2641,7 +2641,12 @@ function walkCb (req, error, varbinds) {
 		}
 	}
 
-	if (this.version == Version2c || this.version == Version3 ) {
+	if ( ! varbinds.length ) {
+		req.doneCb(null);
+		return;
+	}
+
+	if (this.version == Version2c || this.version == Version3) {
 		for (var i = varbinds[0].length; i > 0; i--) {
 			if (varbinds[0][i - 1].type == ObjectType.EndOfMibView) {
 				varbinds[0].pop ();
@@ -4081,7 +4086,13 @@ Mib.prototype.getOidAddressFromValue = function (value, indexPart) {
 			oidComponents = value.split (".");
 			break;
 		case ObjectType.OctetString:
-			oidComponents = [...value].map (c => c.charCodeAt());
+			if ( value instanceof Buffer ) {
+				// Buffer
+				oidComponents = Array.prototype.slice.call (value);
+			} else {
+				// string
+				oidComponents = [...value].map (c => c.charCodeAt());
+			}
 			break;
 		case ObjectType.IpAddress:
 			return value.split (".");
@@ -4192,8 +4203,8 @@ Mib.prototype.addTableRow = function (table, row) {
 	for ( var i = 0; i < provider.tableColumns.length ; i++ ) {
 		var column = provider.tableColumns[i];
 		var isColumnIndex = provider.tableIndex.some ( indexPart => indexPart.columnNumber == column.number );
-		// prevent not-accessible index entries from being added as columns in the row
-		if ( ! isColumnIndex || column.maxAccess !== MaxAccess['not-accessible'] ) {
+		// prevent not-accessible and accessible-for-notify index entries from being added as columns in the row
+		if ( ! isColumnIndex || ! (column.maxAccess === MaxAccess['not-accessible'] || column.maxAccess === MaxAccess['accessible-for-notify']) ) {
 			instanceAddress = providerNode.address.concat (column.number).concat (instance);
 			this.addNodesForAddress (instanceAddress);
 			instanceNode = this.lookup (instanceAddress);

package/lib/mib.js

@@ -168,7 +168,10 @@ var MIB = function (dir) {
                             this.CharBuffer.inGroup++;
                         }
                     }
-                    if (this.CharBuffer.isComment || ((this.CharBuffer.isOID || this.CharBuffer.nested > 0) && (!this.CharBuffer.isList || this.CharBuffer.inGroup > 0))) {
+                    if (this.CharBuffer.builder == 'INTEGER') {
+                        this.CharBuffer.Fill(FileName, row, column);
+                        this.CharBuffer.Append(char);
+                    } else if (this.CharBuffer.isComment || ((this.CharBuffer.isOID || this.CharBuffer.nested > 0) && (!this.CharBuffer.isList || this.CharBuffer.inGroup > 0))) {
                         this.CharBuffer.Append(char);
                     } else {
                         this.CharBuffer.Fill(FileName, row, column);

package/package.json

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