net-snmp 3.10.0 → 3.10.1

package/README.md

@@ -2486,7 +2486,7 @@ call.
 Takes an OID in one of the three supported formats (the library automatically detects the given OID's format):
 - **OidFormat.oid** - canonical (numerical) OID format e.g. 1.3.6.1.2.1.1.1
 - **OidFormat.path** - named OID path format e.g. iso.org.dod.internet.mgmt.mib-2.system.sysDescr
-- **OidFormat.module** - module-qualified format e.g. RFC1158-MIB::sysDescr
+- **OidFormat.module** - module-qualified format e.g. SNMPv2-MIB::sysDescr
 
 Returns the given OID translated to the provided destination format - also one of the above three formats.
 
@@ -3343,6 +3343,10 @@ Example programs are included under the module's `example` directory.
 
  * Add numeric/named OID translate function
 
+## Version 3.10.1 - 30/01/2024
+
+ * Fix table column type in provider definition with column type constraints
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/example/snmp-agent.js

@@ -190,8 +190,13 @@ var tableProvider = {
             number: 2,
             name: "ifDescr",
             type: snmp.ObjectType.OctetString,
-			maxAccess: snmp.MaxAccess['read-write'],
-			defVal: "Hello world!"
+            maxAccess: snmp.MaxAccess['read-write'],
+            constraints: {
+                sizes: [
+                    { min: 1, max: 255 },
+                ]
+            },
+            defVal: "Hello world!"
         },
         {
             number: 3,

package/example/test.js

@@ -2,20 +2,18 @@ const snmp = require("../");
 
 const store = snmp.createModuleStore();
 
-//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");
+store.loadFromFile("/var/tmp/mibs/IANAifType-MIB.mib");
+store.loadFromFile("/var/tmp/mibs/IF-MIB.mib");
 
-const mod1 = store.getModule("SMIv1-TEST-MIB");
-// const mod2 = store.getModule("SMIv2-TEST-MIB");
+// const mod = store.getModule("IF-MIB");
 
-// Object.keys(mod1)
-//   .forEach(key => console.log(key));
+//Object.keys(mod)
+//  .forEach(key => console.log(key));
+
+//console.log(JSON.stringify(mod, null, 2));
+const provs = store.getProvidersForModule('IF-MIB');
+console.log(JSON.stringify(provs, null, 2));
 
-console.log(JSON.stringify(mod1, null, 2));
-// console.log(JSON.stringify(mod2, null, 2));
 
 //const mod = store.getModule("CISCO-CONFIG-MAN-MIB");
 //console.log(mod);
@@ -25,23 +23,3 @@ console.log(JSON.stringify(mod1, 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));
-
-// console.log(JSON.stringify(store.translations.moduleToOid, null, 2));
-// console.log(JSON.stringify(store.translations.moduleToPath, null, 2));
-// console.log(JSON.stringify(store.translations.oidToPath, null, 2));
-// console.log(JSON.stringify(store.translations.oidToModule, null, 2));
-// console.log(JSON.stringify(store.translations.pathToOid, null, 2));
-// console.log(JSON.stringify(store.translations.pathToModule, null, 2));
-
-console.log('iso.org.dod.internet.snmpV2.snmpModules.snmpMIB.snmpMIBObjects.snmpTraps.warmStart => ' + store.translate('iso.org.dod.internet.snmpV2.snmpModules.snmpMIB.snmpMIBObjects.snmpTraps.warmStart', 'oid'));
-console.log('iso.org.dod.internet.snmpV2.snmpModules.snmpMIB.snmpMIBObjects.snmpTraps.warmStart => ' + store.translate('iso.org.dod.internet.snmpV2.snmpModules.snmpMIB.snmpMIBObjects.snmpTraps.warmStart', 'module'));
-console.log('iso.org.dod.internet.snmpV2.snmpModules.snmpMIB.snmpMIBObjects.snmpTraps.warmStart => ' + store.translate('iso.org.dod.internet.snmpV2.snmpModules.snmpMIB.snmpMIBObjects.snmpTraps.warmStart', 'path'));
-console.log('1.3.6.1.2.1.1.1 => ' + store.translate('1.3.6.1.2.1.1.1', 'oid'));
-console.log('1.3.6.1.2.1.1.1 => ' + store.translate('1.3.6.1.2.1.1.1', 'module'));
-console.log('1.3.6.1.2.1.1.1 => ' + store.translate('1.3.6.1.2.1.1.1', 'path'));
-console.log('RFC1158-MIB::sysDescr => ' + store.translate('RFC1158-MIB::sysDescr', snmp.OidFormat.oid));
-console.log('SNMPv2-MIB::sysDescr => ' + store.translate('SNMPv2-MIB::sysDescr', snmp.OidFormat.oid));
-console.log('RFC1158-MIB::sysDescr => ' + store.translate('SNMPv2-MIB::sysDescr', snmp.OidFormat.path));
-console.log('RFC1158-MIB::sysDescr => ' + store.translate('SNMPv2-MIB::sysDescr', snmp.OidFormat.module));
-
-// console.log('RFC1158-MIB::ipAdEntReasmMaxSize => ' + store.translate('RFC1158-MIB::ipAdEntReasmMaxSizesz', snmp.OidFormat.oid));

package/index.js

@@ -3350,10 +3350,14 @@ ModuleStore.prototype.getProvidersForModule = function (moduleName) {
 							}
 						} else if ( parentOid == currentTableProvider.name ) {
 							// table column
+							let columnType = syntaxTypes[syntax];
+							if (typeof columnType === 'object') {
+								columnType = syntaxTypes[Object.keys(columnType)[0]];
+							}
 							var columnDefinition = {
 								number: parseInt (mibEntry["OBJECT IDENTIFIER"].split (" ")[1]),
 								name: mibEntry.ObjectName,
-								type: syntaxTypes[syntax],
+								type: columnType,
 								maxAccess: MaxAccess[maxAccess]
 							};
 							if ( constraints ) {
@@ -3388,8 +3392,9 @@ ModuleStore.prototype.getProvidersForModule = function (moduleName) {
 			} else if ( mibEntry.MACRO == "OBJECT-TYPE" ) {
 				// OBJECT-TYPE entries not in a table are scalars
 				let scalarType = syntaxTypes[syntax];
-				if (typeof scalarType === 'object')
+				if (typeof scalarType === 'object') {
 					scalarType = syntaxTypes[Object.keys(scalarType)[0]];
+				}
 				var scalarDefinition = {
 					name: mibEntry.ObjectName,
 					type: MibProviderType.Scalar,

package/package.json

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