net-snmp 3.18.0 → 3.18.2

package/README.md

@@ -1598,7 +1598,8 @@ var options = {
     accessControlModelType: snmp.AccessControlModelType.None,
     engineID: "8000B98380XXXXXXXXXXXXXXXXXXXXXXXX", // where the X's are random hex digits
     address: null,
-    transport: "udp4"
+    transport: "udp4",
+    mibOptions: {}
 };
 
 var callback = function (error, data) {
@@ -1634,6 +1635,8 @@ an object, possibly empty, and can contain the following fields:
  * `sockets` - an array of objects containing triples of `transport`, `address` and `port` that
  can be used to specify multiple socket listeners.  This option overrides any individual
  `transport`, `address` and `port` options.
+ * `mibOptions` - an MIB options object that is passed to the `Mib` instance - see the MIB section
+ for further details on this - defaults to the empty object.
 
 The `mib` parameter is optional, and sets the agent's singleton `Mib` instance.
 If not supplied, the agent creates itself a new empty `Mib` singleton.  If supplied,
@@ -3450,6 +3453,14 @@ Example programs are included under the module's `example` directory.
 
  * Add MIB option to add scalar MIB object on scalar provider registration
 
+## Version 3.18.1 - 06/01/2025
+
+ * Add agent option key for MIB options
+
+## Version 3.18.2 - 06/01/2025
+
+ * Add conversion of scalar defVal enumeration name to number on assignment
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/index.js

@@ -783,6 +783,15 @@ ObjectTypeUtil.doesStringMeetConstraints = function (value, constraints) {
 	return true;
 };
 
+ObjectTypeUtil.getEnumerationNumberFromName = function (enumeration, name) {
+	for ( const [enumNumber, enumName] of Object.entries (enumeration) ) {
+		if ( enumName === name ) {
+			return Number (enumNumber);
+		}
+	}
+	return null;
+};
+
 /*****************************************************************************
  ** PDU class definitions
  **/
@@ -4199,10 +4208,15 @@ Mib.prototype.populateIndexEntryFromColumn = function (localProvider, indexEntry
 Mib.prototype.registerProvider = function (provider) {
 	this.providers[provider.name] = provider;
 	if ( provider.type == MibProviderType.Scalar ) {
-		if ( this.options?.addScalarDefaultsOnRegistration ) {
-			if ( provider.defVal ) {
-				this.setScalarValue (provider.name, provider.defVal);
+		if ( this.options?.addScalarDefaultsOnRegistration && provider.defVal ) {
+			let scalarValue;
+			// If the scalar has an enumeration, set the value to the enumeration number derived from the defVal name
+			if ( provider.constraints?.enumeration ) {
+				scalarValue = ObjectTypeUtil.getEnumerationNumberFromName (provider.constraints.enumeration, provider.defVal);
+			} else {
+				scalarValue = provider.defVal;
 			}
+			this.setScalarValue (provider.name, scalarValue);
 		}
 	} else if ( provider.type == MibProviderType.Table ) {
 		if ( provider.tableAugments ) {
@@ -4798,7 +4812,8 @@ var Agent = function (options, callback, mib) {
 	this.engine = new Engine (options.engineID);
 	this.authorizer = new Authorizer (options);
 	this.callback = callback || function () {};
-	this.mib = mib || new Mib ();
+	const mibOptions = mib?.options || options?.mibOptions || {};
+	this.mib = mib || new Mib (mibOptions);
 	this.context = "";
 	this.forwarder = new Forwarder (this.listener, this.callback);
 };

package/package.json

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