net-snmp 3.14.0 → 3.15.0

package/README.cn.md

@@ -1417,6 +1417,7 @@ snmp.createModuleStore ()
 *   RFC1158-MIB
 *   RFC-1212
 *   RFC1213-MIB
+*   RFC-1215
 *   SNMPv2-SMI
 *   SNMPv2-CONF
 *   SNMPv2-TC

package/README.md

@@ -2450,6 +2450,7 @@ pre-loaded "base" modules is:
  * RFC1158-MIB
  * RFC-1212
  * RFC1213-MIB
+ * RFC-1215
  * SNMPv2-SMI
  * SNMPv2-CONF
  * SNMPv2-TC
@@ -3407,6 +3408,14 @@ Example programs are included under the module's `example` directory.
 
  * Add support for SMIv1 defined types and TRAP-TYPE SMIv1 macro
 
+## Version 3.14.1 - 11/09/2024
+
+ * Add RFC-1215 to base MIB modules to provide TRAP-TYPE macro
+
+## Version 3.15.0 - 14/09/2024
+
+ * Change return of undefined or null MIB values to NoSuchInstance
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/index.js

@@ -3555,6 +3555,7 @@ ModuleStore.BASE_MODULES = [
 	"RFC1158-MIB",
 	"RFC-1212",
 	"RFC1213-MIB",
+	"RFC-1215",
 	"SNMPv2-SMI",
 	"SNMPv2-CONF",
 	"SNMPv2-TC",
@@ -3770,17 +3771,16 @@ MibNode.prototype.getNextInstanceNode = function () {
 	var childrenAddresses;
 
 	var node = this;
-	if ( this.value != null ) {
-		// Need upwards traversal first
-		node = this;
+	// If we start on a leaf node, we need next (right) sibling or upwards traversal first
+	if ( ! node.children || Object.keys (node.children).length === 0 ) {
 		while ( node ) {
 			siblingIndex = node.address.slice(-1)[0];
 			node = node.parent;
 			if ( ! node ) {
-				// end of MIB
+				// End of MIB
 				return null;
 			} else {
-				// Move to next sibling
+				// Move to next sibling if we are not last child
 				childrenAddresses = Object.keys (node.children).sort ( (a, b) => a - b);
 				var siblingPosition = childrenAddresses.indexOf(siblingIndex.toString());
 				if ( siblingPosition + 1 < childrenAddresses.length ) {
@@ -3791,7 +3791,8 @@ MibNode.prototype.getNextInstanceNode = function () {
 		}
 	}
 	while ( node ) {
-		if ( node.value != null ) {
+		// Return if at leaf
+		if ( ! node.children || Object.keys (node.children).length === 0 ) {
 			return node;
 		}
 		// Descend to first child if not at leaf
@@ -5214,6 +5215,9 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 						responseVarbind.type = mibRequests[savedIndex].instanceNode.valueType;
 					}
 					responseVarbind.value = mibRequests[savedIndex].instanceNode.value;
+					if ( responseVarbind.value === undefined || responseVarbind.value === null ) {
+						responseVarbind.type = ObjectType.NoSuchInstance;
+					}
 				}
 				if ( providerNode && providerNode.provider && providerNode.provider.name ) {
 					responseVarbind.providerName = providerNode.provider.name;

package/package.json

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