net-snmp 3.5.2 → 3.5.6

package/README.md

@@ -3142,6 +3142,22 @@ Example programs are included under the module's `example` directory.
 
  * 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
+
+## Version 3.5.5 - 29/09/2021
+
+ * Add missing return in getbulk feedCb callback non-repeaters error condition
+
+## Version 3.5.6 - 20/10/2021
+
+ * Fix GetNext OID calculation for off-tree OIDs
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/index.js

@@ -1923,6 +1923,7 @@ Session.prototype.getBulk = function () {
 					+ "response '" + pdu.varbinds.length + "' is less than "
 					+ "non-repeaters '" + nonRepeaters + "' in request",
 					ResponseInvalidCode.ENonRepeaterCountMismatch));
+			return;
 		} else {
 			for ( ; i < nonRepeaters; i++) {
 				if (isVarbindError (pdu.varbinds[i])) {
@@ -2641,7 +2642,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 ();
@@ -3486,7 +3492,7 @@ MibNode.prototype.findChildImmediatelyBefore = function (index) {
 			}
 		}
 	}
-	return this.children[sortedChildrenKeys[sortedChildrenKeys.length]];
+	return this.children[sortedChildrenKeys[sortedChildrenKeys.length - 1]];
 };
 
 MibNode.prototype.isDescendant = function (address) {
@@ -3818,7 +3824,16 @@ Mib.prototype.getTreeNode = function (oid) {
 		var last = address.pop ();
 		var parent = this.lookupAddress (address);
 		if ( parent ) {
-			return (parent.findChildImmediatelyBefore (last) || parent);
+			node = parent.findChildImmediatelyBefore (last);
+			if ( !node )
+				return parent;
+			while ( true ) {
+				// Find the last descendant
+				var childrenAddresses = Object.keys (node.children).sort ( (a, b) => a - b);
+				if ( childrenAddresses.length == 0 )
+					return node;
+				node = node.children[childrenAddresses[childrenAddresses.length - 1]];
+			}
 		}
 	}
 	return this.root;
@@ -4198,8 +4213,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/package.json

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